@nrwl/workspace 15.9.2 → 16.0.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "15.9.2",
+  "version": "16.0.0-beta.0",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,36 +33,35 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "15.9.2",
-      "@nrwl/jest": "15.9.2",
-      "@nrwl/linter": "15.9.2",
-      "@nrwl/angular": "15.9.2",
-      "@nrwl/cli": "15.9.2",
-      "@nrwl/cypress": "15.9.2",
-      "@nrwl/detox": "15.9.2",
-      "@nrwl/devkit": "15.9.2",
-      "@nrwl/esbuild": "15.9.2",
-      "@nrwl/eslint-plugin-nx": "15.9.2",
-      "@nrwl/expo": "15.9.2",
-      "@nrwl/express": "15.9.2",
-      "@nrwl/nest": "15.9.2",
-      "@nrwl/next": "15.9.2",
-      "@nrwl/node": "15.9.2",
+      "@nrwl/js": "16.0.0-beta.0",
+      "@nrwl/jest": "16.0.0-beta.0",
+      "@nrwl/linter": "16.0.0-beta.0",
+      "@nrwl/angular": "16.0.0-beta.0",
+      "@nrwl/cypress": "16.0.0-beta.0",
+      "@nrwl/detox": "16.0.0-beta.0",
+      "@nrwl/devkit": "16.0.0-beta.0",
+      "@nrwl/esbuild": "16.0.0-beta.0",
+      "@nrwl/eslint-plugin-nx": "16.0.0-beta.0",
+      "@nrwl/expo": "16.0.0-beta.0",
+      "@nrwl/express": "16.0.0-beta.0",
+      "@nrwl/nest": "16.0.0-beta.0",
+      "@nrwl/next": "16.0.0-beta.0",
+      "@nrwl/node": "16.0.0-beta.0",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/nx-plugin": "15.9.2",
-      "@nrwl/react-native": "15.9.2",
-      "@nrwl/react": "15.9.2",
-      "@nrwl/rollup": "15.9.2",
-      "@nrwl/storybook": "15.9.2",
-      "@nrwl/tao": "15.9.2",
-      "@nrwl/vite": "15.9.2",
-      "@nrwl/web": "15.9.2",
-      "@nrwl/webpack": "15.9.2",
-      "nx": "15.9.2"
+      "@nrwl/nx-plugin": "16.0.0-beta.0",
+      "@nrwl/react-native": "16.0.0-beta.0",
+      "@nrwl/react": "16.0.0-beta.0",
+      "@nrwl/rollup": "16.0.0-beta.0",
+      "@nrwl/storybook": "16.0.0-beta.0",
+      "@nrwl/tao": "16.0.0-beta.0",
+      "@nrwl/vite": "16.0.0-beta.0",
+      "@nrwl/web": "16.0.0-beta.0",
+      "@nrwl/webpack": "16.0.0-beta.0",
+      "nx": "16.0.0-beta.0"
     }
   },
   "dependencies": {
-    "@nrwl/devkit": "15.9.2",
+    "@nrwl/devkit": "16.0.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -71,11 +70,10 @@
     "dotenv": "~10.0.0",
     "figures": "3.2.0",
     "flat": "^5.0.2",
-    "glob": "7.1.4",
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "15.9.2",
+    "nx": "16.0.0-beta.0",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "tmp": "~0.2.1",
@@ -87,5 +85,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "c60dd8b2f03545ba7d9bbf58c10ac7b49f7f3e92"
+  "gitHead": "1e31d4726f2c623ede0c515429aa842e943dba47"
 }

package/src/generators/remove/lib/__fixtures__/jest-project.config.d.ts

@@ -0,0 +1,14 @@
+declare const _default: {
+    displayName: string;
+    preset: string;
+    testEnvironment: string;
+    transform: {
+        '^.+\\.[tj]s$': (string | {
+            tsconfig: string;
+        })[];
+    };
+    moduleFileExtensions: string[];
+    coverageDirectory: string;
+    testMatch: string[];
+};
+export default _default;

package/src/generators/remove/lib/__fixtures__/jest-project.config.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable */
+exports.default = {
+    displayName: 'node-app',
+    preset: './jest.preset.js',
+    testEnvironment: 'node',
+    transform: {
+        '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+    },
+    moduleFileExtensions: ['ts', 'js', 'html'],
+    coverageDirectory: './coverage/node-app',
+    testMatch: [
+        '<rootDir>/src/**/__tests__/**/*.[jt]s?(x)',
+        '<rootDir>/src/**/*(*.)@(spec|test).[jt]s?(x)',
+    ],
+};
+//# sourceMappingURL=jest-project.config.js.map

package/src/generators/remove/lib/__fixtures__/jest-project.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest-project.config.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/generators/remove/lib/__fixtures__/jest-project.config.ts"],"names":[],"mappings":";;AAAA,oBAAoB;AACpB,kBAAe;IACb,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,kBAAkB;IAC1B,eAAe,EAAE,MAAM;IACvB,SAAS,EAAE;QACT,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,8BAA8B,EAAE,CAAC;KAC1E;IACD,oBAAoB,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;IAC1C,iBAAiB,EAAE,qBAAqB;IACxC,SAAS,EAAE;QACT,2CAA2C;QAC3C,8CAA8C;KAC/C;CACF,CAAC"}

package/src/generators/remove/lib/__fixtures__/jest.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/generators/remove/lib/__fixtures__/jest.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE;QACR,wBAAwB;QACxB,6BAA6B;QAC7B,uBAAuB;QACvB,8BAA8B;KAC/B;CACF,CAAC"}

package/src/generators/remove/lib/update-jest-config.js

@@ -9,6 +9,14 @@ let tsModule;
 function isUsingUtilityFunction(host) {
     return host.read('jest.config.ts').toString().includes('getJestProjects()');
 }
+/**
+ * in a standalone project, the root jest.config.ts is a project config instead
+ * of multi-project config.
+ * in that case we do not need to edit it to remove it
+ **/
+function isMonorepoConfig(tree) {
+    return tree.read('jest.config.ts', 'utf-8').includes('projects:');
+}
 /**
  * Updates the root jest config projects array and removes the project.
  */
@@ -20,7 +28,8 @@ function updateJestConfig(tree, schema, projectConfig) {
     const projectToRemove = schema.projectName;
     if (!tree.exists('jest.config.ts') ||
         !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
-        isUsingUtilityFunction(tree)) {
+        isUsingUtilityFunction(tree) ||
+        !isMonorepoConfig(tree)) {
         return;
     }
     const contents = tree.read('jest.config.ts', 'utf-8');

package/src/generators/remove/lib/update-jest-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;AAQhF,+BAA4B;AAC5B,8DAAiE;AAEjE,IAAI,QAAqC,CAAC;AAE1C,SAAS,sBAAsB,CAAC,IAAU;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,GAChB,GAAG,QAAQ,CAAC;IACb,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC;IAE3C,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC9B,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxD,sBAAsB,CAAC,IAAI,CAAC,EAC5B;QACA,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,gBAAgB,CACjC,gBAAgB,EAChB,QAAQ,EACR,YAAY,CAAC,MAAM,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,oBAAoB,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,UAAU;QAC5C,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CACvB,CAAC;IAExB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,KAAK,CACT,oBAAoB,eAAe,oDAAoD,eAAe,sBAAsB,CAC7H,CAAC;KACH;IACD,MAAM,aAAa,GACjB,kBAAkB,CAAC,WAAqC,CAAC;IAE3D,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,eAAe,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,aAAa,CAAC,IAAI,EAAE,CAAC,CACzC,CAAC;IAEnB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,IAAI,CACV,kBAAkB,eAAe,kCAAkC,CACpE,CAAC;QACF,OAAO;KACR;IAED,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtE,MAAM,KAAK,GAAG,eAAe;QAC3B,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE;QAC1B,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QAC7B;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK;SACjC;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AA/ED,4CA+EC"}
+{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":"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"}

package/src/utils/perf-logging.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const perf_hooks_1 = require("perf_hooks");
-if (process.env.NX_PERF_LOGGING) {
+if (process.env.NX_PERF_LOGGING === 'true') {
     const obs = new perf_hooks_1.PerformanceObserver((list) => {
         const entry = list.getEntries()[0];
         console.log(`Time for '${entry.name}'`, entry.duration);

package/src/utils/perf-logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"perf-logging.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/perf-logging.ts"],"names":[],"mappings":";;AAAA,2CAAiD;AAEjD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;IAC/B,MAAM,GAAG,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"perf-logging.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/perf-logging.ts"],"names":[],"mappings":";;AAAA,2CAAiD;AAEjD,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,EAAE;IAC1C,MAAM,GAAG,GAAG,IAAI,gCAAmB,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CAC1C"}

package/src/generators/remove/lib/test-files/jest.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jest.config.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/generators/remove/lib/test-files/jest.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE;QACR,wBAAwB;QACxB,6BAA6B;QAC7B,uBAAuB;QACvB,8BAA8B;KAC/B;CACF,CAAC"}

package/src/utilities/assets.d.ts

@@ -1,10 +0,0 @@
-export type FileInputOutput = {
-    input: string;
-    output: string;
-};
-export type AssetGlob = FileInputOutput & {
-    glob: string;
-    ignore?: string[];
-    dot?: boolean;
-};
-export declare function assetGlobsToFiles(assets: Array<AssetGlob | string>, rootDir: string, outDir: string): FileInputOutput[];

package/src/utilities/assets.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assetGlobsToFiles = void 0;
-const glob = require("glob");
-const path_1 = require("path");
-function assetGlobsToFiles(assets, rootDir, outDir) {
-    const files = [];
-    const globbedFiles = (pattern, input = '', ignore = [], dot = false) => {
-        return glob.sync(pattern, {
-            cwd: input,
-            nodir: true,
-            dot,
-            ignore,
-        });
-    };
-    assets.forEach((asset) => {
-        var _a;
-        if (typeof asset === 'string') {
-            globbedFiles(asset, rootDir).forEach((globbedFile) => {
-                files.push({
-                    input: (0, path_1.join)(rootDir, globbedFile),
-                    output: (0, path_1.join)(outDir, (0, path_1.basename)(globbedFile)),
-                });
-            });
-        }
-        else {
-            globbedFiles(asset.glob, (0, path_1.join)(rootDir, asset.input), asset.ignore, (_a = asset.dot) !== null && _a !== void 0 ? _a : false).forEach((globbedFile) => {
-                files.push({
-                    input: (0, path_1.join)(rootDir, asset.input, globbedFile),
-                    output: (0, path_1.join)(outDir, asset.output, globbedFile),
-                });
-            });
-        }
-    });
-    return files;
-}
-exports.assetGlobsToFiles = assetGlobsToFiles;
-//# sourceMappingURL=assets.js.map

package/src/utilities/assets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/assets.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+BAAsC;AAYtC,SAAgB,iBAAiB,CAC/B,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CACnB,OAAe,EACf,KAAK,GAAG,EAAE,EACV,SAAmB,EAAE,EACrB,MAAe,KAAK,EACpB,EAAE;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnD,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,WAAW,CAAC;oBACjC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,YAAY,CACV,KAAK,CAAC,IAAI,EACV,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAC1B,KAAK,CAAC,MAAM,EACZ,MAAA,KAAK,CAAC,GAAG,mCAAI,KAAK,CACnB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACxB,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC9C,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA7CD,8CA6CC"}