@nrwl/workspace 14.0.0-beta.4 → 14.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/package.json +24 -24
  2. package/src/generators/library/files/lib/tsconfig.lib.json +1 -1
  3. package/src/generators/move/lib/update-jest-config.js +3 -3
  4. package/src/generators/move/lib/update-project-root-files.js +3 -1
  5. package/src/generators/move/lib/update-project-root-files.js.map +1 -1
  6. package/src/generators/remove/lib/test-files/jest.config.d.ts +0 -0
  7. package/src/generators/remove/lib/test-files/jest.config.js +9 -0
  8. package/src/generators/remove/lib/test-files/jest.config.js.map +1 -0
  9. package/src/generators/remove/lib/update-jest-config.js +8 -8
  10. package/src/utils/versions.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "14.0.0-beta.4",
3
+ "version": "14.0.1",
4
4
  "description": "Smart, Fast and Extensible Build System.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,26 +32,26 @@
32
32
  "requirements": {},
33
33
  "migrations": "./migrations.json",
34
34
  "packageGroup": {
35
- "@nrwl/angular": "14.0.0-beta.4",
36
- "@nrwl/cypress": "14.0.0-beta.4",
37
- "@nrwl/devkit": "14.0.0-beta.4",
38
- "@nrwl/eslint-plugin-nx": "14.0.0-beta.4",
39
- "@nrwl/express": "14.0.0-beta.4",
40
- "@nrwl/jest": "14.0.0-beta.4",
41
- "@nrwl/linter": "14.0.0-beta.4",
42
- "@nrwl/nest": "14.0.0-beta.4",
43
- "@nrwl/next": "14.0.0-beta.4",
44
- "@nrwl/node": "14.0.0-beta.4",
45
- "@nrwl/nx-plugin": "14.0.0-beta.4",
46
- "@nrwl/react": "14.0.0-beta.4",
47
- "@nrwl/storybook": "14.0.0-beta.4",
48
- "@nrwl/web": "14.0.0-beta.4",
49
- "@nrwl/js": "14.0.0-beta.4",
50
- "@nrwl/cli": "14.0.0-beta.4",
35
+ "@nrwl/angular": "14.0.1",
36
+ "@nrwl/cypress": "14.0.1",
37
+ "@nrwl/devkit": "14.0.1",
38
+ "@nrwl/eslint-plugin-nx": "14.0.1",
39
+ "@nrwl/express": "14.0.1",
40
+ "@nrwl/jest": "14.0.1",
41
+ "@nrwl/linter": "14.0.1",
42
+ "@nrwl/nest": "14.0.1",
43
+ "@nrwl/next": "14.0.1",
44
+ "@nrwl/node": "14.0.1",
45
+ "@nrwl/nx-plugin": "14.0.1",
46
+ "@nrwl/react": "14.0.1",
47
+ "@nrwl/storybook": "14.0.1",
48
+ "@nrwl/web": "14.0.1",
49
+ "@nrwl/js": "14.0.1",
50
+ "@nrwl/cli": "14.0.1",
51
51
  "@nrwl/nx-cloud": "latest",
52
- "@nrwl/react-native": "14.0.0-beta.4",
53
- "@nrwl/detox": "14.0.0-beta.4",
54
- "nx": "14.0.0-beta.4"
52
+ "@nrwl/react-native": "14.0.1",
53
+ "@nrwl/detox": "14.0.1",
54
+ "nx": "14.0.1"
55
55
  }
56
56
  },
57
57
  "peerDependencies": {
@@ -84,9 +84,9 @@
84
84
  "minimatch": "3.0.4",
85
85
  "enquirer": "~2.3.6",
86
86
  "tslib": "^2.3.0",
87
- "nx": "14.0.0-beta.4",
88
- "@nrwl/devkit": "14.0.0-beta.4",
89
- "@nrwl/jest": "14.0.0-beta.4",
90
- "@nrwl/linter": "14.0.0-beta.4"
87
+ "nx": "14.0.1",
88
+ "@nrwl/devkit": "14.0.1",
89
+ "@nrwl/jest": "14.0.1",
90
+ "@nrwl/linter": "14.0.1"
91
91
  }
92
92
  }
package/src/generators/library/files/lib/tsconfig.lib.json CHANGED
@@ -6,5 +6,5 @@
6
6
  "types": []
7
7
  },
8
8
  "include": ["**/*.ts"<% if (js) { %>, "**/*.js"<% } %>],
9
- "exclude": ["**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
9
+ "exclude": ["jest.config.ts","**/*.spec.ts"<% if (js) { %>, "**/*.spec.js"<% } %>]
10
10
  }
package/src/generators/move/lib/update-jest-config.js CHANGED
@@ -10,7 +10,7 @@ const path = require("path");
10
10
  * @param schema The options provided to the schematic
11
11
  */
12
12
  function updateJestConfig(tree, schema, project) {
13
- const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.js');
13
+ const jestConfigPath = path.join(schema.relativeToRootDestination, 'jest.config.ts');
14
14
  if (tree.exists(jestConfigPath)) {
15
15
  const oldContent = tree.read(jestConfigPath, 'utf-8');
16
16
  const findName = new RegExp(`'${schema.projectName}'`, 'g');
@@ -20,8 +20,8 @@ function updateJestConfig(tree, schema, project) {
20
20
  .replace(findDir, schema.relativeToRootDestination);
21
21
  tree.write(jestConfigPath, newContent);
22
22
  }
23
- // update root jest.config.js
24
- const rootJestConfigPath = '/jest.config.js';
23
+ // update root jest.config.ts
24
+ const rootJestConfigPath = '/jest.config.ts';
25
25
  if (!tree.exists(rootJestConfigPath)) {
26
26
  return;
27
27
  }
package/src/generators/move/lib/update-project-root-files.js CHANGED
@@ -4,6 +4,7 @@ exports.updateProjectRootFiles = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const path = require("path");
6
6
  const path_1 = require("path");
7
+ const allowedExt = ['.ts', '.js', '.json'];
7
8
  /**
8
9
  * Updates the files in the root of the project
9
10
  *
@@ -27,7 +28,8 @@ function updateProjectRootFiles(tree, schema, project) {
27
28
  const dots = /\./g;
28
29
  const regex = new RegExp(oldRelativeRoot.replace(dots, '\\.'), 'g');
29
30
  for (const file of tree.children(schema.relativeToRootDestination)) {
30
- if (!(0, path_1.extname)(file).startsWith('.js')) {
31
+ const ext = (0, path_1.extname)(file);
32
+ if (!allowedExt.includes(ext)) {
31
33
  continue;
32
34
  }
33
35
  if (file === '.eslintrc.json') {
package/src/generators/move/lib/update-project-root-files.js.map CHANGED
@@ -1 +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"}
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;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 ADDED
@@ -0,0 +1,9 @@
1
+ module.exports = {
2
+ projects: [
3
+ '<rootDir>/apps/my-app/',
4
+ '<rootDir>/apps/my-other-app',
5
+ '<rootDir>/libs/my-lib',
6
+ '<rootDir>/libs/my-other-lib/',
7
+ ],
8
+ };
9
+ //# sourceMappingURL=jest.config.js.map
package/src/generators/remove/lib/test-files/jest.config.js.map ADDED
@@ -0,0 +1 @@
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 CHANGED
@@ -6,39 +6,39 @@ const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nod
6
6
  const typescript_1 = require("typescript");
7
7
  const path_1 = require("path");
8
8
  function isUsingUtilityFunction(host) {
9
- return host.read('jest.config.js').toString().includes('getJestProjects()');
9
+ return host.read('jest.config.ts').toString().includes('getJestProjects()');
10
10
  }
11
11
  /**
12
12
  * Updates the root jest config projects array and removes the project.
13
13
  */
14
14
  function updateJestConfig(tree, schema, projectConfig) {
15
15
  const projectToRemove = schema.projectName;
16
- if (!tree.exists('jest.config.js') ||
17
- !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.js')) ||
16
+ if (!tree.exists('jest.config.ts') ||
17
+ !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
18
18
  isUsingUtilityFunction(tree)) {
19
19
  return;
20
20
  }
21
- const contents = tree.read('jest.config.js', 'utf-8');
22
- const sourceFile = (0, typescript_1.createSourceFile)('jest.config.js', contents, typescript_1.ScriptTarget.Latest);
21
+ const contents = tree.read('jest.config.ts', 'utf-8');
22
+ const sourceFile = (0, typescript_1.createSourceFile)('jest.config.ts', contents, typescript_1.ScriptTarget.Latest);
23
23
  const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
24
24
  const projectsAssignment = sourceNodes.find((node) => (0, typescript_1.isPropertyAssignment)(node) &&
25
25
  node.name.getText(sourceFile) === 'projects' &&
26
26
  (0, typescript_1.isArrayLiteralExpression)(node.initializer));
27
27
  if (!projectsAssignment) {
28
- throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.js. Please remove ${projectToRemove} from your projects.`);
28
+ throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
29
29
  }
30
30
  const projectsArray = projectsAssignment.initializer;
31
31
  const project = projectsArray.elements.find((item) => (0, typescript_1.isStringLiteral)(item) &&
32
32
  item.text.startsWith(`<rootDir>/${projectConfig.root}`));
33
33
  if (!project) {
34
- console.warn(`Could not find ${projectToRemove} in projects in /jest.config.js.`);
34
+ console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);
35
35
  return;
36
36
  }
37
37
  const previousProject = projectsArray.elements[projectsArray.elements.indexOf(project) - 1];
38
38
  const start = previousProject
39
39
  ? previousProject.getEnd()
40
40
  : project.getStart(sourceFile);
41
- tree.write('jest.config.js', (0, devkit_1.applyChangesToString)(contents, [
41
+ tree.write('jest.config.ts', (0, devkit_1.applyChangesToString)(contents, [
42
42
  {
43
43
  type: devkit_1.ChangeType.Delete,
44
44
  start,
package/src/utils/versions.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '14.0.0-beta.4';
4
+ exports.nxVersion = '14.0.1';
5
5
  exports.angularCliVersion = '~13.3.0';
6
6
  exports.typescriptVersion = '~4.6.2';
7
7
  exports.prettierVersion = '^2.5.1';