@nx/workspace 17.3.0-canary.20240116-42aefd8 → 17.3.0-canary.20240118-8ccf327

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.3.0-canary.20240116-42aefd8",
+  "version": "17.3.0-canary.20240118-8ccf327",
   "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": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-canary.20240116-42aefd8",
+    "@nx/devkit": "17.3.0-canary.20240118-8ccf327",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.3.0-canary.20240116-42aefd8",
-    "@nrwl/workspace": "17.3.0-canary.20240116-42aefd8"
+    "nx": "17.3.0-canary.20240118-8ccf327",
+    "@nrwl/workspace": "17.3.0-canary.20240118-8ccf327"
   },
   "publishConfig": {
     "access": "public"

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

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

package/src/generators/new/files-root-app/package.json__tmpl__

@@ -10,5 +10,8 @@
   "devDependencies": {
     "@nx/workspace": "<%= nxVersion %>",
     "nx": "<%= nxVersion %>"
+  },
+  "nx": {
+    "includedScripts": []
   }
 }

package/src/generators/new/generate-preset.js

@@ -56,6 +56,7 @@ function generatePreset(host, opts) {
             opts.docker ? `--docker=${opts.docker}` : null,
             opts.js ? `--js` : null,
             opts.nextAppDir ? '--nextAppDir=true' : '--nextAppDir=false',
+            opts.nextSrcDir ? '--nextSrcDir=true' : '--nextSrcDir=false',
             opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
             opts.standaloneApi !== undefined
                 ? `--standaloneApi=${opts.standaloneApi}`

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

@@ -48,15 +48,17 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         affected: {
             defaultBase,
         },
-        targetDefaults: {
-            build: {
-                cache: true,
-                dependsOn: ['^build'],
-            },
-            lint: {
-                cache: true,
-            },
-        },
+        targetDefaults: process.env.NX_PCV3 !== 'true'
+            ? {
+                build: {
+                    cache: true,
+                    dependsOn: ['^build'],
+                },
+                lint: {
+                    cache: true,
+                },
+            }
+            : undefined,
     };
     if (defaultBase === 'main') {
         delete nxJson.affected;
@@ -67,7 +69,9 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             production: ['default'],
             sharedGlobals: [],
         };
-        nxJson.targetDefaults.build.inputs = ['production', '^production'];
+        if (process.env.NX_PCV3 !== 'true') {
+            nxJson.targetDefaults.build.inputs = ['production', '^production'];
+        }
     }
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
 }

package/src/generators/new/new.d.ts

@@ -12,6 +12,7 @@ interface Schema {
     docker?: boolean;
     js?: boolean;
     nextAppDir?: boolean;
+    nextSrcDir?: boolean;
     linter?: Linter;
     bundler?: 'vite' | 'webpack';
     standaloneApi?: boolean;

package/src/generators/new/schema.json

@@ -68,6 +68,11 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",

package/src/generators/preset/preset.js

@@ -140,6 +140,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
         });
     }
@@ -153,6 +154,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             rootProject: true,
         });

package/src/generators/preset/schema.d.ts

@@ -12,6 +12,7 @@ export interface Schema {
   bundler?: 'vite' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
+  nextSrcDir?: boolean;
   routing?: boolean;
   standaloneApi?: boolean;
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';

package/src/generators/preset/schema.json

@@ -85,6 +85,11 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",