@nrwl/workspace 14.0.0-beta.4 → 14.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "14.0.0-beta.4",
+  "version": "14.0.1",
   "description": "Smart, Fast and Extensible Build System.",
   "repository": {
     "type": "git",
@@ -32,26 +32,26 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "14.0.0-beta.4",
-      "@nrwl/cypress": "14.0.0-beta.4",
-      "@nrwl/devkit": "14.0.0-beta.4",
-      "@nrwl/eslint-plugin-nx": "14.0.0-beta.4",
-      "@nrwl/express": "14.0.0-beta.4",
-      "@nrwl/jest": "14.0.0-beta.4",
-      "@nrwl/linter": "14.0.0-beta.4",
-      "@nrwl/nest": "14.0.0-beta.4",
-      "@nrwl/next": "14.0.0-beta.4",
-      "@nrwl/node": "14.0.0-beta.4",
-      "@nrwl/nx-plugin": "14.0.0-beta.4",
-      "@nrwl/react": "14.0.0-beta.4",
-      "@nrwl/storybook": "14.0.0-beta.4",
-      "@nrwl/web": "14.0.0-beta.4",
-      "@nrwl/js": "14.0.0-beta.4",
-      "@nrwl/cli": "14.0.0-beta.4",
+      "@nrwl/angular": "14.0.1",
+      "@nrwl/cypress": "14.0.1",
+      "@nrwl/devkit": "14.0.1",
+      "@nrwl/eslint-plugin-nx": "14.0.1",
+      "@nrwl/express": "14.0.1",
+      "@nrwl/jest": "14.0.1",
+      "@nrwl/linter": "14.0.1",
+      "@nrwl/nest": "14.0.1",
+      "@nrwl/next": "14.0.1",
+      "@nrwl/node": "14.0.1",
+      "@nrwl/nx-plugin": "14.0.1",
+      "@nrwl/react": "14.0.1",
+      "@nrwl/storybook": "14.0.1",
+      "@nrwl/web": "14.0.1",
+      "@nrwl/js": "14.0.1",
+      "@nrwl/cli": "14.0.1",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/react-native": "14.0.0-beta.4",
-      "@nrwl/detox": "14.0.0-beta.4",
-      "nx": "14.0.0-beta.4"
+      "@nrwl/react-native": "14.0.1",
+      "@nrwl/detox": "14.0.1",
+      "nx": "14.0.1"
     }
   },
   "peerDependencies": {
@@ -84,9 +84,9 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "nx": "14.0.0-beta.4",
-    "@nrwl/devkit": "14.0.0-beta.4",
-    "@nrwl/jest": "14.0.0-beta.4",
-    "@nrwl/linter": "14.0.0-beta.4"
+    "nx": "14.0.1",
+    "@nrwl/devkit": "14.0.1",
+    "@nrwl/jest": "14.0.1",
+    "@nrwl/linter": "14.0.1"
   }
 }

package/src/generators/library/files/lib/tsconfig.lib.json

@@ -6,5 +6,5 @@
     "types": []
   },
   "include": ["**/*.ts"<% if (js) { %>, "**/*.js"<% } %>],
-  "exclude": ["**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
+  "exclude": ["jest.config.ts","**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
 }

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

@@ -10,7 +10,7 @@ const path = require("path");
  * @param schema The options provided to the schematic
  */
 function updateJestConfig(tree, schema, project) {
-    const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.js');
+    const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.ts');
     if (tree.exists(jestConfigPath)) {
         const oldContent = tree.read(jestConfigPath, 'utf-8');
         const findName = new RegExp(`'${schema.projectName}'`, 'g');
@@ -20,8 +20,8 @@ function updateJestConfig(tree, schema, project) {
             .replace(findDir, schema.relativeToRootDestination);
         tree.write(jestConfigPath, newContent);
     }
-    // update root jest.config.js
-    const rootJestConfigPath = '/jest.config.js';
+    // update root jest.config.ts
+    const rootJestConfigPath = '/jest.config.ts';
     if (!tree.exists(rootJestConfigPath)) {
         return;
     }

package/src/generators/move/lib/update-project-root-files.js

@@ -4,6 +4,7 @@ exports.updateProjectRootFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const path_1 = require("path");
+const allowedExt = ['.ts', '.js', '.json'];
 /**
  * Updates the files in the root of the project
  *
@@ -27,7 +28,8 @@ function updateProjectRootFiles(tree, schema, project) {
     const dots = /\./g;
     const regex = new RegExp(oldRelativeRoot.replace(dots, '\\.'), 'g');
     for (const file of tree.children(schema.relativeToRootDestination)) {
-        if (!(0, path_1.extname)(file).startsWith('.js')) {
+        const ext = (0, path_1.extname)(file);
+        if (!allowedExt.includes(ext)) {
             continue;
         }
         if (file === '.eslintrc.json') {

package/src/generators/move/lib/update-project-root-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAGrC;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IAEpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}
+{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAErC,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IACpE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7B,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AAxCD,wDAwCC"}

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

@@ -0,0 +1,9 @@
+module.exports = {
+    projects: [
+        '<rootDir>/apps/my-app/',
+        '<rootDir>/apps/my-other-app',
+        '<rootDir>/libs/my-lib',
+        '<rootDir>/libs/my-other-lib/',
+    ],
+};
+//# sourceMappingURL=jest.config.js.map

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

@@ -0,0 +1 @@
+{"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/generators/remove/lib/update-jest-config.js

@@ -6,39 +6,39 @@ const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nod
 const typescript_1 = require("typescript");
 const path_1 = require("path");
 function isUsingUtilityFunction(host) {
-    return host.read('jest.config.js').toString().includes('getJestProjects()');
+    return host.read('jest.config.ts').toString().includes('getJestProjects()');
 }
 /**
  * Updates the root jest config projects array and removes the project.
  */
 function updateJestConfig(tree, schema, projectConfig) {
     const projectToRemove = schema.projectName;
-    if (!tree.exists('jest.config.js') ||
-        !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.js')) ||
+    if (!tree.exists('jest.config.ts') ||
+        !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
         isUsingUtilityFunction(tree)) {
         return;
     }
-    const contents = tree.read('jest.config.js', 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)('jest.config.js', contents, typescript_1.ScriptTarget.Latest);
+    const contents = tree.read('jest.config.ts', 'utf-8');
+    const sourceFile = (0, typescript_1.createSourceFile)('jest.config.ts', contents, typescript_1.ScriptTarget.Latest);
     const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
     const projectsAssignment = sourceNodes.find((node) => (0, typescript_1.isPropertyAssignment)(node) &&
         node.name.getText(sourceFile) === 'projects' &&
         (0, typescript_1.isArrayLiteralExpression)(node.initializer));
     if (!projectsAssignment) {
-        throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.js. Please remove ${projectToRemove} from your projects.`);
+        throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
     }
     const projectsArray = projectsAssignment.initializer;
     const project = projectsArray.elements.find((item) => (0, typescript_1.isStringLiteral)(item) &&
         item.text.startsWith(`<rootDir>/${projectConfig.root}`));
     if (!project) {
-        console.warn(`Could not find ${projectToRemove} in projects in /jest.config.js.`);
+        console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);
         return;
     }
     const previousProject = projectsArray.elements[projectsArray.elements.indexOf(project) - 1];
     const start = previousProject
         ? previousProject.getEnd()
         : project.getStart(sourceFile);
-    tree.write('jest.config.js', (0, devkit_1.applyChangesToString)(contents, [
+    tree.write('jest.config.ts', (0, devkit_1.applyChangesToString)(contents, [
         {
             type: devkit_1.ChangeType.Delete,
             start,

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
-exports.nxVersion = '14.0.0-beta.4';
+exports.nxVersion = '14.0.1';
 exports.angularCliVersion = '~13.3.0';
 exports.typescriptVersion = '~4.6.2';
 exports.prettierVersion = '^2.5.1';