Merge branch 'master' into fix/use-standard-args-parsing

docs/generated/cli/create-nx-workspace.md

@@ -139,7 +139,7 @@ Package manager to use
 
 Type: `string`
 
-Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/extending-nx/recipes/create-preset
+Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "vue-monorepo", "vue-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/extending-nx/recipes/create-preset
 
 ### routing
 

docs/generated/packages/js/generators/library.json

@@ -48,6 +48,12 @@
         "default": false,
         "x-priority": "internal"
       },
+      "skipPackageJson": {
+        "description": "Do not add dependencies to `package.json`.",
+        "type": "boolean",
+        "default": false,
+        "x-priority": "internal"
+      },
       "skipTsConfig": {
         "type": "boolean",
         "description": "Do not update tsconfig.json for development experience.",

docs/generated/packages/nx/documents/create-nx-workspace.md

@@ -139,7 +139,7 @@ Package manager to use
 
 Type: `string`
 
-Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/extending-nx/recipes/create-preset
+Customizes the initial content of your workspace. Default presets include: ["apps", "empty", "core", "npm", "ts", "web-components", "angular-monorepo", "angular-standalone", "react-monorepo", "react-standalone", "vue-monorepo", "vue-standalone", "next", "nextjs-standalone", "react-native", "expo", "nest", "express", "react", "angular", "node-standalone", "node-monorepo", "ts-standalone"]. To build your own see https://nx.dev/extending-nx/recipes/create-preset
 
 ### routing
 

nx-dev/nx-dev/redirect-rules.js

@@ -409,7 +409,6 @@ const nxCloudUrls = {
     '/nx-cloud/recipes/set-up/monorepo-ci-bitbucket-pipelines',
   '/recipes/ci/ci-deployment': '/nx-cloud/recipes/other/ci-deployment',
   '/nx-cloud/intro/what-is-nx-cloud': '/nx-cloud/intro/ci-with-nx',
-  '/nx-cloud/intro/nx-cloud-workflows': '/nx-cloud/intro/nx-cloud-workflows',
   '/nx-cloud/set-up': '/nx-cloud/recipes/set-up',
   '/nx-cloud/set-up/record-commands': '/nx-cloud/recipes/other/record-commands',
   '/nx-cloud/set-up/github':

packages/create-nx-workspace/bin/create-nx-workspace.ts

@@ -112,10 +112,6 @@ export const commandsObject: yargs.Argv<Arguments> = yargs
             describe: chalk.dim`Customizes the initial content of your workspace. Default presets include: [${Object.values(
               Preset
             )
-              // TODO(v17): Remove this option when @nx/vue is released.
-              .filter(
-                (p) => p !== Preset.VueStandalone && p !== Preset.VueMonorepo
-              )
               .map((p) => `"${p}"`)
               .join(
                 ', '

packages/js/babel.ts

@@ -99,6 +99,7 @@ module.exports = function (api: any, options: NxWebBabelPresetOptions = {}) {
         require.resolve('@babel/plugin-proposal-decorators'),
         options.decorators ?? { legacy: true },
       ],
+      [require.resolve('@babel/plugin-transform-class-properties'), { loose }],
     ].filter(Boolean),
     overrides: [
       // Convert `const enum` to `enum`. The former cannot be supported by babel

packages/js/package.json

@@ -33,6 +33,7 @@
     "@babel/core": "^7.22.9",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@babel/plugin-transform-runtime": "^7.22.9",
+    "@babel/plugin-transform-class-properties": "^7.22.5",
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",

packages/js/src/generators/library/library.spec.ts

@@ -1359,4 +1359,32 @@ describe('lib', () => {
       expect(tree.exists('web/my-lib/src/lib/my-lib.ts')).toBeTruthy();
     });
   });
+
+  describe('--testEnvironment', () => {
+    it('should generate a vite config with testEnvironment set to node', async () => {
+      await libraryGenerator(tree, {
+        ...defaultOptions,
+        name: 'my-node-lib',
+        unitTestRunner: 'vitest',
+        testEnvironment: 'node',
+      });
+
+      const content = tree.read('my-node-lib/vite.config.ts', 'utf-8');
+
+      expect(content).toContain(`environment: 'node'`);
+    });
+
+    it('should generate a vite config with testEnvironment set to jsdom by default', async () => {
+      await libraryGenerator(tree, {
+        ...defaultOptions,
+        name: 'my-jsdom-lib',
+        unitTestRunner: 'vitest',
+        testEnvironment: undefined,
+      });
+
+      const content = tree.read('my-jsdom-lib/vite.config.ts', 'utf-8');
+
+      expect(content).toContain(`environment: 'jsdom'`);
+    });
+  });
 });

packages/js/src/generators/library/library.ts

@@ -74,7 +74,9 @@ export async function libraryGeneratorInternal(
 
   addProject(tree, options);
 
-  tasks.push(addProjectDependencies(tree, options));
+  if (!options.skipPackageJson) {
+    tasks.push(addProjectDependencies(tree, options));
+  }
 
   if (options.publishable) {
     tasks.push(await setupVerdaccio(tree, { ...options, skipFormat: true }));
@@ -99,6 +101,7 @@ export async function libraryGeneratorInternal(
         project: options.name,
         includeLib: true,
         includeVitest: options.unitTestRunner === 'vitest',
+        testEnvironment: options.testEnvironment,
       },
       false
     );
@@ -136,6 +139,7 @@ export async function libraryGeneratorInternal(
         project: options.name,
         includeLib: false,
         includeVitest: true,
+        testEnvironment: options.testEnvironment,
       },
       true
     );
@@ -706,7 +710,6 @@ function addProjectDependencies(
   }
 
   // Vite is being installed in the next step if bundler is vite
-
   // noop
   return () => {};
 }

packages/js/src/generators/library/schema.json

@@ -48,6 +48,12 @@
       "default": false,
       "x-priority": "internal"
     },
+    "skipPackageJson": {
+      "description": "Do not add dependencies to `package.json`.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
     "skipTsConfig": {
       "type": "boolean",
       "description": "Do not update tsconfig.json for development experience.",

packages/js/src/utils/schema.d.ts

@@ -14,6 +14,7 @@ export interface LibraryGeneratorSchema {
   skipFormat?: boolean;
   tags?: string;
   skipTsConfig?: boolean;
+  skipPackageJson?: boolean;
   includeBabelRc?: boolean;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   linter?: Linter;