From e4b5989b1b6221c04db90278214d40ed14083820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 4 Jun 2019 22:50:01 +0900 Subject: [PATCH 1/3] Use 'npm-force-resolutions' for NPM users --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b6615ed5b..de673b6a9 100644 --- a/package.json +++ b/package.json @@ -169,6 +169,7 @@ "nested-property": "0.0.7", "node-fetch": "2.5.0", "nodemailer": "6.1.1", + "npm-force-resolutions": "0.0.2", "nprogress": "0.2.0", "object-assign-deep": "0.4.0", "os-utils": "0.0.14", From 569588c46339520d1ce6886beb22162f98bc31fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 4 Jun 2019 22:50:47 +0900 Subject: [PATCH 2/3] Add resolutions for fixing polluted packages --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index de673b6a9..413a6c9b3 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,10 @@ "test": "gulp test", "format": "gulp format" }, + "resolutions": { + "gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1", + "video-thumbnail-generator/lodash": "^4.17.11" + }, "dependencies": { "@elastic/elasticsearch": "7.0.0-rc.2", "@fortawesome/fontawesome-svg-core": "1.2.15", From 5228b9835b10013c9f43c163a2e1ac97f129dcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 4 Jun 2019 22:55:35 +0900 Subject: [PATCH 3/3] Use package-lock.json in local --- .gitignore | 3 +++ .npmrc | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5d06997f1..4752b758a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Node.js /node_modules +# NPM +package-lock.json + # yarn yarn.lock diff --git a/.npmrc b/.npmrc index 6b5f38e89..1dab4ed4c 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ save-exact = true -package-lock = false