@nx/js 18.0.0-beta.0 → 18.0.0-beta.2

package/babel.js

@@ -12,10 +12,10 @@ module.exports = function (api, options = {}) {
     const emitDecoratorMetadata = api.caller((caller) => caller?.emitDecoratorMetadata ?? true);
     // Determine settings  for `@babel//babel-plugin-transform-class-properties`,
     // so that we can sync the `loose` option with `@babel/preset-env`.
-    // TODO(v18): Remove classProperties since it's no longer needed, now that the class props transform is in preset-env.
+    // TODO(v19): Remove classProperties since it's no longer needed, now that the class props transform is in preset-env.
     const loose = options.classProperties?.loose ?? options.loose ?? true;
     if (options.classProperties) {
-        devkit_1.logger.warn(`Use =\`loose\` option instead of \`classProperties.loose\`. The \`classProperties\` option will be removed in Nx 18`);
+        devkit_1.logger.warn(`Use =\`loose\` option instead of \`classProperties.loose\`. The \`classProperties\` option will be removed in Nx 19`);
     }
     return {
         presets: [

package/executors.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "executors": {
     "tsc": {
       "implementation": "./src/executors/tsc/tsc.impl",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.0-beta.2",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -30,11 +30,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@babel/core": "^7.22.9",
+    "@babel/core": "^7.23.2",
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@babel/plugin-transform-runtime": "^7.22.9",
+    "@babel/plugin-transform-runtime": "^7.23.2",
     "@babel/plugin-transform-class-properties": "^7.22.5",
-    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
     "@phenomnomnominal/tsquery": "~5.0.1",
@@ -54,12 +54,12 @@
     "js-tokens": "^4.0.0",
     "minimatch": "9.0.3",
     "ora": "5.3.0",
-    "semver": "7.5.3",
+    "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-beta.0",
-    "@nx/workspace": "18.0.0-beta.0",
-    "@nrwl/js": "18.0.0-beta.0"
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/workspace": "18.0.0-beta.2",
+    "@nrwl/js": "18.0.0-beta.2"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "title": "Node executor",
   "description": "Execute Nodejs applications.",

package/src/executors/release-publish/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "version": 2,
   "title": "Implementation details of `nx release publish`",
   "description": "DO NOT INVOKE DIRECTLY WITH `nx run`. Use `nx release publish` instead.",

package/src/executors/swc/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "title": "Typescript Build Target",
   "description": "Builds using SWC.",

package/src/executors/verdaccio/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "version": 2,
   "title": "Verdaccio Local Registry",
   "description": "Start a local registry with Verdaccio.",

package/src/generators/convert-to-swc/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxTypescriptLibrary",
   "cli": "nx",
   "title": "Convert a TSC library to SWC",

package/src/generators/init/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxTypescriptInit",
   "cli": "nx",
   "title": "Init nx/js",

package/src/generators/library/library.d.ts

@@ -11,6 +11,6 @@ export interface NormalizedSchema extends LibraryGeneratorSchema {
     parsedTags: string[];
     importPath?: string;
 }
-export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler'>;
+export type AddLintOptions = Pick<NormalizedSchema, 'name' | 'linter' | 'projectRoot' | 'unitTestRunner' | 'js' | 'setParserOptionsProject' | 'rootProject' | 'bundler' | 'addPlugin'>;
 export declare function addLint(tree: Tree, options: AddLintOptions): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -12,8 +12,11 @@ const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const generator_1 = require("../setup-verdaccio/generator");
 const create_ts_config_1 = require("../../utils/typescript/create-ts-config");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
+        addPlugin: false,
         // provide a default projectNameAndRootFormat to avoid breaking changes
         // to external generators invoking this one
         projectNameAndRootFormat: 'derived',
@@ -48,6 +51,7 @@ async function libraryGeneratorInternal(tree, schema) {
             includeLib: true,
             skipFormat: true,
             testEnvironment: options.testEnvironment,
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(tree, {
@@ -98,6 +102,9 @@ async function libraryGeneratorInternal(tree, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
@@ -113,8 +120,10 @@ function addProject(tree, options) {
         options.bundler !== 'none' &&
         options.config !== 'npm-scripts') {
         const outputPath = getOutputPath(options);
+        const executor = getBuildExecutor(options.bundler);
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
         projectConfiguration.targets.build = {
-            executor: getBuildExecutor(options.bundler),
+            executor,
             outputs: ['{options.outputPath}'],
             options: {
                 outputPath,
@@ -173,6 +182,7 @@ async function addLint(tree, options) {
         unitTestRunner: options.unitTestRunner,
         setParserOptionsProject: options.setParserOptionsProject,
         rootProject: options.rootProject,
+        addPlugin: options.addPlugin,
     });
     const { addOverrideToLintConfig, lintConfigHasOverride, isEslintConfigSupported, updateOverrideInLintConfig,
     // nx-ignore-next-line
@@ -384,6 +394,7 @@ function replaceJestConfig(tree, options, filesDir) {
     });
 }
 async function normalizeOptions(tree, options) {
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     /**
      * We are deprecating the compiler and the buildable options.
      * However, we want to keep the existing behavior for now.

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxTypescriptLibrary",
   "cli": "nx",
   "title": "Create a TypeScript Library",

package/src/generators/release-version/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxJSReleaseVersionGenerator",
   "cli": "nx",
   "title": "Implementation details of `nx release version`",

package/src/generators/release-version/utils/update-lock-file.js

@@ -14,23 +14,30 @@ async function updateLockFile(cwd, { dryRun, verbose, generatorOptions, }) {
         }
         return [];
     }
+    const packageManager = (0, devkit_1.detectPackageManager)(cwd);
+    if (packageManager === 'yarn' &&
+        !(0, semver_1.gte)((0, devkit_1.getPackageManagerVersion)(packageManager), '2.0.0')) {
+        // yarn classic does not store workspace data in the lock file, so we don't need to update it
+        if (verbose) {
+            console.log('\nSkipped lock file update because it is not necessary for Yarn Classic.');
+        }
+        return [];
+    }
     const isDaemonEnabled = client_1.daemonClient.enabled();
     if (isDaemonEnabled) {
         // temporarily stop the daemon, as it will error if the lock file is updated
         await client_1.daemonClient.stop();
     }
-    const packageManager = (0, devkit_1.detectPackageManager)(cwd);
     const packageManagerCommands = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let installArgs = generatorOptions?.installArgs || '';
     devkit_1.output.logSingleLine(`Updating ${packageManager} lock file`);
     let env = {};
     if (generatorOptions?.installIgnoreScripts) {
-        if (packageManager === 'yarn' &&
-            (0, semver_1.gte)((0, devkit_1.getPackageManagerVersion)(packageManager), '2.0.0')) {
+        if (packageManager === 'yarn') {
             env = { YARN_ENABLE_SCRIPTS: 'false' };
         }
         else {
-            // npm, pnpm, and yarn classic all use the same --ignore-scripts option
+            // npm and pnpm use the same --ignore-scripts option
             installArgs = `${installArgs} --ignore-scripts`.trim();
         }
     }

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SetupBuild",
   "title": "Setup Build",
   "description": "Sets up build target for a project.",

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SetupVerdaccio",
   "title": "Setup Verdaccio",
   "description": "Setup Verdaccio local-registry.",

package/src/utils/inline.js

@@ -161,9 +161,11 @@ function movePackage(from, to) {
     (0, fs_extra_1.copySync)(from, to, { overwrite: true });
 }
 function updateImports(destOutputPath, inlinedDepsDestOutputRecord) {
-    const importRegex = new RegExp(Object.keys(inlinedDepsDestOutputRecord)
-        .map((pathAlias) => `["'](${pathAlias})["']`)
-        .join('|'), 'g');
+    const pathAliases = Object.keys(inlinedDepsDestOutputRecord);
+    if (pathAliases.length == 0) {
+        return;
+    }
+    const importRegex = new RegExp(pathAliases.map((pathAlias) => `["'](${pathAlias})["']`).join('|'), 'g');
     recursiveUpdateImport(destOutputPath, importRegex, inlinedDepsDestOutputRecord);
 }
 function recursiveUpdateImport(dirPath, importRegex, inlinedDepsDestOutputRecord, rootParentDir) {

package/src/utils/schema.d.ts

@@ -33,6 +33,7 @@ export interface LibraryGeneratorSchema {
   minimal?: boolean;
   rootProject?: boolean;
   simpleName?: boolean;
+  addPlugin?: boolean;
 }
 
 export interface ExecutorOptions {