@nx/workspace 20.0.0-beta.3 → 20.0.0-beta.4

package/package.json

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

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

@@ -12,15 +12,15 @@ Run `npx nx graph` to visually explore what got created. Now, let's get you up t
 
 [Click here to finish setting up your workspace!](<%= nxCloudOnboardingUrl %>)
 
-<% } %>
+<% } %><% if (!isEmptyRepo) { %>
 ## Run tasks
-<% if (!isEmptyRepo) { %><% if (isJsStandalone) { %>
+<% if (isJsStandalone) { %>
 To build the library use:
 
 ```sh
 npx nx build
 ```
-        <% } else { %>
+<% } else { %>
 To run the dev server for your app, use:
 
 ```sh
@@ -38,7 +38,29 @@ To see all available targets to run for a project, run:
 ```sh
 npx nx show project <%= appName %>
 ```
-        <% } %><% } else { %>
+<% } %><% } else if (isTsPreset) { %>
+## Generate a library
+
+```sh
+npx nx g @nx/js:lib packages/pkg1 --publishable --importPath=@my-org/pkg1
+```
+
+## Run tasks
+
+To build the library use:
+
+```sh
+npx nx build pkg1
+```
+
+To run any task with Nx use:
+
+```sh
+npx nx <target> <project-name>
+```
+<% } else { %>
+## Run tasks
+
 To run tasks with Nx use:
 
 ```sh
@@ -66,7 +88,25 @@ npx nx release
 Pass `--dry-run` to see what would happen without actually releasing the library.
 
 [Learn more about Nx release &raquo;](hhttps://nx.dev/features/manage-releases?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects)
-<% } %><% if (!isJsStandalone) { %>
+<% } %><% if (isTsPreset && isUsingNewTsSolutionSetup) { %>
+## Keep TypeScript project references up to date
+
+Nx automatically updates TypeScript [project references](https://www.typescriptlang.org/docs/handbook/project-references.html) in `tsconfig.json` files to ensure they remain accurate based on your project dependencies (`import` or `require` statements). This sync is automatically done when running tasks such as `build` or `typecheck`, which require updated references to function correctly.
+
+To manually trigger the process to sync the project graph dependencies information to the TypeScript project references, run the following command:
+
+```sh
+npx nx sync
+```
+
+You can enforce that the TypeScript project references are always in the correct state when running in CI by adding a step to your CI job configuration that runs the following command:
+
+```sh
+npx nx sync:check
+```
+
+[Learn more about nx sync](https://nx.dev/reference/nx-commands#sync)
+<% } %><% if (!isJsStandalone && !isTsPreset) { %>
 ## Add new projects
 
 While you could add new projects to your workspace manually, you might want to leverage [Nx plugins](https://nx.dev/concepts/nx-plugins?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects) and their [code generation](https://nx.dev/features/generate-code?utm_source=nx_project&utm_medium=readme&utm_campaign=nx_projects) feature.

package/src/generators/new/generate-preset.js

@@ -70,6 +70,7 @@ function generatePreset(host, opts) {
             opts.ssr ? `--ssr` : null,
             opts.prefix !== undefined ? `--prefix=${opts.prefix}` : null,
             opts.nxCloudToken ? `--nxCloudToken=${opts.nxCloudToken}` : null,
+            opts.formatter ? `--formatter=${opts.formatter}` : null,
         ].filter((e) => !!e);
     }
 }

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

@@ -159,12 +159,12 @@ async function generateWorkspaceFiles(tree, options) {
     return token;
 }
 function setPresetProperty(tree, options) {
-    (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
-        if (options.preset === presets_1.Preset.NPM) {
+    if (options.preset === presets_1.Preset.NPM) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
             addPropertyWithStableKeys(json, 'extends', 'nx/presets/npm.json');
-        }
-        return json;
-    });
+            return json;
+        });
+    }
 }
 function createNxJson(tree, { directory, defaultBase, preset }) {
     const nxJson = {
@@ -210,7 +210,10 @@ function createFiles(tree, options) {
         options.preset === presets_1.Preset.RemixStandalone ||
         options.preset === presets_1.Preset.TsStandalone
         ? './files-root-app'
-        : options.preset === presets_1.Preset.NPM
+        : (options.preset === presets_1.Preset.TS &&
+            process.env.NX_ADD_PLUGINS !== 'false' &&
+            process.env.NX_ADD_TS_PLUGIN === 'true') ||
+            options.preset === presets_1.Preset.NPM
             ? './files-package-based-repo'
             : './files-integrated-repo';
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, {
@@ -237,6 +240,9 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud },
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,
         isJsStandalone: preset === presets_1.Preset.TsStandalone,
+        isTsPreset: preset === presets_1.Preset.TS,
+        isUsingNewTsSolutionSetup: process.env.NX_ADD_PLUGINS !== 'false' &&
+            process.env.NX_ADD_TS_PLUGIN === 'true',
         isEmptyRepo: !appName,
         appName,
         generateAppCmd: presetInfo.generateAppCmd,
@@ -316,7 +322,10 @@ function normalizeOptions(options) {
     };
 }
 function setUpWorkspacesInPackageJson(tree, options) {
-    if (options.preset === presets_1.Preset.NPM) {
+    if (options.preset === presets_1.Preset.NPM ||
+        (options.preset === presets_1.Preset.TS &&
+            process.env.NX_ADD_PLUGINS !== 'false' &&
+            process.env.NX_ADD_TS_PLUGIN === 'true')) {
         if (options.packageManager === 'pnpm') {
             tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages:
   - 'packages/*'

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

@@ -23,6 +23,7 @@ interface Schema {
     prefix?: string;
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
+    formatter?: 'none' | 'prettier';
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;

package/src/generators/new/schema.json

@@ -86,6 +86,12 @@
     "prefix": {
       "description": "The prefix to use for Angular component and directive selectors.",
       "type": "string"
+    },
+    "formatter": {
+      "description": "The tool to use for code formatting.",
+      "type": "string",
+      "enum": ["none", "prettier"],
+      "default": "none"
     }
   },
   "additionalProperties": true

package/src/generators/preset/preset.js

@@ -272,7 +272,11 @@ async function createPreset(tree, options) {
     }
     else if (options.preset === presets_1.Preset.TS) {
         const { initGenerator } = require('@nx' + '/js');
-        return initGenerator(tree, {});
+        return initGenerator(tree, {
+            formatter: options.formatter,
+            addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
+                process.env.NX_ADD_TS_PLUGIN === 'true',
+        });
     }
     else if (options.preset === presets_1.Preset.TsStandalone) {
         const { libraryGenerator } = require('@nx' + '/js');

package/src/generators/preset/schema.d.ts

@@ -6,6 +6,7 @@ export interface Schema {
   preset: Preset;
   style?: string;
   linter?: string;
+  formatter?: 'none' | 'prettier';
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;