nx 20.5.0-beta.4 → 20.5.0-beta.5

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{3895:()=>{}},s=>{var e;e=3895,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{2558:()=>{}},s=>{var e;e=2558,s(s.s=e)}]);

package/src/plugins/js/lock-file/yarn-parser.js

@@ -29,14 +29,14 @@ function getYarnLockfileNodes(lockFileContent, lockFileHash, packageJson) {
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getNodes(groupedDependencies, packageJson, keyMap, isBerry);
+    return getNodes(groupedDependencies, packageJson, isBerry);
 }
 function getYarnLockfileDependencies(lockFileContent, lockFileHash, ctx) {
     const { __metadata, ...dependencies } = parseLockFile(lockFileContent, lockFileHash);
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getDependencies(groupedDependencies, keyMap, ctx);
+    return getDependencies(groupedDependencies, ctx);
 }
 function getPackageNameKeyPairs(keys) {
     const result = new Map();
@@ -51,7 +51,7 @@ function getPackageNameKeyPairs(keys) {
     });
     return result;
 }
-function getNodes(dependencies, packageJson, keyMap, isBerry) {
+function getNodes(dependencies, packageJson, isBerry) {
     const nodes = new Map();
     const combinedDeps = {
         ...packageJson.dependencies,
@@ -68,7 +68,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
         nameKeyPairs.forEach((keySet, packageName) => {
             const keysArray = Array.from(keySet);
             // use key relevant to the package name
-            const version = findVersion(packageName, keysArray[0], snapshot, isBerry);
+            const [version, isAlias] = findVersion(packageName, keysArray[0], snapshot, isBerry);
             // use keys linked to the extracted package name
             keysArray.forEach((key) => {
                 // we don't need to keep duplicates, we can just track the keys
@@ -79,7 +79,7 @@ function getNodes(dependencies, packageJson, keyMap, isBerry) {
                 }
                 const node = {
                     type: 'npm',
-                    name: version
+                    name: version && !isAlias
                         ? `npm:${packageName}@${version}`
                         : `npm:${packageName}`,
                     data: {
@@ -151,7 +151,7 @@ function findVersion(packageName, key, snapshot, isBerry) {
         ? snapshot.resolution && !snapshot.resolution.startsWith(`${packageName}@`)
         : versionRange.startsWith('npm:');
     if (isAlias) {
-        return versionRange;
+        return [versionRange, true];
     }
     // check for berry tarball packages
     if (isBerry &&
@@ -159,13 +159,13 @@ function findVersion(packageName, key, snapshot, isBerry) {
         // different registry would yield suffix following '::' which we don't need
         snapshot.resolution.split('::')[0] !==
             `${packageName}@npm:${snapshot.version}`) {
-        return snapshot.resolution.slice(packageName.length + 1);
+        return [snapshot.resolution.slice(packageName.length + 1)];
     }
     if (!isBerry && isTarballPackage(versionRange, snapshot)) {
-        return snapshot.resolved;
+        return [snapshot.resolved];
     }
     // otherwise it's a standard version
-    return snapshot.version;
+    return [snapshot.version];
 }
 // check if snapshot represents tarball package
 function isTarballPackage(versionRange, snapshot) {
@@ -193,7 +193,7 @@ function getHoistedVersion(packageName) {
         return version;
     }
 }
-function getDependencies(dependencies, keyMap, ctx) {
+function getDependencies(dependencies, ctx) {
     const projectGraphDependencies = [];
     Object.keys(dependencies).forEach((keys) => {
         const snapshot = dependencies[keys];

package/src/utils/find-matching-projects.js

@@ -112,8 +112,8 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
         return;
     }
     if (!(0, globs_1.isGlobPattern)(pattern.value)) {
-        // Custom regex that is basically \b without underscores, so "foo" pattern matches "foo_bar".
-        const regex = new RegExp(`(?<![a-zA-Z0-9])${pattern.value}(?![a-zA-Z0-9])`, 'i');
+        // Custom regex that is basically \b but includes hyphens (-) and excludes underscores (_), so "foo" pattern matches "foo_bar" but not "foo-e2e".
+        const regex = new RegExp(`(?<![a-zA-Z0-9-])${pattern.value}(?![a-zA-Z0-9-])`, 'i');
         const matchingProjects = Object.keys(projects).filter((name) => regex.test(name));
         for (const projectName of matchingProjects) {
             if (pattern.exclude) {

package/src/command-line/init/implementation/react/write-craco-config.d.ts

@@ -1 +0,0 @@
-export declare function writeCracoConfig(appName: string, isCRA5: boolean, isStandalone: boolean): void;

package/src/command-line/init/implementation/react/write-craco-config.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCracoConfig = writeCracoConfig;
-const fs_1 = require("fs");
-function writeCracoConfig(appName, isCRA5, isStandalone) {
-    const configOverride = `
-  const path = require('path');
-  const TsConfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-  const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-  module.exports = {
-    webpack: {
-      configure: (config) => {
-        // Remove guard against importing modules outside of \`src\`.
-        // Needed for workspace projects.
-        config.resolve.plugins = config.resolve.plugins.filter(
-          (plugin) => !(plugin instanceof ModuleScopePlugin)
-        );
-        // Add support for importing workspace projects.
-        config.resolve.plugins.push(
-          new TsConfigPathsPlugin({
-            configFile: path.resolve(__dirname, 'tsconfig.json'),
-            extensions: ['.ts', '.tsx', '.js', '.jsx'],
-            mainFields: ['browser', 'module', 'main'],
-          })
-        );
-        ${isCRA5
-        ? `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules[1].oneOf.forEach((r) => {
-          if (r.loader && r.loader.indexOf('babel') !== -1) {
-            r.exclude = /node_modules/;
-            delete r.include;
-          }
-        });`
-        : `
-        // Replace include option for babel loader with exclude
-        // so babel will handle workspace projects as well.
-        config.module.rules.forEach((r) => {
-          if (r.oneOf) {
-            const babelLoader = r.oneOf.find(
-              (rr) => rr.loader.indexOf('babel-loader') !== -1
-            );
-            babelLoader.exclude = /node_modules/;
-            delete babelLoader.include;
-          }
-        });
-        `}
-        return config;
-      },
-    },
-    jest: {
-      configure: (config) => {
-        config.resolver = '@nx/jest/plugins/resolver';
-        return config;
-      },
-    },
-  };
-  `;
-    (0, fs_1.writeFileSync)(isStandalone ? 'craco.config.js' : `apps/${appName}/craco.config.js`, configOverride);
-}