@nx/js 19.7.0-beta.1 → 19.7.0-beta.2

package/babel.js

@@ -18,6 +18,30 @@ module.exports = function (api, options = {}) {
     if (options.classProperties) {
         devkit_1.logger.warn(`Use =\`loose\` option instead of \`classProperties.loose\`. The \`classProperties\` option will be removed in Nx 20`);
     }
+    const plugins = [
+        !isNxPackage
+            ? [
+                require.resolve('@babel/plugin-transform-runtime'),
+                {
+                    corejs: false,
+                    helpers: true,
+                    regenerator: true,
+                    useESModules: isModern,
+                    absoluteRuntime: (0, path_1.dirname)(require.resolve('@babel/runtime/package.json')),
+                },
+            ]
+            : null,
+        require.resolve('babel-plugin-macros'),
+        emitDecoratorMetadata
+            ? require.resolve('babel-plugin-transform-typescript-metadata')
+            : undefined,
+        // Must use legacy decorators to remain compatible with TypeScript.
+        [
+            require.resolve('@babel/plugin-proposal-decorators'),
+            options.decorators ?? { legacy: true },
+        ],
+        [require.resolve('@babel/plugin-transform-class-properties'), { loose }],
+    ].filter(Boolean);
     return {
         presets: [
             // Support module/nomodule pattern.
@@ -37,30 +61,7 @@ module.exports = function (api, options = {}) {
                 },
             ],
         ],
-        plugins: [
-            !isNxPackage
-                ? [
-                    require.resolve('@babel/plugin-transform-runtime'),
-                    {
-                        corejs: false,
-                        helpers: true,
-                        regenerator: true,
-                        useESModules: isModern,
-                        absoluteRuntime: (0, path_1.dirname)(require.resolve('@babel/runtime/package.json')),
-                    },
-                ]
-                : null,
-            require.resolve('babel-plugin-macros'),
-            emitDecoratorMetadata
-                ? require.resolve('babel-plugin-transform-typescript-metadata')
-                : undefined,
-            // Must use legacy decorators to remain compatible with TypeScript.
-            [
-                require.resolve('@babel/plugin-proposal-decorators'),
-                options.decorators ?? { legacy: true },
-            ],
-            [require.resolve('@babel/plugin-transform-class-properties'), { loose }],
-        ].filter(Boolean),
+        plugins,
         overrides: [
             // Convert `const enum` to `enum`. The former cannot be supported by babel
             // but at least we can get it to not error out.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.7.0-beta.1",
+  "version": "19.7.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": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "19.7.0-beta.1",
-    "@nx/workspace": "19.7.0-beta.1",
+    "@nx/devkit": "19.7.0-beta.2",
+    "@nx/workspace": "19.7.0-beta.2",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -61,7 +61,7 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/js": "19.7.0-beta.1"
+    "@nrwl/js": "19.7.0-beta.2"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/verdaccio/verdaccio.impl.js

@@ -122,19 +122,19 @@ function setupNpm(options) {
     const scopes = ['', ...(options.scopes || [])];
     try {
         scopes.forEach((scope) => {
-            const scopeName = scope ? `${scope}:` : '';
+            const registryName = scope ? `${scope}:registry` : 'registry';
             try {
-                npmRegistryPaths.push((0, child_process_1.execSync)(`npm config get '${scopeName}registry' --location ${options.location}`, { env })
+                npmRegistryPaths.push((0, child_process_1.execSync)(`npm config get ${registryName} --location ${options.location}`, { env })
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', '') // strip out ansi codes
                 );
-                (0, child_process_1.execSync)(`npm config set '${scopeName}registry' http://localhost:${options.port}/ --location ${options.location}`, { env });
+                (0, child_process_1.execSync)(`npm config set ${registryName} http://localhost:${options.port}/ --location ${options.location}`, { env });
                 (0, child_process_1.execSync)(`npm config set //localhost:${options.port}/:_authToken="secretVerdaccioToken" --location ${options.location}`, { env });
-                devkit_1.logger.info(`Set npm ${scopeName}registry to http://localhost:${options.port}/`);
+                devkit_1.logger.info(`Set npm ${registryName} to http://localhost:${options.port}/`);
             }
             catch (e) {
-                throw new Error(`Failed to set npm ${scopeName}registry to http://localhost:${options.port}/: ${e.message}`);
+                throw new Error(`Failed to set npm ${registryName} to http://localhost:${options.port}/: ${e.message}`);
             }
         });
         return () => {
@@ -143,20 +143,20 @@ function setupNpm(options) {
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
-                if (npmRegistryPaths.length > 0 &&
-                    currentNpmRegistryPath.includes('localhost')) {
-                    scopes.forEach((scope, index) => {
-                        const scopeName = scope ? `${scope}:` : '';
-                        (0, child_process_1.execSync)(`npm config set '${scopeName}registry' ${npmRegistryPaths[index]} --location ${options.location}`, { env });
-                        devkit_1.logger.info(`Reset npm ${scopeName}registry to ${npmRegistryPaths[index]}`);
-                    });
-                }
-                else {
-                    (0, child_process_1.execSync)(`npm config delete registry --location ${options.location}`, {
-                        env,
-                    });
-                    devkit_1.logger.info('Cleared custom npm registry');
-                }
+                scopes.forEach((scope, index) => {
+                    const registryName = scope ? `${scope}:registry` : 'registry';
+                    if (npmRegistryPaths[index] &&
+                        currentNpmRegistryPath.includes('localhost')) {
+                        (0, child_process_1.execSync)(`npm config set ${registryName} ${npmRegistryPaths[index]} --location ${options.location}`, { env });
+                        devkit_1.logger.info(`Reset npm ${registryName} to ${npmRegistryPaths[index]}`);
+                    }
+                    else {
+                        (0, child_process_1.execSync)(`npm config delete ${registryName} --location ${options.location}`, {
+                            env,
+                        });
+                        devkit_1.logger.info('Cleared custom npm registry');
+                    }
+                });
                 (0, child_process_1.execSync)(`npm config delete //localhost:${options.port}/:_authToken  --location ${options.location}`, { env });
             }
             catch (e) {
@@ -225,20 +225,22 @@ function setupYarn(options) {
                     ?.toString()
                     ?.trim()
                     ?.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
-                if (yarnRegistryPaths.length > 0 &&
-                    currentYarnRegistryPath.includes('localhost')) {
-                    scopes.forEach((scope, index) => {
-                        const scopeName = scope ? `${scope}:` : '';
-                        (0, child_process_1.execSync)(`yarn config set ${scopeName}${registryConfigName} ${yarnRegistryPaths[index]}` +
+                scopes.forEach((scope, index) => {
+                    const registryName = scope
+                        ? `${scope}:${registryConfigName}`
+                        : registryConfigName;
+                    if (yarnRegistryPaths[index] &&
+                        currentYarnRegistryPath.includes('localhost')) {
+                        (0, child_process_1.execSync)(`yarn config set ${registryName} ${yarnRegistryPaths[index]}` +
                             (options.location === 'user' ? ' --home' : ''), { env });
-                        devkit_1.logger.info(`Reset yarn ${scopeName}${registryConfigName} to ${yarnRegistryPaths[index]}`);
-                    });
-                }
-                else {
-                    (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryConfigName}` +
-                        (options.location === 'user' ? ' --home' : ''), { env });
-                    devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
-                }
+                        devkit_1.logger.info(`Reset yarn ${registryName} to ${yarnRegistryPaths[index]}`);
+                    }
+                    else {
+                        (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryName}` +
+                            (options.location === 'user' ? ' --home' : ''), { env });
+                        devkit_1.logger.info(`Cleared custom yarn ${registryConfigName}`);
+                    }
+                });
                 if (whitelistedLocalhost) {
                     const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
                     if (currentWhitelist.has('localhost')) {