nx 21.0.0-beta.1 → 21.0.0-beta.2

package/src/utils/nx-key.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NxKeyNotInstalledError = void 0;
+exports.createNxKeyLicenseeInformation = createNxKeyLicenseeInformation;
+exports.printNxKey = printNxKey;
+exports.getNxKeyInformation = getNxKeyInformation;
+const logger_1 = require("./logger");
+const package_manager_1 = require("./package-manager");
+const workspace_root_1 = require("./workspace-root");
+function createNxKeyLicenseeInformation(nxKey) {
+    if ('isPowerpack' in nxKey && nxKey.isPowerpack) {
+        return `Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${nxKey.seatCount > 1 ? 's' : ''} in ${nxKey.workspaceCount === 9999
+            ? 'an unlimited number of'
+            : nxKey.workspaceCount} workspace${nxKey.workspaceCount > 1 ? 's' : ''}.`;
+    }
+    else {
+        return `Licensed to ${nxKey.organizationName}.`;
+    }
+}
+async function printNxKey() {
+    try {
+        const key = await getNxKeyInformation();
+        if (key) {
+            logger_1.logger.log(createNxKeyLicenseeInformation(key));
+        }
+    }
+    catch { }
+}
+async function getNxKeyInformation() {
+    try {
+        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = (await Promise.resolve().then(() => require('@nx/powerpack-license')));
+        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
+    }
+    catch (e) {
+        try {
+            const { getNxKeyInformationAsync } = (await Promise.resolve().then(() => require('@nx/key')));
+            return getNxKeyInformationAsync(workspace_root_1.workspaceRoot);
+        }
+        catch (e) {
+            if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+                throw new NxKeyNotInstalledError(e);
+            }
+            throw e;
+        }
+    }
+}
+class NxKeyNotInstalledError extends Error {
+    constructor(e) {
+        super(`The "@nx/key" package is needed to use Nx key enabled features. Please install it with ${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/key`, { cause: e });
+    }
+}
+exports.NxKeyNotInstalledError = NxKeyNotInstalledError;

package/src/utils/package-manager.js

@@ -35,7 +35,7 @@ const execAsync = (0, util_1.promisify)(child_process_1.exec);
 function detectPackageManager(dir = '') {
     const nxJson = (0, configuration_1.readNxJson)();
     return (nxJson.cli?.packageManager ??
-        ((0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lockb'))
+        ((0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lockb')) || (0, fs_1.existsSync)((0, path_1.join)(dir, 'bun.lock'))
             ? 'bun'
             : (0, fs_1.existsSync)((0, path_1.join)(dir, 'yarn.lock'))
                 ? 'yarn'
@@ -151,7 +151,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             };
         },
         bun: () => {
-            // bun doesn't current support programatically reading config https://github.com/oven-sh/bun/issues/7140
+            // bun doesn't current support programmatically reading config https://github.com/oven-sh/bun/issues/7140
             return {
                 install: 'bun install',
                 ciInstall: 'bun install --no-cache',

package/src/utils/path.js

@@ -6,7 +6,7 @@ exports.getCwd = getCwd;
 const path = require("path");
 const workspace_root_1 = require("./workspace-root");
 function removeWindowsDriveLetter(osSpecificPath) {
-    return osSpecificPath.replace(/^[A-Z]:/, '');
+    return osSpecificPath.replace(/^[a-zA-Z]:/, '');
 }
 /**
  * Coverts an os specific path to a unix style path. Use this when writing paths to config files.

package/src/utils/require-nx-key.d.ts

@@ -0,0 +1 @@
+export declare function requireNxKey(): Promise<typeof import('@nx/key')>;

package/src/utils/require-nx-key.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requireNxKey = requireNxKey;
+const child_process_1 = require("child_process");
+const package_manager_1 = require("./package-manager");
+async function requireNxKey() {
+    // @ts-ignore
+    return Promise.resolve().then(() => require('@nx/key')).catch(async (e) => {
+        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
+            try {
+                (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/key@latest`, {
+                    windowsHide: false,
+                });
+                // @ts-ignore
+                return await Promise.resolve().then(() => require('@nx/key'));
+            }
+            catch (e) {
+                throw new Error('Failed to install @nx/key. Please install @nx/key and try again.');
+            }
+        }
+    });
+}

package/src/utils/workspace-context.d.ts

@@ -10,7 +10,9 @@ export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, pr
  */
 export declare function globWithWorkspaceContextSync(workspaceRoot: string, globs: string[], exclude?: string[]): string[];
 export declare function globWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string[]>;
+export declare function multiGlobWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string[][]>;
 export declare function hashWithWorkspaceContext(workspaceRoot: string, globs: string[], exclude?: string[]): Promise<string>;
+export declare function hashMultiGlobWithWorkspaceContext(workspaceRoot: string, globGroups: string[][]): Promise<string[]>;
 export declare function updateContextWithChangedFiles(workspaceRoot: string, createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
 export declare function updateFilesInContext(workspaceRoot: string, updatedFiles: string[], deletedFiles: string[]): Record<string, string>;
 export declare function getAllFileDataInContext(workspaceRoot: string): Promise<import("../native").FileData[]>;

package/src/utils/workspace-context.js

@@ -4,7 +4,9 @@ exports.setupWorkspaceContext = setupWorkspaceContext;
 exports.getNxWorkspaceFilesFromContext = getNxWorkspaceFilesFromContext;
 exports.globWithWorkspaceContextSync = globWithWorkspaceContextSync;
 exports.globWithWorkspaceContext = globWithWorkspaceContext;
+exports.multiGlobWithWorkspaceContext = multiGlobWithWorkspaceContext;
 exports.hashWithWorkspaceContext = hashWithWorkspaceContext;
+exports.hashMultiGlobWithWorkspaceContext = hashMultiGlobWithWorkspaceContext;
 exports.updateContextWithChangedFiles = updateContextWithChangedFiles;
 exports.updateFilesInContext = updateFilesInContext;
 exports.getAllFileDataInContext = getAllFileDataInContext;
@@ -50,6 +52,13 @@ async function globWithWorkspaceContext(workspaceRoot, globs, exclude) {
         return client_1.daemonClient.glob(globs, exclude);
     }
 }
+async function multiGlobWithWorkspaceContext(workspaceRoot, globs, exclude) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+        ensureContextAvailable(workspaceRoot);
+        return workspaceContext.multiGlob(globs, exclude);
+    }
+    return client_1.daemonClient.multiGlob(globs, exclude);
+}
 async function hashWithWorkspaceContext(workspaceRoot, globs, exclude) {
     if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
         ensureContextAvailable(workspaceRoot);
@@ -57,6 +66,13 @@ async function hashWithWorkspaceContext(workspaceRoot, globs, exclude) {
     }
     return client_1.daemonClient.hashGlob(globs, exclude);
 }
+async function hashMultiGlobWithWorkspaceContext(workspaceRoot, globGroups) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+        ensureContextAvailable(workspaceRoot);
+        return workspaceContext.hashFilesMatchingGlobs(globGroups);
+    }
+    return client_1.daemonClient.hashMultiGlob(globGroups);
+}
 async function updateContextWithChangedFiles(workspaceRoot, createdFiles, updatedFiles, deletedFiles) {
     if (!client_1.daemonClient.enabled()) {
         updateFilesInContext(workspaceRoot, [...createdFiles, ...updatedFiles], deletedFiles);

package/src/command-line/activate-powerpack/activate-powerpack.d.ts

@@ -1,2 +0,0 @@
-import { ActivatePowerpackOptions } from './command-object';
-export declare function handleActivatePowerpack(options: ActivatePowerpackOptions): Promise<void>;

package/src/command-line/activate-powerpack/activate-powerpack.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleActivatePowerpack = handleActivatePowerpack;
-const workspace_root_1 = require("../../utils/workspace-root");
-const enquirer_1 = require("enquirer");
-const child_process_1 = require("child_process");
-const package_manager_1 = require("../../utils/package-manager");
-async function handleActivatePowerpack(options) {
-    const license = options.license ??
-        (await (0, enquirer_1.prompt)({
-            type: 'input',
-            name: 'license',
-            message: 'Enter your License Key',
-        }));
-    const { activatePowerpack } = await requirePowerpack();
-    activatePowerpack(workspace_root_1.workspaceRoot, license);
-}
-async function requirePowerpack() {
-    // @ts-ignore
-    return Promise.resolve().then(() => require('@nx/powerpack-license')).catch(async (e) => {
-        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
-            try {
-                (0, child_process_1.execSync)(`${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/powerpack-license@latest`, {
-                    windowsHide: false,
-                });
-                // @ts-ignore
-                return await Promise.resolve().then(() => require('@nx/powerpack-license'));
-            }
-            catch (e) {
-                throw new Error('Failed to install @nx/powerpack-license. Please install @nx/powerpack-license and try again.');
-            }
-        }
-    });
-}

package/src/command-line/activate-powerpack/command-object.d.ts

@@ -1,6 +0,0 @@
-import { CommandModule } from 'yargs';
-export interface ActivatePowerpackOptions {
-    license: string;
-    verbose: boolean;
-}
-export declare const yargsActivatePowerpackCommand: CommandModule<{}, ActivatePowerpackOptions>;

package/src/command-line/init/implementation/react/write-craco-config.d.ts

@@ -1 +0,0 @@
-export declare function writeCracoConfig(appName: string, isCRA5: boolean, isStandalone: boolean): void;

package/src/command-line/init/implementation/react/write-craco-config.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCracoConfig = writeCracoConfig;
-const fs_1 = require("fs");
-function writeCracoConfig(appName, isCRA5, isStandalone) {
-    const configOverride = `
-  const path = require('path');
-  const TsConfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-  const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-  module.exports = {
-    webpack: {
-      configure: (config) => {
-        // Remove guard against importing modules outside of \`src\`.
-        // Needed for workspace projects.
-        config.resolve.plugins = config.resolve.plugins.filter(
-          (plugin) => !(plugin instanceof ModuleScopePlugin)
-        );
-        // Add support for importing workspace projects.
-        config.resolve.plugins.push(
-          new TsConfigPathsPlugin({
-            configFile: path.resolve(__dirname, 'tsconfig.json'),
-            extensions: ['.ts', '.tsx', '.js', '.jsx'],
-            mainFields: ['browser', 'module', 'main'],
-          })
-        );
-        ${isCRA5
-        ? `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules[1].oneOf.forEach((r) => {
-          if (r.loader && r.loader.indexOf('babel') !== -1) {
-            r.exclude = /node_modules/;
-            delete r.include;
-          }
-        });`
-        : `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules.forEach((r) => {
-          if (r.oneOf) {
-            const babelLoader = r.oneOf.find(
-              (rr) => rr.loader.indexOf('babel-loader') !== -1
-            );
-            babelLoader.exclude = /node_modules/;
-            delete babelLoader.include;
-          }
-        });
-        `}
-        return config;
-      },
-    },
-    jest: {
-      configure: (config) => {
-        config.resolver = '@nx/jest/plugins/resolver';
-        return config;
-      },
-    },
-  };
-  `;
-    (0, fs_1.writeFileSync)(isStandalone ? 'craco.config.js' : `apps/${appName}/craco.config.js`, configOverride);
-}

package/src/utils/powerpack.d.ts

@@ -1,5 +0,0 @@
-export declare function printPowerpackLicense(): Promise<void>;
-export declare function getPowerpackLicenseInformation(): Promise<import("@nx/powerpack-license").PowerpackLicense>;
-export declare class NxPowerpackNotInstalledError extends Error {
-    constructor(e: Error);
-}

package/src/utils/powerpack.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NxPowerpackNotInstalledError = void 0;
-exports.printPowerpackLicense = printPowerpackLicense;
-exports.getPowerpackLicenseInformation = getPowerpackLicenseInformation;
-const logger_1 = require("./logger");
-const package_manager_1 = require("./package-manager");
-const workspace_root_1 = require("./workspace-root");
-async function printPowerpackLicense() {
-    try {
-        const { organizationName, seatCount, workspaceCount } = await getPowerpackLicenseInformation();
-        logger_1.logger.log(`Nx Powerpack Licensed to ${organizationName} for ${seatCount} user${seatCount > 1 ? 's' : ''} in ${workspaceCount === 9999 ? 'an unlimited number of' : workspaceCount} workspace${workspaceCount > 1 ? 's' : ''}`);
-    }
-    catch { }
-}
-async function getPowerpackLicenseInformation() {
-    try {
-        const { getPowerpackLicenseInformation, getPowerpackLicenseInformationAsync, } = (await Promise.resolve().then(() => require('@nx/powerpack-license')));
-        return (getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation)(workspace_root_1.workspaceRoot);
-    }
-    catch (e) {
-        if ('code' in e && e.code === 'MODULE_NOT_FOUND') {
-            throw new NxPowerpackNotInstalledError(e);
-        }
-        throw e;
-    }
-}
-class NxPowerpackNotInstalledError extends Error {
-    constructor(e) {
-        super(`The "@nx/powerpack-license" package is needed to use Nx Powerpack enabled features. Please install the @nx/powerpack-license with ${(0, package_manager_1.getPackageManagerCommand)().addDev} @nx/powerpack-license`, { cause: e });
-    }
-}
-exports.NxPowerpackNotInstalledError = NxPowerpackNotInstalledError;