@nx/workspace 19.5.5 → 19.6.0-beta.0

package/package.json

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

package/src/generators/new/generate-workspace-files.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from './new';
-export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<void>;
+export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<string>;

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

@@ -6,6 +6,7 @@ const versions_1 = require("../../utils/versions");
 const path_1 = require("path");
 const presets_1 = require("../utils/presets");
 const default_base_1 = require("../../utilities/default-base");
+const connect_to_nx_cloud_1 = require("nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 async function generateWorkspaceFiles(tree, options) {
     if (!options.name) {
         throw new Error(`Invalid options, "name" is required.`);
@@ -16,7 +17,14 @@ async function generateWorkspaceFiles(tree, options) {
     options = normalizeOptions(options);
     createReadme(tree, options);
     createFiles(tree, options);
-    createNxJson(tree, options);
+    const nxJson = createNxJson(tree, options);
+    const token = options.nxCloud !== 'skip'
+        ? await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {
+            installationSource: 'create-nx-workspace',
+            directory: options.directory,
+            github: options.useGitHub,
+        }, nxJson)
+        : null;
     const [packageMajor] = packageManagerVersion.split('.');
     if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
         createNpmrc(tree, options);
@@ -31,7 +39,7 @@ async function generateWorkspaceFiles(tree, options) {
     setPresetProperty(tree, options);
     addNpmScripts(tree, options);
     setUpWorkspacesInPackageJson(tree, options);
-    await (0, devkit_1.formatFiles)(tree);
+    return token;
 }
 function setPresetProperty(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
@@ -72,6 +80,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         }
     }
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
+    return nxJson;
 }
 function createFiles(tree, options) {
     const formattedNames = (0, devkit_1.names)(options.name);
@@ -171,6 +180,7 @@ function normalizeOptions(options) {
         name,
         ...options,
         defaultBase,
+        nxCloud: options.nxCloud ?? 'skip',
     };
 }
 function setUpWorkspacesInPackageJson(tree, options) {

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

@@ -21,6 +21,8 @@ interface Schema {
     e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
     prefix?: string;
+    useGitHub?: boolean;
+    nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;

package/src/generators/new/new.js

@@ -10,8 +10,9 @@ const child_process_1 = require("child_process");
 async function newGenerator(tree, opts) {
     const options = normalizeOptions(opts);
     validateOptions(options, tree);
-    await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, { ...options, nxCloud: undefined });
+    await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, options);
     (0, generate_preset_1.addPresetDependencies)(tree, options);
+    await (0, devkit_1.formatFiles)(tree);
     return async () => {
         if (!options.skipInstall) {
             const pmc = (0, devkit_1.getPackageManagerCommand)(options.packageManager);