From 0625dac80cdd08597826b83eeaaf9597255757d6 Mon Sep 17 00:00:00 2001 From: Jonathan Kingston Date: Tue, 11 Apr 2023 14:52:54 +0100 Subject: [PATCH] Ignore scripts on install, move C-S-S to be a build dep (#150) --- .github/workflows/node.js.yml | 2 +- package-lock.json | 34 +++++++++++++++++++--------------- package.json | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index a5c8211..09d5a23 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,6 +25,6 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - run: npm ci + - run: npm ci --ignore-scripts - run: npm run build --if-present - run: npm test diff --git a/package-lock.json b/package-lock.json index 171fc6b..8024fc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "privacy-test-pages", "dependencies": { + "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#4.11.1", "body-parser": "^1.20.2", "express": "^4.18.2", "node-cache": "^5.1.2", @@ -14,7 +15,6 @@ "ws": "^8.13.0" }, "devDependencies": { - "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#4.10.1", "eslint": "^7.32.0", "eslint-config-standard": "^16.0.3", "eslint-plugin-html": "^7.1.0", @@ -67,9 +67,7 @@ } }, "node_modules/@duckduckgo/content-scope-scripts": { - "resolved": "git+ssh://git@github.com/duckduckgo/content-scope-scripts.git#2a7d08ca153ed156a3c8a38752c97324a4ec55be", - "integrity": "sha512-ar9b6SwuYnImqm013QBzU4Xg1Y5irtkjBivzRdX7NFcEfH1BrZ4LskSajTAU6Ibz67EBxfhQA3YUrhkO1Xy2cQ==", - "dev": true, + "resolved": "git+ssh://git@github.com/duckduckgo/content-scope-scripts.git#1cbf542101104b1ee059a348e7c622cd0f52fb42", "hasInstallScript": true, "license": "Apache-2.0", "workspaces": [ @@ -77,6 +75,7 @@ "packages/messaging" ], "dependencies": { + "immutable-json-patch": "^5.1.2", "seedrandom": "^3.0.5", "sjcl": "^1.0.8" } @@ -1745,6 +1744,11 @@ "node": ">= 4" } }, + "node_modules/immutable-json-patch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/immutable-json-patch/-/immutable-json-patch-5.1.2.tgz", + "integrity": "sha512-t2Y6T/6JcaCQlcgVglDmN2jDuXPuHfWq/oEIGae5YRXxPq4AEMoDIdkBsuGJT1wGrQDyqWulDMdPfZyz62cvew==" + }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -2563,8 +2567,7 @@ "node_modules/seedrandom": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz", - "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==", - "dev": true + "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "node_modules/semver": { "version": "7.3.4", @@ -2666,7 +2669,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.8.tgz", "integrity": "sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==", - "dev": true, "engines": { "node": "*" } @@ -3153,11 +3155,10 @@ } }, "@duckduckgo/content-scope-scripts": { - "version": "git+ssh://git@github.com/duckduckgo/content-scope-scripts.git#2a7d08ca153ed156a3c8a38752c97324a4ec55be", - "integrity": "sha512-ar9b6SwuYnImqm013QBzU4Xg1Y5irtkjBivzRdX7NFcEfH1BrZ4LskSajTAU6Ibz67EBxfhQA3YUrhkO1Xy2cQ==", - "dev": true, - "from": "@duckduckgo/content-scope-scripts@github:duckduckgo/content-scope-scripts#2a7d08ca153ed156a3c8a38752c97324a4ec55be", + "version": "git+ssh://git@github.com/duckduckgo/content-scope-scripts.git#1cbf542101104b1ee059a348e7c622cd0f52fb42", + "from": "@duckduckgo/content-scope-scripts@github:duckduckgo/content-scope-scripts#4.11.1", "requires": { + "immutable-json-patch": "^5.1.2", "seedrandom": "^3.0.5", "sjcl": "^1.0.8" } @@ -4413,6 +4414,11 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "immutable-json-patch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/immutable-json-patch/-/immutable-json-patch-5.1.2.tgz", + "integrity": "sha512-t2Y6T/6JcaCQlcgVglDmN2jDuXPuHfWq/oEIGae5YRXxPq4AEMoDIdkBsuGJT1wGrQDyqWulDMdPfZyz62cvew==" + }, "import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -4986,8 +4992,7 @@ "seedrandom": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz", - "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==", - "dev": true + "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==" }, "semver": { "version": "7.3.4", @@ -5069,8 +5074,7 @@ "sjcl": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.8.tgz", - "integrity": "sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==", - "dev": true + "integrity": "sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==" }, "slice-ansi": { "version": "4.0.0", diff --git a/package.json b/package.json index 7c4d3e2..ec0d666 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ }, "homepage": "https://github.com/duckduckgo/privacy-test-pages#readme", "dependencies": { + "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#4.11.1", "body-parser": "^1.20.2", "express": "^4.18.2", "node-cache": "^5.1.2", @@ -28,7 +29,6 @@ "ws": "^8.13.0" }, "devDependencies": { - "@duckduckgo/content-scope-scripts": "github:duckduckgo/content-scope-scripts#4.10.1", "eslint": "^7.32.0", "eslint-config-standard": "^16.0.3", "eslint-plugin-html": "^7.1.0",