@nx/workspace 18.0.4 → 18.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.0.4",
+  "version": "18.0.6",
   "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": "18.0.4",
+    "@nx/devkit": "18.0.6",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.0.4",
-    "@nrwl/workspace": "18.0.4"
+    "nx": "18.0.6",
+    "@nrwl/workspace": "18.0.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/files-readme/README.md.template

@@ -2,52 +2,71 @@
 
 <a alt="Nx logo" href="https://nx.dev" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png" width="45"></a>
 
-✨ **This workspace has been generated by [Nx, Smart Monorepos · Fast CI.](https://nx.dev)** ✨<% if (!!appName) { %>
+✨ **This workspace has been generated by [Nx, Smart Monorepos · Fast CI.](https://nx.dev)** ✨
 
-<% if (includeServe) { %>
-## Start the app
+## Integrate with editors
 
-To start the development server run `nx serve <%= appName %>`. Open your browser and navigate to http://localhost:4200/. Happy coding!<% } %>
-<% } %>
+Enhance your Nx experience by installing [Nx Console](https://nx.dev/nx-console) for your favorite editor. Nx Console
+provides an interactive UI to view your projects, run tasks, generate code, and more! Available for VSCode, IntelliJ and
+comes with a LSP for Vim users.
+<% if (!!appName) {
+    if (isJsStandalone) { %>
+## Build the library
+
+Run `npx nx build` to build the library. The build artifacts are stored in the output directory (i.e. `dist/`), ready to be published.
+<% } else { %>
+## Start the application
+
+Run `npx nx <%= serveCommand %> <%= appName %>` to start the development server. Happy coding!
+
+## Build for production
 
-## Generate code
+Run `npx nx build <%= appName %>` to build the application. The build artifacts are stored in the output directory (e.g. `dist/` or `build/`), ready to be deployed.
+<% } } else { %>
+## Nx plugins and code generators
 
-If you happen to use Nx plugins, you can leverage code generators that might come with it.
+Add Nx plugins to leverage their code generators and automated, inferred tasks.
 
-Run `nx list` to get a list of available plugins and whether they have generators. Then run `nx list <plugin-name>` to see what generators are available.
+```
+# Add plugin
+npx nx add @nx/react
+
+# Use code generator
+npx nx generate @nx/react:app demo
 
-Learn more about [Nx generators on the docs](https://nx.dev/features/generate-code).
+# Run development server
+npx nx serve demo
+
+# View project details
+npx nx show project demo --web
+```
 
+Run `npx nx list` to get a list of available plugins and whether they have generators. Then run `npx nx list <plugin-name>` to see what generators are available.
+
+Learn more about [code generators](https://nx.dev/features/generate-code) and [inferred tasks](https://nx.dev/concepts/inferred-tasks) in the docs.
+<% } %>
 ## Running tasks
 
 To execute tasks with Nx use the following syntax:
 
 ```
-nx <target> <project> <...options>
+npx nx <target> <project> <...options>
 ```
 
 You can also run multiple targets:
 
 ```
-nx run-many -t <target1> <target2>
+npx nx run-many -t <target1> <target2>
 ```
 
 ..or add `-p` to filter specific projects
 
 ```
-nx run-many -t <target1> <target2> -p <proj1> <proj2>
+npx nx run-many -t <target1> <target2> -p <proj1> <proj2>
 ```
 
 Targets can be defined in the `package.json` or `projects.json`. Learn more [in the docs](https://nx.dev/features/run-tasks).
 
-## Want better Editor Integration?
-
-Have a look at the [Nx Console extensions](https://nx.dev/nx-console). It provides autocomplete support, a UI for exploring and running tasks & generators, and more! Available for VSCode, IntelliJ and comes with a LSP for Vim users.
-
-## Ready to deploy?
-
-Just run `nx build demoapp` to build the application. The build artifacts will be stored in the `dist/` directory, ready to be deployed.
-
 ## Set up CI!
 
 Nx comes with local caching already built-in (check your `nx.json`). On CI you might want to go a step further.
@@ -56,8 +75,9 @@ Nx comes with local caching already built-in (check your `nx.json`). On CI you m
 - [Set up task distribution across multiple machines](https://nx.dev/nx-cloud/features/distribute-task-execution)
 - [Learn more how to setup CI](https://nx.dev/recipes/ci)
 
-## Explore the Project Graph
-Run `nx graph` to show the graph of the workspace.
+## Explore the project graph
+
+Run `npx nx graph` to show the graph of the workspace.
 It will show tasks that you can run with Nx.
 
 - [Learn more about Exploring the Project Graph](https://nx.dev/core-features/explore-graph)

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

@@ -103,8 +103,11 @@ function createReadme(tree, { name, appName, directory, preset }) {
     const formattedNames = (0, devkit_1.names)(name);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,
-        includeServe: preset !== presets_1.Preset.TsStandalone,
+        isJsStandalone: preset === presets_1.Preset.TsStandalone,
         appName,
+        serveCommand: preset === presets_1.Preset.NextJs || preset === presets_1.Preset.NextJsStandalone
+            ? 'dev'
+            : 'serve',
         name,
     });
 }
@@ -121,8 +124,7 @@ function addNpmScripts(tree, options) {
         options.preset === presets_1.Preset.ReactStandalone ||
         options.preset === presets_1.Preset.VueStandalone ||
         options.preset === presets_1.Preset.NuxtStandalone ||
-        options.preset === presets_1.Preset.NodeStandalone ||
-        options.preset === presets_1.Preset.NextJsStandalone) {
+        options.preset === presets_1.Preset.NodeStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {
                 start: 'nx serve',
@@ -132,6 +134,17 @@ function addNpmScripts(tree, options) {
             return json;
         });
     }
+    if (options.preset === presets_1.Preset.NextJsStandalone) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+            Object.assign(json.scripts, {
+                dev: 'nx dev',
+                build: 'nx build',
+                start: 'nx start',
+                test: 'nx test',
+            });
+            return json;
+        });
+    }
     if (options.preset === presets_1.Preset.TsStandalone) {
         (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {

package/src/utils/output.js

@@ -10,7 +10,7 @@ if (process.env.CI === 'true') {
 }
 class CLIOutput {
     constructor() {
-        this.NX_PREFIX = `${chalk.cyan('>')} ${chalk.reset.inverse.bold.cyan(' NX ')}`;
+        this.NX_PREFIX = chalk.reset.inverse.bold.cyan(' NX ');
         /**
          * Longer dash character which forms more of a continuous line when place side to side
          * with itself, unlike the standard dash character