@nx/workspace 21.4.0-beta.1 → 21.4.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "21.4.0-beta.1",
+  "version": "21.4.0-beta.11",
   "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": {
@@ -38,17 +38,17 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.4.0-beta.1",
+    "@nx/devkit": "21.4.0-beta.11",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "picomatch": "4.0.2",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "21.4.0-beta.1"
+    "nx": "21.4.0-beta.11"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.1"
+    "nx": "21.4.0-beta.11"
   },
   "publishConfig": {
     "access": "public"

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

@@ -224,7 +224,7 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
         generateLibCmd: null,
     };
     const nxCloudOnboardingUrl = nxCloudToken
-        ? await (0, url_shorten_1.createNxCloudOnboardingURL)('readme', nxCloudToken)
+        ? await (0, url_shorten_1.createNxCloudOnboardingURL)('readme', nxCloudToken, undefined, false)
         : null;
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,

package/src/utilities/typescript/ts-solution-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAqEpB,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAuDnB"}
+{"version":3,"file":"ts-solution-setup.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/ts-solution-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAgFpB,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO,CAO3D;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,iBAuDnB"}

package/src/utilities/typescript/ts-solution-setup.js

@@ -21,6 +21,15 @@ function isWorkspacesEnabled(tree) {
     }
     return false;
 }
+/**
+ * The TS solution setup requires:
+ * - `tsconfig.base.json`: TS config with common compiler options needed by the
+ *    majority of projects in the workspace. It's meant to be extended by other
+ *    tsconfig files in the workspace to reuse them.
+ * - `tsconfig.json`: TS solution config file that references all other projects
+ *    in the repo. It shouldn't include any file and it's not meant to be
+ *    extended or define any common compiler options.
+ */
 function isWorkspaceSetupWithTsSolution(tree) {
     if (!tree.exists('tsconfig.base.json') || !tree.exists('tsconfig.json')) {
         return false;
@@ -30,25 +39,28 @@ function isWorkspaceSetupWithTsSolution(tree) {
         return false;
     }
     /**
-     * New setup:
-     * - `files` is defined and set to an empty array
-     * - `references` is defined and set to an empty array
-     * - `include` is not defined or is set to an empty array
+     * TS solution setup requires:
+     * - One of `files` or `include` defined
+     * - If set, they must be empty arrays
+     *
+     * Note: while the TS solution setup uses TS project references, in the initial
+     * state of the workspace, where there are no projects, `references` is not
+     * required to be defined.
      */
-    if (!tsconfigJson.files ||
-        tsconfigJson.files.length > 0 ||
-        !tsconfigJson.references ||
-        !!tsconfigJson.include?.length) {
+    if ((!tsconfigJson.files && !tsconfigJson.include) ||
+        tsconfigJson.files?.length > 0 ||
+        tsconfigJson.include?.length > 0) {
         return false;
     }
+    /**
+     * TS solution setup requires:
+     * - `compilerOptions.composite`: true
+     * - `compilerOptions.declaration`: true or not set (default to true)
+     */
     const baseTsconfigJson = (0, devkit_1.readJson)(tree, 'tsconfig.base.json');
     if (!baseTsconfigJson.compilerOptions ||
         !baseTsconfigJson.compilerOptions.composite ||
-        !baseTsconfigJson.compilerOptions.declaration) {
-        return false;
-    }
-    const { compilerOptions, ...rest } = baseTsconfigJson;
-    if (Object.keys(rest).length > 0) {
+        baseTsconfigJson.compilerOptions.declaration === false) {
         return false;
     }
     return true;