fix(build): fix deps conflict with all-contributors-cli

trafilea · Dec 22, 2020 · 9dac4b1 · 9dac4b1
1 parent b1187f0
commit 9dac4b1
Show file tree

Hide file tree

Showing 3 changed files with 1,992 additions and 2,043 deletions.
diff --git a/package.json b/package.json
@@ -26,57 +26,56 @@
     "dep-graph": "nx dep-graph",
     "help": "nx help",
     "commit": "cz",
-    "check-commit": "node ./scripts/commit-lint.js"
+    "check-commit": "node ./scripts/commit-lint.js",
+    "contributors:add": "npx all-contributors-cli add",
+    "contributors:generate": "npx all-contributors-cli generate"
   },
   "private": true,
-  "dependencies": {
-    "@angular-devkit/build-webpack": "^0.1001.7",
-    "@shopify/themekit": "^1.1.6",
-    "circular-dependency-plugin": "^5.2.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.2.1",
-    "crypto": "^1.0.1",
-    "css-loader": "^5.0.0",
-    "css-minimizer-webpack-plugin": "^1.1.5",
-    "fork-ts-checker-webpack-plugin": "^5.2.0",
-    "html-webpack-plugin": "^4.5.0",
-    "media-query-plugin": "^1.4.0",
-    "mini-css-extract-plugin": "^1.1.1",
-    "postcss": "^8.2.1",
-    "postcss-loader": "^4.1.0",
-    "sass": "^1.27.0",
-    "sass-loader": "^10.0.3",
-    "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "webpack": "4",
-    "webpack-bundle-analyzer": "^4.3.0",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "5"
-  },
   "devDependencies": {
+    "@angular-devkit/build-webpack": "^0.1001.7",
     "@nrwl/cli": "10.3.1",
     "@nrwl/eslint-plugin-nx": "10.3.1",
     "@nrwl/jest": "10.3.1",
     "@nrwl/nx-plugin": "10.3.1",
     "@nrwl/workspace": "10.3.1",
+    "@shopify/themekit": "^1.1.6",
     "@types/jest": "26.0.8",
     "@types/node": "~8.9.4",
     "@typescript-eslint/eslint-plugin": "4.3.0",
     "@typescript-eslint/parser": "4.3.0",
-    "all-contributors-cli": "^6.19.0",
+    "circular-dependency-plugin": "^5.2.0",
+    "clean-webpack-plugin": "^3.0.0",
     "commitizen": "^4.2.1",
+    "copy-webpack-plugin": "^6.2.1",
+    "crypto": "^1.0.1",
+    "css-loader": "^5.0.0",
+    "css-minimizer-webpack-plugin": "^1.1.5",
     "cz-customizable": "^6.3.0",
     "dotenv": "6.2.0",
     "eslint": "7.10.0",
     "eslint-config-prettier": "6.0.0",
+    "fork-ts-checker-webpack-plugin": "^5.2.0",
+    "html-webpack-plugin": "^4.5.0",
     "husky": "^4.3.0",
     "jest": "26.2.2",
     "lint-staged": "^10.4.2",
+    "media-query-plugin": "^1.4.0",
+    "mini-css-extract-plugin": "^1.1.1",
+    "postcss": "^8.2.1",
+    "postcss-loader": "^4.1.0",
     "prettier": "2.0.4",
     "pretty-quick": "^3.1.0",
+    "sass": "^1.27.0",
+    "sass-loader": "^10.0.3",
     "ts-jest": "26.4.0",
     "ts-node": "~7.0.0",
+    "tsconfig-paths-webpack-plugin": "^3.3.0",
     "tslint": "~6.0.0",
-    "typescript": "~4.0.3"
+    "typescript": "~4.0.3",
+    "webpack": "^4.44.2",
+    "webpack-bundle-analyzer": "^4.3.0",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-merge": "5"
   },
   "config": {
     "commitizen": {

diff --git a/packages/nx-shopify/package.json b/packages/nx-shopify/package.json
@@ -23,5 +23,28 @@
   ],
   "main": "src/index.js",
   "schematics": "./collection.json",
-  "builders": "./builders.json"
+  "builders": "./builders.json",
+  "dependencies": {
+    "@angular-devkit/build-webpack": "^0.1001.7",
+    "@shopify/themekit": "^1.1.6",
+    "circular-dependency-plugin": "^5.2.0",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^6.2.1",
+    "crypto": "^1.0.1",
+    "css-loader": "^5.0.0",
+    "css-minimizer-webpack-plugin": "^1.1.5",
+    "fork-ts-checker-webpack-plugin": "^5.2.0",
+    "html-webpack-plugin": "^4.5.0",
+    "media-query-plugin": "^1.4.0",
+    "mini-css-extract-plugin": "^1.1.1",
+    "postcss": "^8.2.1",
+    "postcss-loader": "^4.1.0",
+    "sass": "^1.27.0",
+    "sass-loader": "^10.0.3",
+    "tsconfig-paths-webpack-plugin": "^3.3.0",
+    "webpack": "^4.44.2",
+    "webpack-bundle-analyzer": "^4.3.0",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-merge": "5"
+  }
 }