@nrwl/workspace 12.8.0-beta.0 → 12.8.0

package/README.md

@@ -78,15 +78,16 @@ The `create-nx-workspace` command will ask you to select a preset, which will co
 ```
 ? What to create in the new workspace (Use arrow keys)
 ❯ empty             [an empty workspace with a layout that works best for building apps]
-  oss               [an empty workspace with a layout that works best for open-source projects]
+  npm               [an empty workspace set up to publish npm packages (similar to and compatible with yarn workspaces)]
   react             [a workspace with a single React application]
-  next.js           [a workspace with a single Next.js application]
   angular           [a workspace with a single Angular application]
-  express           [a workspace with a single Express application]
+  next.js           [a workspace with a single Next.js application]
+  gatsby            [a workspace with a single Gatsby application]
   nest              [a workspace with a single Nest application]
+  express           [a workspace with a single Express application]
+  web components    [a workspace with a single app built using web components]
   react-express     [a workspace with a full stack application (React + Express)]
   angular-nest      [a workspace with a full stack application (Angular + Nest)]
-  web components    [a workspace with a single app built using web components]
 ```
 
 Select the preset that works best for you.

package/generators.d.ts

@@ -1,4 +1,5 @@
 export { libraryGenerator } from './src/generators/library/library';
+export { npmPackageGenerator } from './src/generators/npm-package/npm-package';
 export { moveGenerator } from './src/generators/move/move';
 export { removeGenerator } from './src/generators/remove/remove';
 export { runCommandsGenerator } from './src/generators/run-commands/run-commands';

package/generators.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = void 0;
+exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.npmPackageGenerator = exports.libraryGenerator = void 0;
 var library_1 = require("./src/generators/library/library");
 Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
+var npm_package_1 = require("./src/generators/npm-package/npm-package");
+Object.defineProperty(exports, "npmPackageGenerator", { enumerable: true, get: function () { return npm_package_1.npmPackageGenerator; } });
 var move_1 = require("./src/generators/move/move");
 Object.defineProperty(exports, "moveGenerator", { enumerable: true, get: function () { return move_1.moveGenerator; } });
 var remove_1 = require("./src/generators/remove/remove");

package/generators.js.map

@@ -1 +1 @@
-{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/workspace/generators.ts"],"names":[],"mappings":";;;AAAA,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAA2G;AAAlG,oIAAA,2BAA2B,OAAA"}
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../packages/workspace/generators.ts"],"names":[],"mappings":";;;AAAA,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,wEAA+E;AAAtE,kHAAA,mBAAmB,OAAA;AAC5B,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,2EAAkF;AAAzE,oHAAA,oBAAoB,OAAA;AAC7B,sGAA2G;AAAlG,oIAAA,2BAA2B,OAAA"}

package/generators.json

@@ -69,6 +69,12 @@
       "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectSchematic",
       "schema": "./src/generators/convert-to-nx-project/schema.json",
       "description": "Moves a project's configuration outside of workspace.json"
+    },
+
+    "npm-package": {
+      "factory": "./src/generators/npm-package/npm-package#npmPackageSchematic",
+      "schema": "./src/generators/npm-package/schema.json",
+      "description": "Create a minimal npm package"
     }
   },
   "generators": {
@@ -139,6 +145,12 @@
       "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectGenerator",
       "schema": "./src/generators/convert-to-nx-project/schema.json",
       "description": "Moves a project's configuration outside of workspace.json"
+    },
+
+    "npm-package": {
+      "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
+      "schema": "./src/generators/npm-package/schema.json",
+      "description": "Create a minimal npm package"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "12.8.0-beta.0",
+  "version": "12.8.0",
   "description": "Smart, Extensible Build Framework",
   "repository": {
     "type": "git",
@@ -55,10 +55,10 @@
     "prettier": "^2.3.0"
   },
   "dependencies": {
-    "@nrwl/cli": "12.8.0-beta.0",
-    "@nrwl/devkit": "12.8.0-beta.0",
-    "@nrwl/jest": "12.8.0-beta.0",
-    "@nrwl/linter": "12.8.0-beta.0",
+    "@nrwl/cli": "12.8.0",
+    "@nrwl/devkit": "12.8.0",
+    "@nrwl/jest": "12.8.0",
+    "@nrwl/linter": "12.8.0",
     "chokidar": "^3.5.1",
     "cosmiconfig": "^4.0.0",
     "fs-extra": "^9.1.0",

package/presets/npm.json

@@ -0,0 +1,21 @@
+{
+  "implicitDependencies": {
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    },
+    ".eslintrc.json": "*"
+  },
+  "targetDependencies": {
+    "build": [
+      {
+        "target": "build",
+        "projects": "dependencies"
+      }
+    ]
+  },
+  "workspaceLayout": {
+    "appsDir": "packages",
+    "libsDir": "packages"
+  }
+}

package/src/command-line/nx-commands.js

@@ -89,9 +89,9 @@ exports.commandsObject = yargs
     return (yield Promise.resolve().then(() => require('./workspace-generators'))).workspaceGenerators(process.argv.slice(3));
 }))
     .command('migrate', `Creates a migrations file or runs migrations from the migrations file.
-     - Migrate packages and create migrations.json (e.g., nx migrate @nrwl/workspace@latest)
-     - Run migrations (e.g., nx migrate --run-migrations=migrations.json)
-    `, (yargs) => yargs, () => {
+- Migrate packages and create migrations.json (e.g., nx migrate @nrwl/workspace@latest)
+- Run migrations (e.g., nx migrate --run-migrations=migrations.json)
+`, (yargs) => yargs, () => {
     if (process.env.NX_MIGRATE_USE_LOCAL === undefined) {
         const p = taoPath();
         child_process_1.execSync(`${p} migrate ${process.argv.slice(3).join(' ')}`, {
@@ -114,6 +114,7 @@ exports.commandsObject = yargs
 function withFormatOptions(yargs) {
     return withAffectedOptions(yargs)
         .option('libs-and-apps', {
+        describe: 'Format only libraries and applications files.',
         type: 'boolean',
     })
         .option('projects', {
@@ -240,6 +241,7 @@ function withRunManyOptions(yargs) {
         describe: 'Include dependencies of specified projects when computing what to run',
         type: 'boolean',
         default: false,
+        deprecated: 'Configure target dependencies instead. It will be removed in v14.',
     })
         .options('only-failed', {
         describe: 'Only run the target on projects which previously failed',
@@ -262,7 +264,7 @@ function withRunManyOptions(yargs) {
 function withDepGraphOptions(yargs) {
     return yargs
         .option('file', {
-        describe: 'output file (e.g. --file=output.json or --file=dep-graph.html)',
+        describe: 'Output file (e.g. --file=output.json or --file=dep-graph.html)',
         type: 'string',
     })
         .option('focus', {
@@ -275,19 +277,19 @@ function withDepGraphOptions(yargs) {
         coerce: parseCSV,
     })
         .option('groupByFolder', {
-        describe: 'Group projects by folder in dependency graph',
+        describe: 'Group projects by folder in the dependency graph',
         type: 'boolean',
     })
         .option('host', {
-        describe: 'Bind the dep graph server to a specific ip address.',
+        describe: 'Bind the dependency graph server to a specific ip address.',
         type: 'string',
     })
         .option('port', {
-        describe: 'Bind the dep graph server to a specific port.',
+        describe: 'Bind the dependecy graph server to a specific port.',
         type: 'number',
     })
         .option('watch', {
-        describe: 'Watch for changes to dep graph and update in-browser',
+        describe: 'Watch for changes to dependency graph and update in-browser',
         type: 'boolean',
         default: false,
     });
@@ -302,12 +304,14 @@ function parseCSV(args) {
 function withParallel(yargs) {
     return yargs
         .option('parallel', {
-        describe: 'Parallelize the command (default: false)',
+        describe: 'Parallelize the command',
         type: 'boolean',
+        default: false,
     })
         .option('maxParallel', {
-        describe: 'Max number of parallel processes. This flag is ignored if the parallel option is set to `false`. (default: 3)',
+        describe: 'Max number of parallel processes. This flag is ignored if the parallel option is set to `false`.',
         type: 'number',
+        default: 3,
     });
 }
 function withTarget(yargs) {

package/src/command-line/nx-commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"nx-commands.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/nx-commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nx-commands.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/nx-commands.ts"],"names":[],"mappings":"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"}

package/src/command-line/print-affected.js

@@ -4,7 +4,6 @@ exports.selectPrintAffected = exports.printAffected = void 0;
 const tslib_1 = require("tslib");
 const run_command_1 = require("../tasks-runner/run-command");
 const utils_1 = require("../tasks-runner/utils");
-const package_manager_1 = require("@nrwl/tao/src/shared/package-manager");
 function printAffected(affectedProjectsWithTargetAndConfig, affectedProjects, projectGraph, { nxJson }, nxArgs, overrides) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectNames = affectedProjects.map((p) => p.name);
@@ -32,13 +31,11 @@ function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs,
             overrides,
             errorIfCannotFindConfiguration: false,
         }));
-        const pm = package_manager_1.detectPackageManager();
-        const isYarn = pm === 'yarn';
         return tasks.map((task, index) => ({
             id: task.id,
             overrides,
             target: task.target,
-            command: `${isYarn ? 'yarn' : `${pm} run`} ${utils_1.getCommandAsString('nx', isYarn, task)}`,
+            command: utils_1.getCommandAsString(task),
             outputs: utils_1.getOutputs(projectGraph.nodes, task),
         }));
     });

package/src/command-line/print-affected.js.map

@@ -1 +1 @@
-{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/print-affected.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"print-affected.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/print-affected.ts"],"names":[],"mappings":"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"}