@nx/workspace - npm Package Compare versions

Comparing version 16.8.0-beta.6 to 16.8.0-beta.7

package.json

 {
   "name": "@nx/workspace",
-  "version": "16.8.0-beta.6",
+  "version": "16.8.0-beta.7",
   "private": false,
@@ -36,35 +36,35 @@ "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.",
     "packageGroup": {
-      "@nrwl/js": "16.8.0-beta.6",
-      "@nrwl/jest": "16.8.0-beta.6",
-      "@nrwl/linter": "16.8.0-beta.6",
-      "@nrwl/angular": "16.8.0-beta.6",
-      "@nrwl/cypress": "16.8.0-beta.6",
-      "@nrwl/detox": "16.8.0-beta.6",
-      "@nrwl/devkit": "16.8.0-beta.6",
-      "@nrwl/esbuild": "16.8.0-beta.6",
-      "@nrwl/eslint-plugin-nx": "16.8.0-beta.6",
-      "@nrwl/expo": "16.8.0-beta.6",
-      "@nrwl/express": "16.8.0-beta.6",
-      "@nrwl/nest": "16.8.0-beta.6",
-      "@nrwl/next": "16.8.0-beta.6",
-      "@nrwl/node": "16.8.0-beta.6",
+      "@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.6",
-      "@nrwl/react-native": "16.8.0-beta.6",
-      "@nrwl/react": "16.8.0-beta.6",
-      "@nrwl/rollup": "16.8.0-beta.6",
-      "@nrwl/storybook": "16.8.0-beta.6",
-      "@nrwl/tao": "16.8.0-beta.6",
-      "@nrwl/vite": "16.8.0-beta.6",
-      "@nrwl/web": "16.8.0-beta.6",
-      "@nrwl/webpack": "16.8.0-beta.6",
-      "nx": "16.8.0-beta.6"
+      "@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.6",
-    "@nx/devkit": "16.8.0-beta.6",
+    "@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.6",
+    "nx": "16.8.0-beta.7",
     "rxjs": "^7.8.0",
@@ -78,3 +78,3 @@ "tslib": "^2.3.0",
   "type": "commonjs",
-  "gitHead": "0cc6ba996f2ef09f00b932c8eacf42de642457f3"
+  "gitHead": "6175b0f2033a80504bdc79d6212de9377843d787"
 }

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

@@ -80,2 +80,5 @@ "use strict";
         },
+        workspaceLayout: {
+            projectNameAndRootFormat: 'as-provided',
+        },
     };
@@ -82,0 +85,0 @@ nxJson.targetDefaults = {

src/generators/new/new.d.ts

@@ -27,3 +27,3 @@ import { PackageManager, Tree } from '@nx/devkit';
 }
-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;

src/generators/new/new.js

@@ -10,8 +10,8 @@ "use strict";
 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 () => {
@@ -21,10 +21,10 @@ const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);
             (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);
         }
@@ -31,0 +31,0 @@ };

src/generators/preset/preset.js

@@ -6,2 +6,3 @@ "use strict";
 const presets_1 = require("../utils/presets");
+const path_1 = require("path");
 async function presetGenerator(tree, options) {
@@ -26,2 +27,4 @@ options = normalizeOptions(options);
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -38,2 +41,4 @@ linter: options.linter,
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -52,2 +57,4 @@ linter: options.linter,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -64,2 +71,4 @@ linter: options.linter,
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -78,2 +87,4 @@ linter: options.linter,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -90,2 +101,4 @@ linter: options.linter,
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -103,2 +116,4 @@ linter: options.linter,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             style: options.style,
@@ -115,2 +130,4 @@ linter: options.linter,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -124,2 +141,4 @@ e2eTestRunner: options.e2eTestRunner ?? 'jest',
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -134,2 +153,4 @@ e2eTestRunner: options.e2eTestRunner ?? 'jest',
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -143,2 +164,4 @@ e2eTestRunner: options.e2eTestRunner ?? 'detox',
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -149,17 +172,11 @@ 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',
@@ -179,2 +196,4 @@ unitTestRunner: 'vitest',
             name: options.name,
+            directory: '.',
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -195,2 +214,4 @@ standaloneConfig: options.standaloneConfig,
             name: options.name,
+            directory: (0, path_1.join)('apps', options.name),
+            projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
@@ -197,0 +218,0 @@ framework: options.framework,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

271346

increased by0.49%

Lines of code

6090

increased by0.4%

Dependency changes

• + Added@nrwl/devkit@16.8.0-beta.7(transitive)

• + Added@nrwl/tao@16.8.0-beta.7(transitive)

• + Added@nrwl/workspace@16.8.0-beta.7(transitive)

• + Added@nx/devkit@16.8.0-beta.7(transitive)

• + Added@nx/nx-darwin-arm64@16.8.0-beta.7(transitive)

• + Added@nx/nx-darwin-x64@16.8.0-beta.7(transitive)

• + Added@nx/nx-freebsd-x64@16.8.0-beta.7(transitive)

• + Added@nx/nx-linux-arm-gnueabihf@16.8.0-beta.7(transitive)

• + Added@nx/nx-linux-arm64-gnu@16.8.0-beta.7(transitive)

• + Added@nx/nx-linux-arm64-musl@16.8.0-beta.7(transitive)

• + Added@nx/nx-linux-x64-gnu@16.8.0-beta.7(transitive)

• + Added@nx/nx-linux-x64-musl@16.8.0-beta.7(transitive)

• + Added@nx/nx-win32-arm64-msvc@16.8.0-beta.7(transitive)

• + Added@nx/nx-win32-x64-msvc@16.8.0-beta.7(transitive)

• + Addednx@16.8.0-beta.7(transitive)

• - Removed@nrwl/devkit@16.8.0-beta.6(transitive)

• - Removed@nrwl/tao@16.8.0-beta.6(transitive)

• - Removed@nrwl/workspace@16.8.0-beta.6(transitive)

• - Removed@nx/devkit@16.8.0-beta.6(transitive)

• - Removed@nx/nx-darwin-arm64@16.8.0-beta.6(transitive)

• - Removed@nx/nx-darwin-x64@16.8.0-beta.6(transitive)

• - Removed@nx/nx-freebsd-x64@16.8.0-beta.6(transitive)

• - Removed@nx/nx-linux-arm-gnueabihf@16.8.0-beta.6(transitive)

• - Removed@nx/nx-linux-arm64-gnu@16.8.0-beta.6(transitive)

• - Removed@nx/nx-linux-arm64-musl@16.8.0-beta.6(transitive)

• - Removed@nx/nx-linux-x64-gnu@16.8.0-beta.6(transitive)

• - Removed@nx/nx-linux-x64-musl@16.8.0-beta.6(transitive)

• - Removed@nx/nx-win32-arm64-msvc@16.8.0-beta.6(transitive)

• - Removed@nx/nx-win32-x64-msvc@16.8.0-beta.6(transitive)

• - Removednx@16.8.0-beta.6(transitive)

• Updated@nrwl/workspace@16.8.0-beta.7

• Updated@nx/devkit@16.8.0-beta.7

• Updatednx@16.8.0-beta.7