@nx/rspack 19.8.0 → 20.0.0-beta.4

package/src/executors/rspack/rspack.impl.js

@@ -9,26 +9,53 @@ const fs_1 = require("fs");
 const path = tslib_1.__importStar(require("path"));
 const create_compiler_1 = require("../../utils/create-compiler");
 const mode_utils_1 = require("../../utils/mode-utils");
-function runExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* runExecutor_1() {
-        var _a, _b;
-        var _c;
-        (_a = (_c = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_c.NODE_ENV = (_b = options.mode) !== null && _b !== void 0 ? _b : 'production');
-        if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
-            options.mode = process.env.NODE_ENV;
-        }
-        if (options.typeCheck) {
-            yield tslib_1.__await(executeTypeCheck(options, context));
+async function* runExecutor(options, context) {
+    process.env.NODE_ENV ??= options.mode ?? 'production';
+    if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
+        options.mode = process.env.NODE_ENV;
+    }
+    if (options.typeCheck) {
+        await executeTypeCheck(options, context);
+    }
+    // Mimic --clean from webpack.
+    (0, fs_1.rmSync)(path.join(context.root, options.outputPath), {
+        force: true,
+        recursive: true,
+    });
+    const compiler = await (0, create_compiler_1.createCompiler)(options, context);
+    const iterable = (0, async_iterable_1.createAsyncIterable)(async ({ next, done }) => {
+        if (options.watch) {
+            const watcher = compiler.watch({}, async (err, stats) => {
+                if (err) {
+                    devkit_1.logger.error(err);
+                    next({ success: false });
+                    return;
+                }
+                if (!compiler || !stats) {
+                    devkit_1.logger.error(new Error('Compiler or stats not available'));
+                    next({ success: false });
+                    return;
+                }
+                const statsOptions = getStatsOptions(compiler);
+                const printedStats = stats.toString(statsOptions);
+                // Avoid extra empty line when `stats: 'none'`
+                if (printedStats) {
+                    console.error(printedStats);
+                }
+                next({
+                    success: !stats.hasErrors(),
+                    outfile: path.resolve(context.root, options.outputPath, 'main.js'),
+                });
+            });
+            registerCleanupCallback(() => {
+                watcher.close(() => {
+                    devkit_1.logger.info('Watcher closed');
+                });
+            });
         }
-        // Mimic --clean from webpack.
-        (0, fs_1.rmSync)(path.join(context.root, options.outputPath), {
-            force: true,
-            recursive: true,
-        });
-        const compiler = yield tslib_1.__await((0, create_compiler_1.createCompiler)(options, context));
-        const iterable = (0, async_iterable_1.createAsyncIterable)((_a) => tslib_1.__awaiter(this, [_a], void 0, function* ({ next, done }) {
-            if (options.watch) {
-                const watcher = compiler.watch({}, (err, stats) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        else {
+            compiler.run(async (err, stats) => {
+                compiler.close(() => {
                     if (err) {
                         devkit_1.logger.error(err);
                         next({ success: false });
@@ -49,43 +76,12 @@ function runExecutor(options, context) {
                         success: !stats.hasErrors(),
                         outfile: path.resolve(context.root, options.outputPath, 'main.js'),
                     });
-                }));
-                registerCleanupCallback(() => {
-                    watcher.close(() => {
-                        devkit_1.logger.info('Watcher closed');
-                    });
+                    done();
                 });
-            }
-            else {
-                compiler.run((err, stats) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    compiler.close(() => {
-                        if (err) {
-                            devkit_1.logger.error(err);
-                            next({ success: false });
-                            return;
-                        }
-                        if (!compiler || !stats) {
-                            devkit_1.logger.error(new Error('Compiler or stats not available'));
-                            next({ success: false });
-                            return;
-                        }
-                        const statsOptions = getStatsOptions(compiler);
-                        const printedStats = stats.toString(statsOptions);
-                        // Avoid extra empty line when `stats: 'none'`
-                        if (printedStats) {
-                            console.error(printedStats);
-                        }
-                        next({
-                            success: !stats.hasErrors(),
-                            outfile: path.resolve(context.root, options.outputPath, 'main.js'),
-                        });
-                        done();
-                    });
-                }));
-            }
-        }));
-        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(iterable)));
+            });
+        }
     });
+    yield* iterable;
 }
 // copied from packages/esbuild/src/executors/esbuild/esbuild.impl.ts
 function registerCleanupCallback(callback) {
@@ -99,19 +95,17 @@ function registerCleanupCallback(callback) {
     process.on('SIGTERM', wrapped);
     process.on('exit', wrapped);
 }
-function executeTypeCheck(options, context) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectConfiguration = context.projectGraph.nodes[context.projectName].data;
-        const result = yield (0, js_1.runTypeCheck)({
-            workspaceRoot: path.resolve(projectConfiguration.root),
-            tsConfigPath: options.tsConfig,
-            mode: 'noEmit',
-        });
-        yield (0, js_1.printDiagnostics)(result.errors, result.warnings);
-        if (result.errors.length > 0) {
-            throw new Error('Found type errors. See above.');
-        }
+async function executeTypeCheck(options, context) {
+    const projectConfiguration = context.projectGraph.nodes[context.projectName].data;
+    const result = await (0, js_1.runTypeCheck)({
+        workspaceRoot: path.resolve(projectConfiguration.root),
+        tsConfigPath: options.tsConfig,
+        mode: 'noEmit',
     });
+    await (0, js_1.printDiagnostics)(result.errors, result.warnings);
+    if (result.errors.length > 0) {
+        throw new Error('Found type errors. See above.');
+    }
 }
 function getStatsOptions(compiler) {
     return (0, create_compiler_1.isMultiCompiler)(compiler)
@@ -122,4 +116,3 @@ function getStatsOptions(compiler) {
             ? compiler.options.stats
             : undefined;
 }
-//# sourceMappingURL=rspack.impl.js.map

package/src/executors/rspack/schema.json

@@ -2,16 +2,13 @@
   "$schema": "http://json-schema.org/schema",
   "version": 2,
   "title": "Rspack build executor",
-  "description": "",
+  "description": "Run Rspack via an executor for a project.",
   "type": "object",
   "properties": {
     "target": {
       "type": "string",
       "description": "The platform to target (e.g. web, node).",
-      "enum": [
-        "web",
-        "node"
-      ]
+      "enum": ["web", "node"]
     },
     "main": {
       "type": "string",
@@ -122,34 +119,21 @@
           }
         },
         "additionalProperties": false,
-        "required": [
-          "replace",
-          "with"
-        ]
+        "required": ["replace", "with"]
       },
       "default": []
     },
     "mode": {
       "type": "string",
       "description": "Mode to run the build in.",
-      "enum": [
-        "development",
-        "production",
-        "none"
-      ]
+      "enum": ["development", "production", "none"]
     },
     "generatePackageJson": {
       "type": "boolean",
       "description": "Generates a `package.json` and pruned lock file with the project's `node_module` dependencies populated for installing in a container. If a `package.json` exists in the project's directory, it will be reused with dependencies populated."
     }
   },
-  "required": [
-    "target",
-    "main",
-    "outputPath",
-    "tsConfig",
-    "rspackConfig"
-  ],
+  "required": ["target", "main", "outputPath", "tsConfig", "rspackConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -182,11 +166,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"

package/src/executors/ssr-dev-server/lib/wait-until-server-is-listening.js

@@ -37,4 +37,3 @@ function waitUntilServerIsListening(port) {
         listen();
     });
 }
-//# sourceMappingURL=wait-until-server-is-listening.js.map

package/src/executors/ssr-dev-server/schema.json

@@ -32,8 +32,5 @@
       "default": {}
     }
   },
-  "required": [
-    "browserTarget",
-    "serverTarget"
-  ]
+  "required": ["browserTarget", "serverTarget"]
 }

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -6,47 +6,33 @@ const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const chalk = tslib_1.__importStar(require("chalk"));
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
-function ssrDevServerExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* ssrDevServerExecutor_1() {
-        var _a, e_1, _b, _c;
-        var _d, _e;
-        const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
-        const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context);
-        const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
-        const serverOptions = (0, devkit_1.readTargetOptions)(serverTarget, context);
-        const runBrowser = yield tslib_1.__await((0, devkit_1.runExecutor)(browserTarget, Object.assign(Object.assign({}, browserOptions), options.browserTargetOptions), context));
-        const runServer = yield tslib_1.__await((0, devkit_1.runExecutor)(serverTarget, Object.assign(Object.assign({}, serverOptions), options.serverTargetOptions), context));
-        let browserBuilt = false;
-        let nodeStarted = false;
-        const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
-        try {
-            for (var _f = true, combined_1 = tslib_1.__asyncValues(combined), combined_1_1; combined_1_1 = yield tslib_1.__await(combined_1.next()), _a = combined_1_1.done, !_a; _f = true) {
-                _c = combined_1_1.value;
-                _f = false;
-                const output = _c;
-                if (!output.success)
-                    throw new Error('Could not build application');
-                if (((_d = output.options) === null || _d === void 0 ? void 0 : _d.target) === 'node') {
-                    nodeStarted = true;
-                }
-                else if (((_e = output.options) === null || _e === void 0 ? void 0 : _e.target) === 'web') {
-                    browserBuilt = true;
-                }
-                if (nodeStarted && browserBuilt) {
-                    yield tslib_1.__await((0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port));
-                    console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
-                    yield yield tslib_1.__await(Object.assign(Object.assign({}, output), { baseUrl: `http://localhost:${options.port}` }));
-                }
-            }
+async function* ssrDevServerExecutor(options, context) {
+    const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
+    const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context);
+    const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
+    const serverOptions = (0, devkit_1.readTargetOptions)(serverTarget, context);
+    const runBrowser = await (0, devkit_1.runExecutor)(browserTarget, { ...browserOptions, ...options.browserTargetOptions }, context);
+    const runServer = await (0, devkit_1.runExecutor)(serverTarget, { ...serverOptions, ...options.serverTargetOptions }, context);
+    let browserBuilt = false;
+    let nodeStarted = false;
+    const combined = (0, async_iterable_1.combineAsyncIterables)(runBrowser, runServer);
+    for await (const output of combined) {
+        if (!output.success)
+            throw new Error('Could not build application');
+        if (output.options?.target === 'node') {
+            nodeStarted = true;
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_f && !_a && (_b = combined_1.return)) yield tslib_1.__await(_b.call(combined_1));
-            }
-            finally { if (e_1) throw e_1.error; }
+        else if (output.options?.target === 'web') {
+            browserBuilt = true;
         }
-    });
+        if (nodeStarted && browserBuilt) {
+            await (0, wait_until_server_is_listening_1.waitUntilServerIsListening)(options.port);
+            console.log(`[ ${chalk.green('ready')} ] on http://localhost:${options.port}`);
+            yield {
+                ...output,
+                baseUrl: `http://localhost:${options.port}`,
+            };
+        }
+    }
 }
 exports.default = ssrDevServerExecutor;
-//# sourceMappingURL=ssr-dev-server.impl.js.map

package/src/generators/application/application.js

@@ -7,81 +7,84 @@ const package_json_1 = require("nx/package.json");
 const configuration_1 = tslib_1.__importDefault(require("../configuration/configuration"));
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const normalize_options_1 = require("./lib/normalize-options");
-function default_1(tree, _options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const tasks = [];
-        const initTask = yield (0, init_1.default)(tree, Object.assign(Object.assign({}, _options), { 
-            // TODO: Crystalize the default rspack.config.js file.
-            // The default setup isn't crystalized so don't add plugin.
-            addPlugin: false }));
-        tasks.push(initTask);
-        const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
-        (_a = options.style) !== null && _a !== void 0 ? _a : (options.style = 'css');
-        if (options.framework === 'nest') {
-            const { applicationGenerator: nestAppGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', package_json_1.version);
-            const createAppTask = yield nestAppGenerator(tree, Object.assign(Object.assign({}, options), { skipFormat: true, tags: (_b = options.tags) !== null && _b !== void 0 ? _b : '', addPlugin: false }));
-            const convertAppTask = yield (0, configuration_1.default)(tree, {
-                project: options.name,
-                target: 'node',
-                newProject: false,
-                buildTarget: 'build',
-                framework: 'nest',
-            });
-            tasks.push(createAppTask, convertAppTask);
-        }
-        else if (options.framework === 'web') {
-            const { applicationGenerator: webAppGenerator } = (0, devkit_1.ensurePackage)('@nx/web', package_json_1.version);
-            const createAppTask = yield webAppGenerator(tree, {
-                bundler: 'webpack',
-                name: options.name,
-                style: options.style,
-                directory: options.directory,
-                tags: (_c = options.tags) !== null && _c !== void 0 ? _c : '',
-                unitTestRunner: options.unitTestRunner,
-                e2eTestRunner: options.e2eTestRunner,
-                rootProject: options.rootProject,
-                skipFormat: true,
-                addPlugin: false,
-            });
-            const convertAppTask = yield (0, configuration_1.default)(tree, {
-                project: options.name,
-                target: 'web',
-                newProject: false,
-                buildTarget: 'build',
-                serveTarget: 'serve',
-                framework: 'web',
-                addPlugin: false,
-            });
-            tasks.push(createAppTask, convertAppTask);
-        }
-        else {
-            // default to react
-            const { applicationGenerator: reactAppGenerator } = (0, devkit_1.ensurePackage)('@nx/react', package_json_1.version);
-            const createAppTask = yield reactAppGenerator(tree, {
-                bundler: 'webpack',
-                name: options.name,
-                style: options.style,
-                directory: options.directory,
-                tags: (_d = options.tags) !== null && _d !== void 0 ? _d : '',
-                unitTestRunner: options.unitTestRunner,
-                e2eTestRunner: options.e2eTestRunner,
-                rootProject: options.rootProject,
-                skipFormat: true,
-                addPlugin: false,
-            });
-            const convertAppTask = yield (0, configuration_1.default)(tree, {
-                project: options.name,
-                target: 'web',
-                newProject: false,
-                buildTarget: 'build',
-                serveTarget: 'serve',
-                framework: 'react',
-            });
-            tasks.push(createAppTask, convertAppTask);
-        }
-        yield (0, devkit_1.formatFiles)(tree);
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function default_1(tree, _options) {
+    const tasks = [];
+    const initTask = await (0, init_1.default)(tree, {
+        ..._options,
+        // TODO: Crystalize the default rspack.config.js file.
+        // The default setup isn't crystalized so don't add plugin.
+        addPlugin: false,
     });
+    tasks.push(initTask);
+    const options = (0, normalize_options_1.normalizeOptions)(tree, _options);
+    options.style ??= 'css';
+    if (options.framework === 'nest') {
+        const { applicationGenerator: nestAppGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', package_json_1.version);
+        const createAppTask = await nestAppGenerator(tree, {
+            ...options,
+            skipFormat: true,
+            tags: options.tags ?? '',
+            addPlugin: false,
+        });
+        const convertAppTask = await (0, configuration_1.default)(tree, {
+            project: options.name,
+            target: 'node',
+            newProject: false,
+            buildTarget: 'build',
+            framework: 'nest',
+        });
+        tasks.push(createAppTask, convertAppTask);
+    }
+    else if (options.framework === 'web') {
+        const { applicationGenerator: webAppGenerator } = (0, devkit_1.ensurePackage)('@nx/web', package_json_1.version);
+        const createAppTask = await webAppGenerator(tree, {
+            bundler: 'webpack',
+            name: options.name,
+            style: options.style,
+            directory: options.directory,
+            tags: options.tags ?? '',
+            unitTestRunner: options.unitTestRunner,
+            e2eTestRunner: options.e2eTestRunner,
+            rootProject: options.rootProject,
+            skipFormat: true,
+            addPlugin: false,
+        });
+        const convertAppTask = await (0, configuration_1.default)(tree, {
+            project: options.name,
+            target: 'web',
+            newProject: false,
+            buildTarget: 'build',
+            serveTarget: 'serve',
+            framework: 'web',
+            addPlugin: false,
+        });
+        tasks.push(createAppTask, convertAppTask);
+    }
+    else {
+        // default to react
+        const { applicationGenerator: reactAppGenerator } = (0, devkit_1.ensurePackage)('@nx/react', package_json_1.version);
+        const createAppTask = await reactAppGenerator(tree, {
+            bundler: 'webpack',
+            name: options.name,
+            style: options.style,
+            directory: options.directory,
+            tags: options.tags ?? '',
+            unitTestRunner: options.unitTestRunner,
+            e2eTestRunner: options.e2eTestRunner,
+            rootProject: options.rootProject,
+            skipFormat: true,
+            addPlugin: false,
+        });
+        const convertAppTask = await (0, configuration_1.default)(tree, {
+            project: options.name,
+            target: 'web',
+            newProject: false,
+            buildTarget: 'build',
+            serveTarget: 'serve',
+            framework: 'react',
+        });
+        tasks.push(createAppTask, convertAppTask);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-//# sourceMappingURL=application.js.map

package/src/generators/application/lib/create-ts-config.js

@@ -9,7 +9,7 @@ function editTsConfig(tree, projectRoot, framework, relativePathToRootTsConfig)
     try {
         shared = require('@nx/js/src/utils/typescript/create-ts-config');
     }
-    catch (_a) {
+    catch {
         shared = require('@nx/workspace/src/utils/create-ts-config');
     }
     if (framework === 'react') {
@@ -32,7 +32,10 @@ function editTsConfig(tree, projectRoot, framework, relativePathToRootTsConfig)
         // inline tsconfig.base.json into the project
         if (projectIsRootProjectInStandaloneWorkspace(projectRoot)) {
             json.compileOnSave = false;
-            json.compilerOptions = Object.assign(Object.assign({}, shared.tsConfigBaseOptions), json.compilerOptions);
+            json.compilerOptions = {
+                ...shared.tsConfigBaseOptions,
+                ...json.compilerOptions,
+            };
             json.exclude = ['node_modules', 'tmp'];
         }
         else {
@@ -44,4 +47,3 @@ function editTsConfig(tree, projectRoot, framework, relativePathToRootTsConfig)
 function projectIsRootProjectInStandaloneWorkspace(projectRoot) {
     return (0, path_1.relative)(devkit_1.workspaceRoot, projectRoot).length === 0;
 }
-//# sourceMappingURL=create-ts-config.js.map

package/src/generators/application/lib/normalize-options.js

@@ -14,7 +14,6 @@ function normalizeProjectName(options) {
     return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
 }
 function normalizeOptions(host, options) {
-    var _a, _b;
     // --monorepo takes precedence over --rootProject
     // This won't be needed once we add --bundler=rspack to the @nx/react:app preset
     const rootProject = !options.monorepo && options.rootProject;
@@ -24,14 +23,20 @@ function normalizeOptions(host, options) {
         ? 'e2e'
         : `${(0, devkit_1.names)(options.name).fileName}-e2e`;
     const { layoutDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
+    const appsDir = layoutDirectory ?? (0, devkit_1.getWorkspaceLayout)(host).appsDir;
     const appProjectRoot = rootProject
         ? '.'
         : (0, devkit_1.normalizePath)(`${appsDir}/${appDirectory}`);
-    const normalized = Object.assign(Object.assign({}, options), { rootProject, name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
-        e2eProjectName, fileName: 'app' });
-    (_a = normalized.unitTestRunner) !== null && _a !== void 0 ? _a : (normalized.unitTestRunner = 'jest');
-    (_b = normalized.e2eTestRunner) !== null && _b !== void 0 ? _b : (normalized.e2eTestRunner = 'cypress');
+    const normalized = {
+        ...options,
+        rootProject,
+        name: (0, devkit_1.names)(options.name).fileName,
+        projectName: appProjectName,
+        appProjectRoot,
+        e2eProjectName,
+        fileName: 'app',
+    };
+    normalized.unitTestRunner ??= 'jest';
+    normalized.e2eTestRunner ??= 'cypress';
     return normalized;
 }
-//# sourceMappingURL=normalize-options.js.map

package/src/generators/application/schema.json

@@ -3,6 +3,7 @@
   "$id": "Application",
   "title": "Application generator for React + rspack",
   "type": "object",
+  "description": "React + Rspack application generator.",
   "examples": [
     {
       "command": "nx g app myapp --directory=myorg",