@nx/workspace 20.3.0-canary.20241218-fb40366 → 20.3.0-canary.20241220-0980006

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.3.0-canary.20241218-fb40366",
+  "version": "20.3.0-canary.20241220-0980006",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.3.0-canary.20241218-fb40366",
+    "@nx/devkit": "20.3.0-canary.20241220-0980006",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.3.0-canary.20241218-fb40366"
+    "nx": "20.3.0-canary.20241220-0980006"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/move/lib/move-project-files.js

@@ -19,6 +19,7 @@ function moveProjectFiles(tree, schema, project) {
         '.babelrc',
         '.eslintrc.json',
         'eslint.config.js',
+        'eslint.config.cjs',
         /^jest\.config\.((app|lib)\.)?[jt]s$/,
         'vite.config.ts',
         /^webpack.*\.js$/,

package/src/generators/move/lib/update-eslint-config.js

@@ -11,8 +11,10 @@ function updateEslintConfig(tree, schema, project) {
     // if there is no suitable eslint config, we don't need to do anything
     if (!tree.exists('.eslintrc.json') &&
         !tree.exists('eslint.config.js') &&
+        !tree.exists('eslint.config.cjs') &&
         !tree.exists('.eslintrc.base.json') &&
-        !tree.exists('eslint.base.config.js')) {
+        !tree.exists('eslint.base.config.js') &&
+        !tree.exists('eslint.base.config.cjs')) {
         return;
     }
     try {

package/src/generators/move/lib/update-project-root-files.js

@@ -41,7 +41,9 @@ function updateFilesForRootProjects(tree, schema, project) {
         if (!allowedExt.includes(ext)) {
             continue;
         }
-        if (file === '.eslintrc.json' || file === 'eslint.config.js') {
+        if (file === '.eslintrc.json' ||
+            file === 'eslint.config.js' ||
+            file === 'eslint.config.cjs') {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');
@@ -73,7 +75,9 @@ function updateFilesForNonRootProjects(tree, schema, project) {
         if (!allowedExt.includes(ext)) {
             continue;
         }
-        if (file === '.eslintrc.json' || file === 'eslint.config.js') {
+        if (file === '.eslintrc.json' ||
+            file === 'eslint.config.cjs' ||
+            file === 'eslint.config.js') {
             continue;
         }
         const oldContent = tree.read((0, path_1.join)(schema.relativeToRootDestination, file), 'utf-8');

package/src/generators/new/generate-workspace-files.js

@@ -339,7 +339,7 @@ function setUpWorkspacesInPackageJson(tree, options) {
         const workspaces = options.workspaceGlobs ?? ['packages/**'];
         if (options.packageManager === 'pnpm') {
             tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages: 
-  - ${workspaces.join('\n  - ')}
+  ${workspaces.map((workspace) => `- "${workspace}"`).join('\n  ')}
 `);
         }
         else {