@nx/node 21.4.0-beta.5 → 21.4.0-beta.6

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 (5) hide show
  1. package/package.json +7 -7
  2. package/src/generators/application/application.d.ts.map +1 -1
  3. package/src/generators/application/application.js +2 -1
  4. package/src/generators/library/library.d.ts.map +1 -1
  5. package/src/generators/library/library.js +5 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/node",
3
- "version": "21.4.0-beta.5",
3
+ "version": "21.4.0-beta.6",
4
4
  "private": false,
5
5
  "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
6
6
  "repository": {
@@ -32,16 +32,16 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "tslib": "^2.3.0",
35
- "@nx/devkit": "21.4.0-beta.5",
36
- "@nx/jest": "21.4.0-beta.5",
37
- "@nx/js": "21.4.0-beta.5",
38
- "@nx/eslint": "21.4.0-beta.5",
39
- "@nx/docker": "21.4.0-beta.5",
35
+ "@nx/devkit": "21.4.0-beta.6",
36
+ "@nx/jest": "21.4.0-beta.6",
37
+ "@nx/js": "21.4.0-beta.6",
38
+ "@nx/eslint": "21.4.0-beta.6",
39
+ "@nx/docker": "21.4.0-beta.6",
40
40
  "tcp-port-used": "^1.0.2",
41
41
  "kill-port": "^1.6.1"
42
42
  },
43
43
  "devDependencies": {
44
- "nx": "21.4.0-beta.5"
44
+ "nx": "21.4.0-beta.6"
45
45
  },
46
46
  "publishConfig": {
47
47
  "access": "public"
package/src/generators/application/application.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAmL5E;AAED,eAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwL5E;AAED,eAAe,oBAAoB,CAAC"}
package/src/generators/application/application.js CHANGED
@@ -50,11 +50,12 @@ async function applicationGenerator(tree, schema) {
50
50
  }
51
51
  async function applicationGeneratorInternal(tree, schema) {
52
52
  const tasks = [];
53
+ const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
53
54
  const jsInitTask = await (0, js_1.initGenerator)(tree, {
54
55
  ...schema,
55
56
  tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
56
57
  skipFormat: true,
57
- addTsPlugin: schema.useTsSolution,
58
+ addTsPlugin,
58
59
  });
59
60
  tasks.push(jsInitTask);
60
61
  const options = await (0, lib_1.normalizeOptions)(tree, schema);
package/src/generators/library/library.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0ExE;AAED,eAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASlC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0ExE;AAED,eAAe,gBAAgB,CAAC"}
package/src/generators/library/library.js CHANGED
@@ -92,7 +92,11 @@ async function normalizeOptions(tree, options) {
92
92
  const parsedTags = options.tags
93
93
  ? options.tags.split(',').map((s) => s.trim())
94
94
  : [];
95
- const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
95
+ // this helper is called before the jsLibraryGenerator is called, so, if the
96
+ // TS solution setup is not configured, we additionally check if the TS
97
+ // solution setup will be configured by the jsLibraryGenerator
98
+ const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ||
99
+ (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, options.addPlugin);
96
100
  return {
97
101
  ...options,
98
102
  fileName,