nx 22.6.0 → 22.6.1

package/src/command-line/init/implementation/react/check-for-custom-webpack-setup.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForCustomWebpackSetup = checkForCustomWebpackSetup;
-const fileutils_1 = require("../../../../utils/fileutils");
-function checkForCustomWebpackSetup() {
-    const packageJson = (0, fileutils_1.readJsonFile)('package.json');
-    const combinedDeps = {
-        ...packageJson.dependencies,
-        ...packageJson.devDependencies,
-    };
-    ['react-app-rewired', '@craco/craco'].forEach((pkg) => {
-        if (combinedDeps[pkg]) {
-            console.log(`Skipping migration due to custom webpack setup. Found "${pkg}" usage. Use --force to continue anyway.`);
-            process.exit(1);
-        }
-    });
-}

package/src/command-line/init/implementation/react/check-for-uncommitted-changes.d.ts

@@ -1,2 +0,0 @@
-export declare function checkForUncommittedChanges(): void;
-//# sourceMappingURL=check-for-uncommitted-changes.d.ts.map

package/src/command-line/init/implementation/react/check-for-uncommitted-changes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"check-for-uncommitted-changes.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/check-for-uncommitted-changes.ts"],"names":[],"mappings":"AAEA,wBAAgB,0BAA0B,SAiBzC"}

package/src/command-line/init/implementation/react/check-for-uncommitted-changes.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkForUncommittedChanges = checkForUncommittedChanges;
-const child_process_1 = require("child_process");
-function checkForUncommittedChanges() {
-    const gitResult = (0, child_process_1.execSync)('git status --porcelain', {
-        windowsHide: false,
-    }).toString();
-    const filteredResults = gitResult
-        .split('\n')
-        .filter((line) => !line.includes('.nx') && line.trim().length > 0);
-    if (filteredResults.length > 0) {
-        console.log('❗️ Careful!');
-        console.log('You have uncommitted changes in your repository.');
-        console.log('');
-        console.log(filteredResults.join('\n').toString());
-        console.log('Please commit your changes before running the migrator!');
-        process.exit(1);
-    }
-}

package/src/command-line/init/implementation/react/clean-up-files.d.ts

@@ -1,2 +0,0 @@
-export declare function cleanUpFiles(appName: string, isStandalone: boolean): void;
-//# sourceMappingURL=clean-up-files.d.ts.map

package/src/command-line/init/implementation/react/clean-up-files.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clean-up-files.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/clean-up-files.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,QA6BlE"}

package/src/command-line/init/implementation/react/clean-up-files.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanUpFiles = cleanUpFiles;
-const node_fs_1 = require("node:fs");
-const fileutils_1 = require("../../../../utils/fileutils");
-function cleanUpFiles(appName, isStandalone) {
-    // Delete targets from project since we delegate to npm scripts.
-    const projectJsonPath = isStandalone
-        ? 'project.json'
-        : `apps/${appName}/project.json`;
-    const json = (0, fileutils_1.readJsonFile)(projectJsonPath);
-    delete json.targets;
-    if (isStandalone) {
-        if (json.sourceRoot) {
-            json.sourceRoot = json.sourceRoot.replace(`apps/${appName}/`, '');
-        }
-        if (json['$schema']) {
-            json['$schema'] = json['$schema'].replace('../../node_modules', 'node_modules');
-        }
-    }
-    (0, fileutils_1.writeJsonFile)(projectJsonPath, json);
-    (0, node_fs_1.rmSync)('temp-workspace', { recursive: true, force: true });
-    if (isStandalone) {
-        (0, node_fs_1.rmSync)('babel.config.json', { recursive: true, force: true });
-        (0, node_fs_1.rmSync)('jest.preset.js', { recursive: true, force: true });
-        (0, node_fs_1.rmSync)('jest.config.ts', { recursive: true, force: true });
-        (0, node_fs_1.rmSync)('libs', { recursive: true, force: true });
-        (0, node_fs_1.rmSync)('tools', { recursive: true, force: true });
-    }
-}

package/src/command-line/init/implementation/react/index.d.ts

@@ -1,5 +0,0 @@
-import { InitArgs } from '../../init-v1';
-type Options = InitArgs;
-export declare function addNxToCraRepo(_options: Options): Promise<void>;
-export {};
-//# sourceMappingURL=index.d.ts.map

package/src/command-line/init/implementation/react/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAczC,KAAK,OAAO,GAAG,QAAQ,CAAC;AAUxB,wBAAsB,cAAc,CAAC,QAAQ,EAAE,OAAO,iBA8BrD"}

package/src/command-line/init/implementation/react/index.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addNxToCraRepo = addNxToCraRepo;
-const child_process_1 = require("child_process");
-const path_1 = require("path");
-const fs_1 = require("fs");
-const fileutils_1 = require("../../../../utils/fileutils");
-const output_1 = require("../../../../utils/output");
-const package_manager_1 = require("../../../../utils/package-manager");
-const check_for_custom_webpack_setup_1 = require("./check-for-custom-webpack-setup");
-const read_name_from_package_json_1 = require("./read-name-from-package-json");
-const rename_js_to_jsx_1 = require("./rename-js-to-jsx");
-const write_vite_config_1 = require("./write-vite-config");
-const write_vite_index_html_1 = require("./write-vite-index-html");
-async function addNxToCraRepo(_options) {
-    if (!_options.force) {
-        (0, check_for_custom_webpack_setup_1.checkForCustomWebpackSetup)();
-    }
-    const options = await normalizeOptions(_options);
-    await addBundler(options);
-    (0, fs_1.appendFileSync)(`.gitignore`, '\nnode_modules');
-    (0, fs_1.appendFileSync)(`.gitignore`, '\ndist');
-    installDependencies(options);
-    // Vite expects index.html to be in the root as the main entry point.
-    const indexPath = options.isStandalone
-        ? 'index.html'
-        : (0, path_1.join)('apps', options.reactAppName, 'index.html');
-    const oldIndexPath = options.isStandalone
-        ? (0, path_1.join)('public', 'index.html')
-        : (0, path_1.join)('apps', options.reactAppName, 'public', 'index.html');
-    output_1.output.note({
-        title: `A new ${indexPath} has been created. Compare it to the previous ${oldIndexPath} file and make any changes needed, then delete the previous file.`,
-    });
-    if (_options.force) {
-        output_1.output.note({
-            title: `Using --force converts projects with custom Webpack setup. You will need to manually update your vite.config.js file to match the plugins used in your old Webpack configuration.`,
-        });
-    }
-}
-function installDependencies(options) {
-    const dependencies = [
-        '@rollup/plugin-replace',
-        '@testing-library/jest-dom',
-        '@vitejs/plugin-react',
-        'eslint-config-react-app',
-        'web-vitals',
-        'jest-watch-typeahead',
-        'vite',
-        'vitest',
-    ];
-    (0, child_process_1.execSync)(`${options.pmc.addDev} ${dependencies.join(' ')}`, {
-        stdio: [0, 1, 2],
-        windowsHide: false,
-    });
-}
-async function normalizeOptions(options) {
-    const packageManager = (0, package_manager_1.detectPackageManager)();
-    const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
-    const appIsJs = !(0, fileutils_1.fileExists)(`tsconfig.json`);
-    const reactAppName = (0, read_name_from_package_json_1.readNameFromPackageJson)();
-    const isStandalone = !options.integrated;
-    return {
-        ...options,
-        packageManager,
-        pmc,
-        appIsJs,
-        reactAppName,
-        isStandalone,
-    };
-}
-async function addBundler(options) {
-    const { addViteCommandsToPackageScripts } = await Promise.resolve().then(() => require('./add-vite-commands-to-package-scripts'));
-    addViteCommandsToPackageScripts(options.reactAppName, options.isStandalone);
-    (0, write_vite_config_1.writeViteConfig)(options.reactAppName, options.isStandalone, options.appIsJs);
-    (0, write_vite_index_html_1.writeViteIndexHtml)(options.reactAppName, options.isStandalone, options.appIsJs);
-    await (0, rename_js_to_jsx_1.renameJsToJsx)(options.reactAppName, options.isStandalone);
-}

package/src/command-line/init/implementation/react/read-name-from-package-json.d.ts

@@ -1,2 +0,0 @@
-export declare function readNameFromPackageJson(): string;
-//# sourceMappingURL=read-name-from-package-json.d.ts.map

package/src/command-line/init/implementation/react/read-name-from-package-json.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"read-name-from-package-json.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/read-name-from-package-json.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,IAAI,MAAM,CAahD"}

package/src/command-line/init/implementation/react/read-name-from-package-json.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readNameFromPackageJson = readNameFromPackageJson;
-const fileutils_1 = require("../../../../utils/fileutils");
-function readNameFromPackageJson() {
-    let appName = 'webapp';
-    if ((0, fileutils_1.fileExists)('package.json')) {
-        const json = (0, fileutils_1.readJsonFile)('package.json');
-        if (json['name'] &&
-            json['name'].length &&
-            json['name'].replace(/\s/g, '').length) {
-            appName = json['name'].replace(/\s/g, '');
-        }
-    }
-    return appName;
-}

package/src/command-line/init/implementation/react/rename-js-to-jsx.d.ts

@@ -1,2 +0,0 @@
-export declare function renameJsToJsx(appName: string, isStandalone: boolean): Promise<void>;
-//# sourceMappingURL=rename-js-to-jsx.d.ts.map

package/src/command-line/init/implementation/react/rename-js-to-jsx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rename-js-to-jsx.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/rename-js-to-jsx.ts"],"names":[],"mappings":"AAKA,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,iBAezE"}

package/src/command-line/init/implementation/react/rename-js-to-jsx.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renameJsToJsx = renameJsToJsx;
-const node_fs_1 = require("node:fs");
-const workspace_context_1 = require("../../../../utils/workspace-context");
-const fileutils_1 = require("../../../../utils/fileutils");
-// Vite cannot process JSX like <div> or <Header> unless the file is named .jsx or .tsx
-async function renameJsToJsx(appName, isStandalone) {
-    const files = await (0, workspace_context_1.globWithWorkspaceContext)(process.cwd(), [
-        isStandalone ? 'src/**/*.js' : `apps/${appName}/src/**/*.js`,
-    ]);
-    files.forEach((file) => {
-        if ((0, fileutils_1.fileExists)(file)) {
-            const content = (0, node_fs_1.readFileSync)(file).toString();
-            // Try to detect JSX before renaming to .jsx
-            // Files like setupTests.js from CRA should not be renamed
-            if (/<[a-zA-Z0-9]+/.test(content)) {
-                (0, node_fs_1.renameSync)(file, `${file}x`);
-            }
-        }
-    });
-}

package/src/command-line/init/implementation/react/tsconfig-setup.d.ts

@@ -1,2 +0,0 @@
-export declare function setupTsConfig(appName: string, isStandalone: boolean): void;
-//# sourceMappingURL=tsconfig-setup.d.ts.map

package/src/command-line/init/implementation/react/tsconfig-setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tsconfig-setup.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/tsconfig-setup.ts"],"names":[],"mappings":"AA+DA,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,QA+CnE"}

package/src/command-line/init/implementation/react/tsconfig-setup.js

@@ -1,108 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupTsConfig = setupTsConfig;
-const path_1 = require("path");
-const fileutils_1 = require("../../../../utils/fileutils");
-const defaultTsConfig = (relativePathToRoot) => ({
-    extends: relativePathToRoot
-        ? (0, path_1.join)(relativePathToRoot, 'tsconfig.base.json')
-        : './tsconfig.base.json',
-    compilerOptions: {
-        jsx: 'react',
-        allowJs: true,
-        esModuleInterop: true,
-        allowSyntheticDefaultImports: true,
-    },
-    files: [],
-    include: [],
-    references: [
-        {
-            path: './tsconfig.app.json',
-        },
-        {
-            path: './tsconfig.spec.json',
-        },
-    ],
-});
-const defaultTsConfigApp = (relativePathToRoot) => ({
-    extends: './tsconfig.json',
-    compilerOptions: {
-        outDir: (0, path_1.join)(relativePathToRoot, 'dist/out-tsc'),
-        types: ['node'],
-    },
-    files: [
-        (0, path_1.join)(relativePathToRoot, 'node_modules/@nx/react/typings/cssmodule.d.ts'),
-        (0, path_1.join)(relativePathToRoot, 'node_modules/@nx/react/typings/image.d.ts'),
-    ],
-    exclude: ['**/*.spec.ts', '**/*.spec.tsx'],
-    include: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
-});
-const defaultTsConfigSpec = (relativePathToRoot) => ({
-    extends: './tsconfig.json',
-    compilerOptions: {
-        outDir: (0, path_1.join)(relativePathToRoot, 'dist/out-tsc'),
-        module: 'commonjs',
-        types: ['jest', 'node'],
-    },
-    include: [
-        '**/*.spec.ts',
-        '**/*.spec.tsx',
-        '**/*.spec.js',
-        '**/*.spec.jsx',
-        '**/*.d.ts',
-    ],
-    files: [
-        (0, path_1.join)(relativePathToRoot, 'node_modules/@nx/react/typings/cssmodule.d.ts'),
-        (0, path_1.join)(relativePathToRoot, 'node_modules/@nx/react/typings/image.d.ts'),
-    ],
-});
-function setupTsConfig(appName, isStandalone) {
-    const tsconfigPath = isStandalone
-        ? 'tsconfig.json'
-        : `apps/${appName}/tsconfig.json`;
-    const tsconfigAppPath = isStandalone
-        ? 'tsconfig.app.json'
-        : `apps/${appName}/tsconfig.app.json`;
-    const tsconfiSpecPath = isStandalone
-        ? 'tsconfig.spec.json'
-        : `apps/${appName}/tsconfig.spec.json`;
-    const tsconfigBasePath = isStandalone
-        ? './tsconfig.base.json'
-        : '../../tsconfig.base.json';
-    const relativePathToRoot = isStandalone ? '' : '../../';
-    if ((0, fileutils_1.fileExists)(tsconfigPath)) {
-        const json = (0, fileutils_1.readJsonFile)(tsconfigPath);
-        json.extends = tsconfigBasePath;
-        if (json.compilerOptions) {
-            json.compilerOptions.jsx = 'react';
-        }
-        else {
-            json.compilerOptions = {
-                jsx: 'react',
-                allowJs: true,
-                esModuleInterop: true,
-                allowSyntheticDefaultImports: true,
-            };
-        }
-        (0, fileutils_1.writeJsonFile)(tsconfigPath, json);
-    }
-    else {
-        (0, fileutils_1.writeJsonFile)(tsconfigPath, defaultTsConfig(relativePathToRoot));
-    }
-    if ((0, fileutils_1.fileExists)(tsconfigAppPath)) {
-        const json = (0, fileutils_1.readJsonFile)(tsconfigAppPath);
-        json.extends = './tsconfig.json';
-        (0, fileutils_1.writeJsonFile)(tsconfigAppPath, json);
-    }
-    else {
-        (0, fileutils_1.writeJsonFile)(tsconfigAppPath, defaultTsConfigApp(relativePathToRoot));
-    }
-    if ((0, fileutils_1.fileExists)(tsconfiSpecPath)) {
-        const json = (0, fileutils_1.readJsonFile)(tsconfiSpecPath);
-        json.extends = './tsconfig.json';
-        (0, fileutils_1.writeJsonFile)(tsconfiSpecPath, json);
-    }
-    else {
-        (0, fileutils_1.writeJsonFile)(tsconfiSpecPath, defaultTsConfigSpec(relativePathToRoot));
-    }
-}

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

@@ -1,2 +0,0 @@
-export declare function writeViteConfig(appName: string, isStandalone: boolean, isJs: boolean): void;
-//# sourceMappingURL=write-vite-config.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"write-vite-config.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/write-vite-config.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,QAwDd"}

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

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeViteConfig = writeViteConfig;
-const fs_1 = require("fs");
-function writeViteConfig(appName, isStandalone, isJs) {
-    let port = 3000;
-    // Use PORT from .env file if it exists in project.
-    if ((0, fs_1.existsSync)(`../.env`)) {
-        const envFile = (0, fs_1.readFileSync)(`../.env`).toString();
-        const result = envFile.match(/\bport=(?<port>\d{4})/i);
-        const portCandidate = Number(result?.groups?.port);
-        if (!isNaN(portCandidate)) {
-            port = portCandidate;
-        }
-    }
-    (0, fs_1.writeFileSync)(isStandalone ? 'vite.config.mjs' : `apps/${appName}/vite.config.mjs`, `import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-import replace from '@rollup/plugin-replace';
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
-
-// Match CRA's environment variables.
-// TODO: Replace these with VITE_ prefixed environment variables, and using import.meta.env.VITE_* instead of process.env.REACT_APP_*.
-const craEnvVarRegex = /^REACT_APP/i;
-const craEnvVars = Object.keys(process.env)
-  .filter((key) => craEnvVarRegex.test(key))
-  .reduce((env, key) => {
-    env[\`process.env.\${key}\`] = JSON.stringify(process.env[key]);
-    return env;
-  }, {});
-
-// https://vite.dev/config/
-export default defineConfig({
-  build: {
-    outDir: ${isStandalone ? `'./dist/${appName}'` : `'../../dist/apps/${appName}'`}
-  },
-  server: {
-    port: ${port},
-    open: true,
-  },
-  test: {
-    globals: true,
-    environment: 'jsdom',
-    setupFiles: 'src/setupTests.${isJs ? 'js' : 'ts'}',
-    css: true,
-  },
-  plugins: [
-    react(),
-    replace({ values: craEnvVars, preventAssignment: true }),
-    nxViteTsPaths(),
-  ],
-});
-`);
-}

package/src/command-line/init/implementation/react/write-vite-index-html.d.ts

@@ -1,2 +0,0 @@
-export declare function writeViteIndexHtml(appName: string, isStandalone: boolean, isJs: boolean): void;
-//# sourceMappingURL=write-vite-index-html.d.ts.map

package/src/command-line/init/implementation/react/write-vite-index-html.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"write-vite-index-html.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/command-line/init/implementation/react/write-vite-index-html.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,QAuBd"}

package/src/command-line/init/implementation/react/write-vite-index-html.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeViteIndexHtml = writeViteIndexHtml;
-const fs_1 = require("fs");
-function writeViteIndexHtml(appName, isStandalone, isJs) {
-    const indexPath = isStandalone ? 'index.html' : `apps/${appName}/index.html`;
-    if ((0, fs_1.existsSync)(indexPath)) {
-        (0, fs_1.copyFileSync)(indexPath, indexPath + '.old');
-    }
-    const indexFile = isJs ? '/src/index.jsx' : '/src/index.tsx';
-    (0, fs_1.writeFileSync)(indexPath, `<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + Nx</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="${indexFile}"></script>
-  </body>
-</html>`);
-}