fix(misc): cleanup deps to support pnpm v7 in create-nx-workspace (#1…

…5859)
nrwl · Mar 23, 2023 · 7c9b66e · 7c9b66e · vercel · Mar 23, 2023
1 parent f1dc152
commit 7c9b66e
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 229 deletions.
diff --git a/packages/devkit/migrations.json b/packages/devkit/migrations.json
diff --git a/packages/devkit/migrations.spec.ts b/packages/devkit/migrations.spec.ts
diff --git a/packages/devkit/package.json b/packages/devkit/package.json
@@ -32,15 +32,11 @@
     "ignore": "^5.0.4",
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
-    "@phenomnomnominal/tsquery": "4.1.1",
     "semver": "7.3.4"
   },
   "peerDependencies": {
     "nx": ">= 14.1 <= 16"
   },
-  "nx-migrations": {
-    "migrations": "./migrations.json"
-  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/devkit/src/migrations/update-14-2-0/split-create-empty-tree.spec.ts b/packages/devkit/src/migrations/update-14-2-0/split-create-empty-tree.spec.ts
diff --git a/packages/devkit/src/migrations/update-14-2-0/split-create-empty-tree.ts b/packages/devkit/src/migrations/update-14-2-0/split-create-empty-tree.ts
diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -418,7 +418,7 @@ function normalizeOptions(
     options.bundler = 'none';
   }
 
-  const { Linter } = require('@nrwl/linter');
+  const { Linter } = ensurePackage('@nrwl/linter', nxVersion);
   if (options.config === 'npm-scripts') {
     options.unitTestRunner = 'none';
     options.linter = Linter.None;

diff --git a/packages/workspace/project.json b/packages/workspace/project.json
@@ -87,12 +87,6 @@
           },
           {
             "command": "node ./scripts/add-dependency-to-build.js workspace nx"
-          },
-          {
-            "command": "node ./scripts/add-dependency-to-build.js workspace @nrwl/devkit"
-          },
-          {
-            "command": "node ./scripts/add-dependency-to-build.js workspace @nrwl/linter"
           }
         ],
         "parallel": false