@nx/workspace 16.8.0-beta.5 → 16.8.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.8.0-beta.5",
+  "version": "16.8.0-beta.7",
   "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": {
@@ -33,39 +33,39 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "16.8.0-beta.5",
-      "@nrwl/jest": "16.8.0-beta.5",
-      "@nrwl/linter": "16.8.0-beta.5",
-      "@nrwl/angular": "16.8.0-beta.5",
-      "@nrwl/cypress": "16.8.0-beta.5",
-      "@nrwl/detox": "16.8.0-beta.5",
-      "@nrwl/devkit": "16.8.0-beta.5",
-      "@nrwl/esbuild": "16.8.0-beta.5",
-      "@nrwl/eslint-plugin-nx": "16.8.0-beta.5",
-      "@nrwl/expo": "16.8.0-beta.5",
-      "@nrwl/express": "16.8.0-beta.5",
-      "@nrwl/nest": "16.8.0-beta.5",
-      "@nrwl/next": "16.8.0-beta.5",
-      "@nrwl/node": "16.8.0-beta.5",
+      "@nrwl/js": "16.8.0-beta.7",
+      "@nrwl/jest": "16.8.0-beta.7",
+      "@nrwl/linter": "16.8.0-beta.7",
+      "@nrwl/angular": "16.8.0-beta.7",
+      "@nrwl/cypress": "16.8.0-beta.7",
+      "@nrwl/detox": "16.8.0-beta.7",
+      "@nrwl/devkit": "16.8.0-beta.7",
+      "@nrwl/esbuild": "16.8.0-beta.7",
+      "@nrwl/eslint-plugin-nx": "16.8.0-beta.7",
+      "@nrwl/expo": "16.8.0-beta.7",
+      "@nrwl/express": "16.8.0-beta.7",
+      "@nrwl/nest": "16.8.0-beta.7",
+      "@nrwl/next": "16.8.0-beta.7",
+      "@nrwl/node": "16.8.0-beta.7",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.8.0-beta.5",
-      "@nrwl/react-native": "16.8.0-beta.5",
-      "@nrwl/react": "16.8.0-beta.5",
-      "@nrwl/rollup": "16.8.0-beta.5",
-      "@nrwl/storybook": "16.8.0-beta.5",
-      "@nrwl/tao": "16.8.0-beta.5",
-      "@nrwl/vite": "16.8.0-beta.5",
-      "@nrwl/web": "16.8.0-beta.5",
-      "@nrwl/webpack": "16.8.0-beta.5",
-      "nx": "16.8.0-beta.5"
+      "@nrwl/nx-plugin": "16.8.0-beta.7",
+      "@nrwl/react-native": "16.8.0-beta.7",
+      "@nrwl/react": "16.8.0-beta.7",
+      "@nrwl/rollup": "16.8.0-beta.7",
+      "@nrwl/storybook": "16.8.0-beta.7",
+      "@nrwl/tao": "16.8.0-beta.7",
+      "@nrwl/vite": "16.8.0-beta.7",
+      "@nrwl/web": "16.8.0-beta.7",
+      "@nrwl/webpack": "16.8.0-beta.7",
+      "nx": "16.8.0-beta.7"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.8.0-beta.5",
-    "@nx/devkit": "16.8.0-beta.5",
+    "@nrwl/workspace": "16.8.0-beta.7",
+    "@nx/devkit": "16.8.0-beta.7",
     "chalk": "^4.1.0",
     "ignore": "^5.0.4",
-    "nx": "16.8.0-beta.5",
+    "nx": "16.8.0-beta.7",
     "rxjs": "^7.8.0",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1"
@@ -74,5 +74,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
+  "gitHead": "6175b0f2033a80504bdc79d6212de9377843d787"
 }

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

@@ -77,6 +77,9 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
                 },
             },
         },
+        workspaceLayout: {
+            projectNameAndRootFormat: 'as-provided',
+        },
     };
     nxJson.targetDefaults = {
         build: {

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

@@ -24,5 +24,5 @@ export interface NormalizedSchema extends Schema {
     presetVersion?: string;
     isCustomPreset: boolean;
 }
-export declare function newGenerator(host: Tree, opts: Schema): Promise<() => Promise<void>>;
+export declare function newGenerator(tree: Tree, opts: Schema): Promise<() => Promise<void>>;
 export default newGenerator;

package/src/generators/new/new.js

@@ -7,24 +7,24 @@ const presets_1 = require("../utils/presets");
 const generate_workspace_files_1 = require("./generate-workspace-files");
 const generate_preset_1 = require("./generate-preset");
 const child_process_1 = require("child_process");
-async function newGenerator(host, opts) {
+async function newGenerator(tree, opts) {
     const options = normalizeOptions(opts);
-    validateOptions(options, host);
-    await (0, generate_workspace_files_1.generateWorkspaceFiles)(host, { ...options, nxCloud: undefined });
-    (0, generate_preset_1.addPresetDependencies)(host, options);
-    addCloudDependencies(host, options);
+    validateOptions(options, tree);
+    await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, { ...options, nxCloud: undefined });
+    (0, generate_preset_1.addPresetDependencies)(tree, options);
+    addCloudDependencies(tree, options);
     return async () => {
         const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
         if (pmc.preInstall) {
             (0, child_process_1.execSync)(pmc.preInstall, {
-                cwd: (0, devkit_1.joinPathFragments)(host.root, options.directory),
+                cwd: (0, devkit_1.joinPathFragments)(tree.root, options.directory),
                 stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
             });
         }
-        (0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
+        (0, devkit_1.installPackagesTask)(tree, false, options.directory, options.packageManager);
         // TODO: move all of these into create-nx-workspace
         if (options.preset !== presets_1.Preset.NPM && !options.isCustomPreset) {
-            await (0, generate_preset_1.generatePreset)(host, options);
+            await (0, generate_preset_1.generatePreset)(tree, options);
         }
     };
 }

package/src/generators/preset/preset.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.presetGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const presets_1 = require("../utils/presets");
+const path_1 = require("path");
 async function presetGenerator(tree, options) {
     options = normalizeOptions(options);
     const presetTask = await createPreset(tree, options);
@@ -22,6 +23,8 @@ async function createPreset(tree, options) {
         const { applicationGenerator: angularApplicationGenerator, } = require('@nx' + '/angular/generators');
         return angularApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             standalone: options.standaloneApi,
@@ -33,6 +36,8 @@ async function createPreset(tree, options) {
         const { applicationGenerator: angularApplicationGenerator, } = require('@nx' + '/angular/generators');
         return angularApplicationGenerator(tree, {
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             routing: options.routing,
@@ -46,6 +51,8 @@ async function createPreset(tree, options) {
             '/react');
         return reactApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
@@ -57,6 +64,8 @@ async function createPreset(tree, options) {
             '/react');
         return reactApplicationGenerator(tree, {
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             rootProject: true,
@@ -70,6 +79,8 @@ async function createPreset(tree, options) {
             '/next');
         return nextApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
@@ -81,6 +92,8 @@ async function createPreset(tree, options) {
             '/next');
         return nextApplicationGenerator(tree, {
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
@@ -93,6 +106,8 @@ async function createPreset(tree, options) {
             '/web');
         return webApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
             linter: options.linter,
             bundler: 'vite',
@@ -104,6 +119,8 @@ async function createPreset(tree, options) {
             '/nest');
         return nestApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
         });
@@ -112,6 +129,8 @@ async function createPreset(tree, options) {
         const { applicationGenerator: expressApplicationGenerator, } = require('@nx' + '/express');
         return expressApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
         });
@@ -121,6 +140,8 @@ async function createPreset(tree, options) {
             '/react-native');
         return reactNativeApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
         });
@@ -129,26 +150,22 @@ async function createPreset(tree, options) {
         const { expoApplicationGenerator } = require('@nx' + '/expo');
         return expoApplicationGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
-        const c = (0, devkit_1.readNxJson)(tree);
         const { initGenerator } = require('@nx' + '/js');
-        c.workspaceLayout = {
-            appsDir: 'packages',
-            libsDir: 'packages',
-        };
-        (0, devkit_1.updateNxJson)(tree, c);
         return initGenerator(tree, {});
     }
     else if (options.preset === presets_1.Preset.TsStandalone) {
-        const c = (0, devkit_1.readNxJson)(tree);
         const { libraryGenerator } = require('@nx' + '/js');
-        (0, devkit_1.updateNxJson)(tree, c);
         return libraryGenerator(tree, {
             name: options.name,
+            directory: (0, path_1.join)('packages', options.name),
+            projectNameAndRootFormat: 'as-provided',
             bundler: 'tsc',
             unitTestRunner: 'vitest',
             testEnvironment: 'node',
@@ -163,6 +180,8 @@ async function createPreset(tree, options) {
         return nodeApplicationGenerator(tree, {
             bundler,
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             standaloneConfig: options.standaloneConfig,
             framework: options.framework,
@@ -178,6 +197,8 @@ async function createPreset(tree, options) {
         return nodeApplicationGenerator(tree, {
             bundler,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             framework: options.framework,
             docker: options.docker,