@nrwl/workspace 14.1.7 → 14.1.8-beta.2

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 (11) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/package.json +35 -34
  3. package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +2 -2
  4. package/src/generators/move/lib/update-storybook-config.d.ts +3 -1
  5. package/src/generators/move/lib/update-storybook-config.js +17 -6
  6. package/src/generators/move/lib/update-storybook-config.js.map +1 -1
  7. package/src/generators/workspace-generator/workspace-generator.js +3 -0
  8. package/src/generators/workspace-generator/workspace-generator.js.map +1 -1
  9. package/src/utils/versions.d.ts +1 -1
  10. package/src/utils/versions.js +1 -1
  11. package/src/utils/versions.js.map +1 -1
package/CHANGELOG.md ADDED
@@ -0,0 +1,8 @@
1
+ # Change Log
2
+
3
+ All notable changes to this project will be documented in this file.
4
+ See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
+
6
+ ## [14.1.8-beta.2](https://github.com/nrwl/nx/compare/14.1.5...14.1.8-beta.2) (2022-05-20)
7
+
8
+ **Note:** Version bump only for package @nrwl/workspace
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "14.1.7",
3
+ "version": "14.1.8-beta.2",
4
4
  "description": "Smart, Fast and Extensible Build System.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,27 +32,27 @@
32
32
  "requirements": {},
33
33
  "migrations": "./migrations.json",
34
34
  "packageGroup": {
35
- "@nrwl/angular": "14.1.7",
36
- "@nrwl/cypress": "14.1.7",
37
- "@nrwl/devkit": "14.1.7",
38
- "@nrwl/eslint-plugin-nx": "14.1.7",
39
- "@nrwl/express": "14.1.7",
40
- "@nrwl/jest": "14.1.7",
41
- "@nrwl/linter": "14.1.7",
42
- "@nrwl/nest": "14.1.7",
43
- "@nrwl/next": "14.1.7",
44
- "@nrwl/node": "14.1.7",
45
- "@nrwl/nx-plugin": "14.1.7",
46
- "@nrwl/react": "14.1.7",
47
- "@nrwl/storybook": "14.1.7",
48
- "@nrwl/web": "14.1.7",
49
- "@nrwl/js": "14.1.7",
50
- "@nrwl/cli": "14.1.7",
51
- "@nrwl/tao": "14.1.7",
35
+ "@nrwl/angular": "file:../angular",
36
+ "@nrwl/cypress": "file:../cypress",
37
+ "@nrwl/devkit": "file:../devkit",
38
+ "@nrwl/eslint-plugin-nx": "file:../eslint-plugin-nx",
39
+ "@nrwl/express": "file:../express",
40
+ "@nrwl/jest": "file:../jest",
41
+ "@nrwl/linter": "file:../linter",
42
+ "@nrwl/nest": "file:../nest",
43
+ "@nrwl/next": "file:../next",
44
+ "@nrwl/node": "file:../node",
45
+ "@nrwl/nx-plugin": "file:../nx-plugin",
46
+ "@nrwl/react": "file:../react",
47
+ "@nrwl/storybook": "file:../storybook",
48
+ "@nrwl/web": "file:../web",
49
+ "@nrwl/js": "file:../js",
50
+ "@nrwl/cli": "file:../cli",
51
+ "@nrwl/tao": "file:../tao",
52
52
  "@nrwl/nx-cloud": "latest",
53
- "@nrwl/react-native": "14.1.7",
54
- "@nrwl/detox": "14.1.7",
55
- "nx": "14.1.7"
53
+ "@nrwl/react-native": "file:../react-native",
54
+ "@nrwl/detox": "file:../detox",
55
+ "nx": "file:../nx"
56
56
  }
57
57
  },
58
58
  "peerDependencies": {
@@ -64,30 +64,31 @@
64
64
  }
65
65
  },
66
66
  "dependencies": {
67
+ "@nrwl/devkit": "14.1.8-beta.2",
68
+ "@nrwl/jest": "14.1.8-beta.2",
69
+ "@nrwl/linter": "14.1.8-beta.2",
67
70
  "@parcel/watcher": "2.0.4",
68
- "@nrwl/devkit": "14.1.7",
71
+ "chalk": "4.1.0",
69
72
  "chokidar": "^3.5.1",
70
73
  "cli-cursor": "3.1.0",
71
74
  "cli-spinners": "2.6.1",
72
- "fs-extra": "^10.1.0",
73
75
  "dotenv": "~10.0.0",
76
+ "enquirer": "~2.3.6",
74
77
  "figures": "3.2.0",
78
+ "flat": "^5.0.2",
79
+ "fs-extra": "^10.1.0",
75
80
  "glob": "7.1.4",
76
81
  "ignore": "^5.0.4",
82
+ "minimatch": "3.0.4",
77
83
  "npm-run-path": "^4.0.1",
84
+ "nx": "14.1.8-beta.2",
78
85
  "open": "^8.4.0",
79
86
  "rxjs": "^6.5.4",
80
87
  "semver": "7.3.4",
81
88
  "tmp": "~0.2.1",
82
- "yargs": "^17.4.0",
83
- "yargs-parser": "21.0.1",
84
- "chalk": "4.1.0",
85
- "flat": "^5.0.2",
86
- "minimatch": "3.0.4",
87
- "enquirer": "~2.3.6",
88
89
  "tslib": "^2.3.0",
89
- "nx": "14.1.7",
90
- "@nrwl/jest": "14.1.7",
91
- "@nrwl/linter": "14.1.7"
92
- }
93
- }
90
+ "yargs": "^17.4.0",
91
+ "yargs-parser": "21.0.1"
92
+ },
93
+ "gitHead": "124fd7d206eef69c73f8aca93efc2604cc682357"
94
+ }
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ CHANGED
@@ -9,7 +9,7 @@ on:
9
9
  jobs:
10
10
  main:
11
11
  name: Nx Cloud - Main Job
12
- uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.2
12
+ uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.4
13
13
  with:
14
14
  parallel-commands: |
15
15
  <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
@@ -21,6 +21,6 @@ jobs:
21
21
 
22
22
  agents:
23
23
  name: Nx Cloud - Agents
24
- uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.2
24
+ uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.4
25
25
  with:
26
26
  number-of-agents: 3
package/src/generators/move/lib/update-storybook-config.d.ts CHANGED
@@ -3,6 +3,8 @@ import { NormalizedSchema } from '../schema';
3
3
  /**
4
4
  * Updates relative path to root storybook config for `main.js` & `webpack.config.js`
5
5
  *
6
- * @param schema The options provided to the schematic
6
+ * @param {Tree} tree
7
+ * @param {NormalizedSchema} schema The options provided to the schematic
8
+ * @param {ProjectConfiguration} project
7
9
  */
8
10
  export declare function updateStorybookConfig(tree: Tree, schema: NormalizedSchema, project: ProjectConfiguration): void;
package/src/generators/move/lib/update-storybook-config.js CHANGED
@@ -7,7 +7,9 @@ const path_1 = require("path");
7
7
  /**
8
8
  * Updates relative path to root storybook config for `main.js` & `webpack.config.js`
9
9
  *
10
- * @param schema The options provided to the schematic
10
+ * @param {Tree} tree
11
+ * @param {NormalizedSchema} schema The options provided to the schematic
12
+ * @param {ProjectConfiguration} project
11
13
  */
12
14
  function updateStorybookConfig(tree, schema, project) {
13
15
  const oldRelativeRoot = path
@@ -23,11 +25,20 @@ function updateStorybookConfig(tree, schema, project) {
23
25
  return;
24
26
  }
25
27
  // Replace relative import path to root storybook folder for each file under project storybook
26
- for (const file of tree.children(storybookDir)) {
27
- const oldContent = tree.read((0, path_1.join)(storybookDir, file), 'utf-8');
28
- const newContent = oldContent.replace(oldRelativeRoot, newRelativeRoot);
29
- tree.write((0, path_1.join)(storybookDir, file), newContent);
30
- }
28
+ updateRecursively(tree, storybookDir, oldRelativeRoot, newRelativeRoot);
31
29
  }
32
30
  exports.updateStorybookConfig = updateStorybookConfig;
31
+ function updateRecursively(tree, dir, oldRoot, newRoot) {
32
+ for (const child of tree.children(dir)) {
33
+ const childPath = (0, path_1.join)(dir, child);
34
+ if (tree.isFile(childPath)) {
35
+ const oldContent = tree.read(childPath, 'utf-8');
36
+ const newContent = oldContent.replace(oldRoot, newRoot);
37
+ tree.write(childPath, newContent);
38
+ }
39
+ else {
40
+ updateRecursively(tree, childPath, oldRoot, newRoot);
41
+ }
42
+ }
43
+ }
33
44
  //# sourceMappingURL=update-storybook-config.js.map
package/src/generators/move/lib/update-storybook-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-storybook-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-storybook-config.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAA4B;AAG5B;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,EACtD,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CACP,sBAAa,EACb,GAAG,MAAM,CAAC,yBAAyB,aAAa,CACjD,EACD,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,MAAM,CAAC,yBAAyB,EAChC,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,8FAA8F;IAC9F,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAExE,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KAClD;AACH,CAAC;AAvCD,sDAuCC"}
1
+ {"version":3,"file":"update-storybook-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-storybook-config.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAA4B;AAG5B;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,GAAG,OAAO,CAAC,IAAI,aAAa,CAAC,EACtD,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CACP,sBAAa,EACb,GAAG,MAAM,CAAC,yBAAyB,aAAa,CACjD,EACD,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC5B,MAAM,CAAC,yBAAyB,EAChC,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,8FAA8F;IAC9F,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;AAC1E,CAAC;AAlCD,sDAkCC;AAED,SAAS,iBAAiB,CACxB,IAAU,EACV,GAAW,EACX,OAAe,EACf,OAAe;IAEf,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtC,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEnC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;SACnC;aAAM;YACL,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SACtD;KACF;AACH,CAAC"}
package/src/generators/workspace-generator/workspace-generator.js CHANGED
@@ -9,6 +9,9 @@ function default_1(host, schema) {
9
9
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)('tools/generators', schema.name), options);
10
10
  const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
11
11
  '@nrwl/devkit': versions_1.nxVersion,
12
+ // types/node is neccessary for pnpm since it's used in tsconfig and transitive
13
+ // dependencies are not resolved correctly
14
+ '@types/node': 'latest',
12
15
  });
13
16
  if (!schema.skipFormat) {
14
17
  yield (0, devkit_1.formatFiles)(host);
package/src/generators/workspace-generator/workspace-generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAAiD;AAEjD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,EAClD,OAAO,CACR,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,EAAE,EACF;YACE,cAAc,EAAE,oBAAS;SAC1B,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAtBD,4BAsBC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,uCAAY,OAAO,KAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAG;AACxC,CAAC"}
1
+ {"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAAiD;AAEjD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,EAClD,OAAO,CACR,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,EAAE,EACF;YACE,cAAc,EAAE,oBAAS;YACzB,+EAA+E;YAC/E,0CAA0C;YAC1C,aAAa,EAAE,QAAQ;SACxB,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAzBD,4BAyBC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,uCAAY,OAAO,KAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAG;AACxC,CAAC"}
package/src/utils/versions.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const nxVersion = "*";
1
+ export declare const nxVersion: any;
2
2
  export declare const angularCliVersion = "~13.3.0";
3
3
  export declare const typescriptVersion = "~4.6.2";
4
4
  export declare const prettierVersion = "^2.5.1";
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.1.7';
4
+ exports.nxVersion = require('../../package.json').version;
5
5
  exports.angularCliVersion = '~13.3.0';
6
6
  exports.typescriptVersion = '~4.6.2';
7
7
  exports.prettierVersion = '^2.5.1';
package/src/utils/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,2BAA2B,GAAG,OAAO,CAAC"}