Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
run: npm ci --timing
- name: Lint javascript
run: npm run lint
- name: Verify minification uses script
Comment thread
ahmedawwad marked this conversation as resolved.
run: |
npm run minify
git diff --exit-code Universal-Federated-Analytics-Min.js Universal-Federated-Analytics-Min.js.map
- name: Run tests
# aa-exec applies Ubuntu's AppArmor profile for stable Chrome binaries to the Chrome for Testing binary downloaded by Puppeteer
# Without it, Puppeteer fails with error "No usable sandbox!"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx
ARG DAP_ENV='dev'
ENV DAP_ENV=${DAP_ENV}
COPY test_site Universal-Federated-Analytics-Min.js Universal-Federated-Analytics.js Federated.js.map /usr/share/nginx/html/
COPY test_site Universal-Federated-Analytics.js Universal-Federated-Analytics-Min.js Universal-Federated-Analytics-Min.js.map /usr/share/nginx/html/
COPY nginx-test.conf.template /etc/nginx/conf.d/
RUN envsubst '${DAP_ENV}' < /etc/nginx/conf.d/nginx-test.conf.template > /etc/nginx/conf.d/default.conf
8 changes: 0 additions & 8 deletions Federated.js.map

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The latest version 8.6 of DAP GA code contains GA4 tracking only. DAP UA data co

* [`Universal-Federated-Analytics.js`](Universal-Federated-Analytics.js) (full)
* [`Universal-Federated-Analytics-Min.js`](Universal-Federated-Analytics-Min.js) (minified)
* [`Federated.js.map`](Federated.js.map) (source map)
* [`Universal-Federated-Analytics-Min.js.map`](Universal-Federated-Analytics-Min.js.map) (source map)

### DAP Code Implementation

Expand Down Expand Up @@ -129,6 +129,14 @@ This repo uses Eslint for code static analysis. Run the linter with:
npm run lint
```

#### Minification

This repo uses Terser for minification. After making changes to Universal-Federated-Analytics.js, regenerate the minified file by running:

```bash
npm run minify
```

#### Run integration tests

Start up the test site at http://localhost:8080/ with one of the following:
Expand Down
126 changes: 68 additions & 58 deletions Universal-Federated-Analytics-Min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Universal-Federated-Analytics-Min.js.map

Large diffs are not rendered by default.

99 changes: 95 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"clean": "rm ./Universal-Federated-Analytics-Min.js",
"lint": "eslint Universal-Federated-Analytics.js",
"minify": "terser Universal-Federated-Analytics.js --output Universal-Federated-Analytics-Min.js --config-file terser.config.json",
"cucumber": "cucumber-js",
"cucumber:debug": "VERBOSE=true node --inspect-brk node_modules/@cucumber/cucumber/bin/cucumber-js",
"cucumber:report": "cucumber-js --format \"html\":\"output/test-results.html\"",
Expand All @@ -29,7 +30,8 @@
"eslint": "^9.8.0",
"eslint-plugin-compat": "^6.0.0",
"eslint-plugin-jsdoc": "^50.2.2",
"puppeteer": "^23.3.0"
"puppeteer": "^23.3.0",
"terser": "^5.46.1"
},
"dependencies": {
"web-vitals": "^4.2.4"
Expand Down
9 changes: 9 additions & 0 deletions terser.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"sourceMap": {
"filename": "Universal-Federated-Analytics-Min.js",
"url": "Universal-Federated-Analytics-Min.js.map"
},
"format": {
"max_line_len": 500
}
}
Loading