@nx/js 16.4.0-beta.14 → 16.4.0-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.4.0-beta.14",
+  "version": "16.4.0-beta.16",
   "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.14",
-    "@nx/devkit": "16.4.0-beta.14",
-    "@nx/workspace": "16.4.0-beta.14",
+    "@nrwl/js": "16.4.0-beta.16",
+    "@nx/devkit": "16.4.0-beta.16",
+    "@nx/workspace": "16.4.0-beta.16",
     "@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": "796c91c34b96d82306a62e90f9146ae8e68762b5"
+  "gitHead": "720cf9de0102e6829b93d259ef5f8955dbd983f1"
 }

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

@@ -135,80 +135,71 @@ function setupNpm(options) {
         }
     };
 }
-function getYarnUnsafeHttpWhitelist(isYarnV1, options) {
-    return isYarnV1
-        ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json` + options.location ===
-            'home'
-            ? ' --home'
-            : '').toString()))
+function getYarnUnsafeHttpWhitelist(isYarnV1) {
+    return !isYarnV1
+        ? new Set(JSON.parse((0, child_process_1.execSync)(`yarn config get unsafeHttpWhitelist --json`).toString()))
         : null;
 }
 function setYarnUnsafeHttpWhitelist(currentWhitelist, options) {
-    (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` +
-        options.location ===
-        'home'
-        ? ' --home'
-        : '');
+    if (currentWhitelist.size > 1) {
+        (0, child_process_1.execSync)(`yarn config set unsafeHttpWhitelist --json '${JSON.stringify(Array.from(currentWhitelist))}'` + (options.location === 'user' ? ' --home' : ''));
+    }
+    else {
+        (0, child_process_1.execSync)(`yarn config unset unsafeHttpWhitelist` +
+            (options.location === 'user' ? ' --home' : ''));
+    }
 }
 function setupYarn(options) {
     var _a, _b, _c;
+    let isYarnV1;
     try {
-        const isYarnV1 = (0, semver_1.major)((0, child_process_1.execSync)('yarn --version').toString().trim()) === 1;
-        try {
-            const registryConfigName = isYarnV1 ? 'registry' : 'npmRegistryServer';
-            const yarnRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
-            (0, child_process_1.execSync)(`yarn config set ${registryConfigName} http://localhost:${options.port}/` +
-                options.location ===
-                'home'
-                ? ' --home'
-                : '');
-            devkit_1.logger.info(`Set yarn registry to http://localhost:${options.port}/`);
-            const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1, options);
-            let whitelistedLocalhost = false;
-            if (!isYarnV1) {
-                if (!currentWhitelist.has('localhost')) {
-                    whitelistedLocalhost = true;
-                    currentWhitelist.add('localhost');
-                    setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-                    devkit_1.logger.info(`Whitelisted http://localhost:${options.port}/ as an unsafe http server`);
+        isYarnV1 = (0, semver_1.major)((0, child_process_1.execSync)('yarn --version').toString().trim()) === 1;
+    }
+    catch (_d) {
+        // This would fail if yarn is not installed which is okay
+        return () => { };
+    }
+    try {
+        const registryConfigName = isYarnV1 ? 'registry' : 'npmRegistryServer';
+        const yarnRegistryPath = (_c = (_b = (_a = (0, child_process_1.execSync)(`yarn config get ${registryConfigName}`)) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.replace('\u001b[2K\u001b[1G', ''); // strip out ansi codes
+        (0, child_process_1.execSync)(`yarn config set ${registryConfigName} http://localhost:${options.port}/` +
+            (options.location === 'user' ? ' --home' : ''));
+        devkit_1.logger.info(`Set yarn registry to http://localhost:${options.port}/`);
+        const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
+        let whitelistedLocalhost = false;
+        if (!isYarnV1 && !currentWhitelist.has('localhost')) {
+            whitelistedLocalhost = true;
+            currentWhitelist.add('localhost');
+            setYarnUnsafeHttpWhitelist(currentWhitelist, options);
+            devkit_1.logger.info(`Whitelisted http://localhost:${options.port}/ as an unsafe http server`);
+        }
+        return () => {
+            try {
+                if (yarnRegistryPath) {
+                    (0, child_process_1.execSync)(`yarn config set ${registryConfigName} ${yarnRegistryPath}` +
+                        (options.location === 'user' ? ' --home' : ''));
+                    devkit_1.logger.info(`Reset yarn ${registryConfigName} to ${yarnRegistryPath}`);
                 }
-            }
-            return () => {
-                try {
-                    if (yarnRegistryPath) {
-                        (0, child_process_1.execSync)(`yarn config set ${registryConfigName} ${yarnRegistryPath}` +
-                            options.location ===
-                            'home'
-                            ? ' --home'
-                            : '');
-                        devkit_1.logger.info(`Reset yarn ${registryConfigName} to ${yarnRegistryPath}`);
-                    }
-                    else {
-                        (0, child_process_1.execSync)(`yarn config delete ${registryConfigName}` + options.location ===
-                            'home'
-                            ? ' --home'
-                            : '');
-                    }
-                    if (whitelistedLocalhost) {
-                        const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1, options);
-                        if (currentWhitelist.has('localhost')) {
-                            currentWhitelist.delete('localhost');
-                            setYarnUnsafeHttpWhitelist(currentWhitelist, options);
-                            devkit_1.logger.info(`Removed http://localhost:${options.port}/ as an unsafe http server`);
-                        }
-                    }
+                else {
+                    (0, child_process_1.execSync)(`yarn config ${isYarnV1 ? 'delete' : 'unset'} ${registryConfigName}` +
+                        (options.location === 'user' ? ' --home' : ''));
                 }
-                catch (e) {
-                    throw new Error(`Failed to reset yarn registry: ${e.message}`);
+                if (whitelistedLocalhost) {
+                    const currentWhitelist = getYarnUnsafeHttpWhitelist(isYarnV1);
+                    if (currentWhitelist.has('localhost')) {
+                        currentWhitelist.delete('localhost');
+                        setYarnUnsafeHttpWhitelist(currentWhitelist, options);
+                        devkit_1.logger.info(`Removed http://localhost:${options.port}/ as an unsafe http server`);
+                    }
                 }
-            };
-        }
-        catch (e) {
-            throw new Error(`Failed to set yarn registry to http://localhost:${options.port}/: ${e.message}`);
-        }
+            }
+            catch (e) {
+                throw new Error(`Failed to reset yarn registry: ${e.message}`);
+            }
+        };
     }
     catch (e) {
-        return () => { };
+        throw new Error(`Failed to set yarn registry to http://localhost:${options.port}/: ${e.message}`);
     }
 }
 exports.default = verdaccioExecutor;

package/src/internal.d.ts

@@ -1,3 +1,4 @@
 export { resolveModuleByImport } from './utils/typescript/ast-utils';
 export { registerTsProject, registerTsConfigPaths, } from 'nx/src/plugins/js/utils/register';
 export { TargetProjectLocator } from 'nx/src/plugins/js/project-graph/build-dependencies/target-project-locator';
+export { findProjectsNpmDependencies } from 'nx/src/plugins/js/package-json/create-package-json';

package/src/internal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetProjectLocator = exports.registerTsConfigPaths = exports.registerTsProject = exports.resolveModuleByImport = void 0;
+exports.findProjectsNpmDependencies = exports.TargetProjectLocator = exports.registerTsConfigPaths = exports.registerTsProject = exports.resolveModuleByImport = void 0;
 var ast_utils_1 = require("./utils/typescript/ast-utils");
 Object.defineProperty(exports, "resolveModuleByImport", { enumerable: true, get: function () { return ast_utils_1.resolveModuleByImport; } });
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
@@ -10,3 +10,6 @@ Object.defineProperty(exports, "registerTsConfigPaths", { enumerable: true, get:
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 var target_project_locator_1 = require("nx/src/plugins/js/project-graph/build-dependencies/target-project-locator");
 Object.defineProperty(exports, "TargetProjectLocator", { enumerable: true, get: function () { return target_project_locator_1.TargetProjectLocator; } });
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+var create_package_json_1 = require("nx/src/plugins/js/package-json/create-package-json");
+Object.defineProperty(exports, "findProjectsNpmDependencies", { enumerable: true, get: function () { return create_package_json_1.findProjectsNpmDependencies; } });

package/src/plugins/jest/start-local-registry.js

@@ -28,8 +28,12 @@ function startLocalRegistry({ localRegistryTarget, storage, verbose, }) {
                 console.log('Local registry started on port ' + port);
                 const registry = `http://localhost:${port}`;
                 process.env.npm_config_registry = registry;
-                process.env.YARN_REGISTRY = registry;
                 (0, child_process_1.execSync)(`npm config set //localhost:${port}/:_authToken "secretVerdaccioToken"`);
+                // yarnv1
+                process.env.YARN_REGISTRY = registry;
+                // yarnv2
+                process.env.YARN_NPM_REGISTRY_SERVER = registry;
+                process.env.YARN_UNSAFE_HTTP_WHITELIST = 'localhost';
                 console.log('Set npm and yarn config registry to ' + registry);
                 resolve(() => {
                     childProcess.kill();

package/src/utils/compiler-helper-dependency.js

@@ -85,8 +85,7 @@ function getHelperDependenciesFromProjectGraph(contextRoot, sourceProject, proje
     const internalDependencies = sourceDependencies.reduce((result, dependency) => {
         // we check if a dependency is part of the workspace and if it's a library
         // because we wouldn't want to include external dependencies (npm packages)
-        if (!dependency.target.startsWith('npm:') &&
-            !!projectGraph.nodes[dependency.target] &&
+        if (projectGraph.nodes[dependency.target] &&
             projectGraph.nodes[dependency.target].type === 'lib') {
             const targetData = projectGraph.nodes[dependency.target].data;
             // check if the dependency has a buildable target with one of the jsExecutors