@nx/js 16.4.0-beta.5 → 16.4.0-beta.7

package/generators.json

@@ -29,6 +29,12 @@
       "schema": "./src/generators/setup-verdaccio/schema.json",
       "alias": ["verdaccio"],
       "description": "Setup Verdaccio for local package management."
+    },
+    "setup-build": {
+      "factory": "./src/generators/setup-build/generator#setupBuildSchematic",
+      "schema": "./src/generators/setup-build/schema.json",
+      "alias": ["build"],
+      "description": "setup-build generator"
     }
   },
   "generators": {
@@ -59,6 +65,12 @@
       "schema": "./src/generators/setup-verdaccio/schema.json",
       "alias": ["verdaccio"],
       "description": "Setup Verdaccio for local package management."
+    },
+    "setup-build": {
+      "factory": "./src/generators/setup-build/generator",
+      "schema": "./src/generators/setup-build/schema.json",
+      "alias": ["build"],
+      "description": "setup-build generator"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.4.0-beta.5",
+  "version": "16.4.0-beta.7",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7.14.8",
-    "@nrwl/js": "16.4.0-beta.5",
-    "@nx/devkit": "16.4.0-beta.5",
-    "@nx/workspace": "16.4.0-beta.5",
+    "@nrwl/js": "16.4.0-beta.7",
+    "@nx/devkit": "16.4.0-beta.7",
+    "@nx/workspace": "16.4.0-beta.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -69,5 +69,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "94aa566dda725adbc54b4ba31b558377f273e41b"
+  "gitHead": "847d3a45b61cd2c267acb66c4165a5bb875aff4f"
 }

package/src/executors/node/node.impl.js

@@ -32,6 +32,14 @@ function nodeExecutor(options, context) {
         else {
             throw new Error(`Cannot find build target ${chalk.bold(options.buildTarget)} for project ${chalk.bold(context.projectName)}`);
         }
+        if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
+            const results = yield tslib_1.__await(runWaitUntilTargets(options, context));
+            for (const [i, result] of results.entries()) {
+                if (!result.success) {
+                    throw new Error(`Wait until target failed: ${options.waitUntilTargets[i]}.`);
+                }
+            }
+        }
         // Re-map buildable workspace projects to their output directory.
         const mappings = calculateResolveMappings(context, options);
         const fileToRun = (0, path_1.join)(context.root, buildOptions.outputPath, (_d = buildOptions.outputFileName) !== null && _d !== void 0 ? _d : 'main.js');
@@ -174,7 +182,9 @@ function nodeExecutor(options, context) {
 }
 exports.nodeExecutor = nodeExecutor;
 function getExecArgv(options) {
-    const args = ['-r', require.resolve('source-map-support/register')];
+    var _a;
+    const args = ((_a = options.runtimeArgs) !== null && _a !== void 0 ? _a : (options.runtimeArgs = []));
+    args.push('-r', require.resolve('source-map-support/register'));
     if (options.inspect === true) {
         options.inspect = "inspect" /* InspectType.Inspect */;
     }
@@ -193,4 +203,19 @@ function calculateResolveMappings(context, options) {
         return m;
     }, {});
 }
+function runWaitUntilTargets(options, context) {
+    return Promise.all(options.waitUntilTargets.map((waitUntilTarget) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const target = (0, devkit_1.parseTargetString)(waitUntilTarget, context.projectGraph);
+        const output = yield (0, devkit_1.runExecutor)(target, {}, context);
+        return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let event = yield output.next();
+            // Resolve after first event
+            resolve(event.value);
+            // Continue iterating
+            while (!event.done) {
+                event = yield output.next();
+            }
+        }));
+    })));
+}
 exports.default = nodeExecutor;

package/src/generators/library/library.js

@@ -44,6 +44,7 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
                 includeVitest: options.unitTestRunner === 'vitest',
                 includeLib: true,
                 skipFormat: true,
+                testEnvironment: options.testEnvironment,
             });
             tasks.push(viteTask);
         }
@@ -67,6 +68,7 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
                 uiFramework: 'none',
                 coverageProvider: 'c8',
                 skipFormat: true,
+                testEnvironment: options.testEnvironment,
             });
             tasks.push(vitestTask);
         }

package/src/generators/library/schema.json

@@ -56,8 +56,8 @@
     "testEnvironment": {
       "type": "string",
       "enum": ["jsdom", "node"],
-      "description": "The test environment to use if unitTestRunner is set to jest.",
-      "default": "jsdom"
+      "description": "The test environment to use if unitTestRunner is set to jest or vitest.",
+      "default": "node"
     },
     "pascalCaseFiles": {
       "type": "boolean",

package/src/generators/setup-build/generator.d.ts

@@ -0,0 +1,5 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { SetupBuildGeneratorSchema } from './schema';
+export declare function setupBuildGenerator(tree: Tree, options: SetupBuildGeneratorSchema): Promise<GeneratorCallback>;
+export default setupBuildGenerator;
+export declare const setupBuildSchematic: (generatorOptions: SetupBuildGeneratorSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/setup-build/generator.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBuildSchematic = exports.setupBuildGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const add_swc_config_1 = require("../../utils/swc/add-swc-config");
+const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
+const versions_1 = require("../../utils/versions");
+function setupBuildGenerator(tree, options) {
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const tasks = [];
+        const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+        const buildTarget = (_a = options.buildTarget) !== null && _a !== void 0 ? _a : 'build';
+        (_b = project.targets) !== null && _b !== void 0 ? _b : (project.targets = {});
+        let mainFile;
+        if (options.main) {
+            mainFile = options.main;
+        }
+        else {
+            const root = (_c = project.sourceRoot) !== null && _c !== void 0 ? _c : project.root;
+            for (const f of [
+                (0, devkit_1.joinPathFragments)(root, 'main.ts'),
+                (0, devkit_1.joinPathFragments)(root, 'main.js'),
+                (0, devkit_1.joinPathFragments)(root, 'index.ts'),
+                (0, devkit_1.joinPathFragments)(root, 'index.js'),
+            ]) {
+                if (tree.exists(f)) {
+                    mainFile = f;
+                    break;
+                }
+            }
+        }
+        if (!mainFile || !tree.exists(mainFile)) {
+            throw new Error(`Cannot locate a main file for ${options.project}. Please specify one using --main=<file-path>.`);
+        }
+        let tsConfigFile;
+        if (options.tsConfig) {
+            tsConfigFile = options.tsConfig;
+        }
+        else {
+            for (const f of [
+                'tsconfig.lib.json',
+                'tsconfig.app.json',
+                'tsconfig.json',
+            ]) {
+                const candidate = (0, devkit_1.joinPathFragments)(project.root, f);
+                if (tree.exists(candidate)) {
+                    tsConfigFile = candidate;
+                    break;
+                }
+            }
+        }
+        if (!tsConfigFile || !tree.exists(tsConfigFile)) {
+            throw new Error(`Cannot locate a tsConfig file for ${options.project}. Please specify one using --tsConfig=<file-path>.`);
+        }
+        switch (options.bundler) {
+            case 'vite': {
+                const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+                const task = yield viteConfigurationGenerator(tree, {
+                    buildTarget: options.buildTarget,
+                    project: options.project,
+                    newProject: true,
+                    uiFramework: 'none',
+                    includeVitest: false,
+                    includeLib: true,
+                    skipFormat: true,
+                });
+                tasks.push(task);
+                break;
+            }
+            case 'esbuild': {
+                const { esbuildProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/esbuild', versions_1.nxVersion);
+                const task = yield esbuildProjectGenerator(tree, {
+                    main: mainFile,
+                    buildTarget: options.buildTarget,
+                    project: options.project,
+                    skipFormat: true,
+                });
+                tasks.push(task);
+                break;
+            }
+            case 'rollup': {
+                const { rollupProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+                const task = yield rollupProjectGenerator(tree, {
+                    buildTarget: options.buildTarget,
+                    main: mainFile,
+                    project: options.project,
+                    skipFormat: true,
+                    compiler: 'tsc',
+                });
+                tasks.push(task);
+                break;
+            }
+            case 'tsc': {
+                const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
+                project.targets[buildTarget] = {
+                    executor: `@nx/js:tsc`,
+                    outputs: ['{options.outputPath}'],
+                    options: {
+                        outputPath,
+                        main: mainFile,
+                        tsConfig: tsConfigFile,
+                        assets: [],
+                    },
+                };
+                (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+                break;
+            }
+            case 'swc': {
+                const outputPath = (0, devkit_1.joinPathFragments)('dist', project.root);
+                project.targets[buildTarget] = {
+                    executor: `@nx/js:swc`,
+                    outputs: ['{options.outputPath}'],
+                    options: {
+                        outputPath,
+                        main: mainFile,
+                        tsConfig: tsConfigFile,
+                        assets: [],
+                    },
+                };
+                (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+                (0, add_swc_dependencies_1.addSwcDependencies)(tree);
+                (0, add_swc_config_1.addSwcConfig)(tree, project.root, 'es6');
+            }
+        }
+        yield (0, devkit_1.formatFiles)(tree);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
+    });
+}
+exports.setupBuildGenerator = setupBuildGenerator;
+exports.default = setupBuildGenerator;
+exports.setupBuildSchematic = (0, devkit_1.convertNxGenerator)(setupBuildGenerator);

package/src/generators/setup-build/schema.d.ts

@@ -0,0 +1,7 @@
+export interface SetupBuildGeneratorSchema {
+  project: string;
+  bundler: 'tsc' | 'swc' | 'vite' | 'rollup' | 'esbuild';
+  main?: string;
+  tsConfig?: string;
+  buildTarget?: string;
+}

package/src/generators/setup-build/schema.json

@@ -0,0 +1,42 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SetupBuild",
+  "title": "Setup Build",
+  "description": "Sets up build target for a project.",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Project to add the build target to.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Which project do you want to add build to?",
+      "x-dropdown": "projects",
+      "x-priority": "important"
+    },
+    "bundler": {
+      "description": "The bundler to use to build the project.",
+      "type": "string",
+      "enum": ["tsc", "swc", "rollup", "vite", "esbuild"],
+      "default": "tsc",
+      "x-prompt": "Which bundler would you like to use to build the project?",
+      "x-priority": "important"
+    },
+    "main": {
+      "description": "The path to the main entry file, relative to workspace root. Defaults to <project>/src/index.ts or <project>/src/main.ts.",
+      "type": "string"
+    },
+    "tsConfig": {
+      "description": "The path to the tsConfig file, relative to workspace root. Defaults to <project>/tsconfig.lib.json or <project>/tsconfig.app.json depending on project type.",
+      "type": "string"
+    },
+    "buildTarget": {
+      "description": "The build target to add.",
+      "type": "string",
+      "default": "build"
+    }
+  },
+  "required": ["project", "bundler"]
+}

package/src/utils/swc/add-swc-config.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 export declare const defaultExclude: string[];
 export declare function addSwcConfig(tree: Tree, projectDir: string, type?: 'commonjs' | 'es6'): void;