@nrwl/js 15.8.0-beta.1 → 15.8.0-beta.3

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 (26) hide show
  1. package/migrations.json +14 -1
  2. package/package.json +4 -4
  3. package/src/executors/node/node.impl.js +16 -9
  4. package/src/executors/node/node.impl.js.map +1 -1
  5. package/src/generators/init/init.d.ts +2 -2
  6. package/src/generators/init/init.js +17 -7
  7. package/src/generators/init/init.js.map +1 -1
  8. package/src/generators/init/schema.d.ts +2 -0
  9. package/src/generators/init/schema.json +10 -1
  10. package/src/generators/library/library.js +9 -42
  11. package/src/generators/library/library.js.map +1 -1
  12. package/src/generators/library/schema.json +1 -1
  13. package/src/utils/assets/copy-assets-handler.d.ts +1 -1
  14. package/src/utils/package-json/update-package-json.d.ts +1 -1
  15. package/src/utils/schema.d.ts +1 -1
  16. package/src/utils/typescript/ensure-typescript.d.ts +1 -0
  17. package/src/utils/typescript/ensure-typescript.js +10 -0
  18. package/src/utils/typescript/ensure-typescript.js.map +1 -0
  19. package/src/utils/typescript/run-type-check.d.ts +2 -2
  20. package/src/utils/typescript/ts-config.d.ts +1 -2
  21. package/src/utils/typescript/ts-config.js +3 -10
  22. package/src/utils/typescript/ts-config.js.map +1 -1
  23. package/src/utils/typescript/types.d.ts +2 -2
  24. package/src/utils/versions.d.ts +1 -1
  25. package/src/utils/versions.js +1 -1
  26. /package/src/generators/init/files/{tsconfig.base.json → __fileName__} +0 -0
package/migrations.json CHANGED
@@ -31,5 +31,18 @@
31
31
  "factory": "./src/migrations/update-14-1-5/update-swcrc-path"
32
32
  }
33
33
  },
34
- "packageJsonUpdates": {}
34
+ "packageJsonUpdates": {
35
+ "15.8.0": {
36
+ "version": "15.8.0-beta.2",
37
+ "x-prompt": "Do you want to update to TypeScript v4.9?",
38
+ "requires": {
39
+ "typescript": ">=4.8.2 <4.9.0"
40
+ },
41
+ "packages": {
42
+ "typescript": {
43
+ "version": "~4.9.5"
44
+ }
45
+ }
46
+ }
47
+ }
35
48
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/js",
3
- "version": "15.8.0-beta.1",
3
+ "version": "15.8.0-beta.3",
4
4
  "private": false,
5
5
  "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
6
6
  "repository": {
@@ -39,8 +39,8 @@
39
39
  "@babel/preset-env": "^7.15.0",
40
40
  "@babel/preset-typescript": "^7.15.0",
41
41
  "@babel/runtime": "^7.14.8",
42
- "@nrwl/devkit": "15.8.0-beta.1",
43
- "@nrwl/workspace": "15.8.0-beta.1",
42
+ "@nrwl/devkit": "15.8.0-beta.3",
43
+ "@nrwl/workspace": "15.8.0-beta.3",
44
44
  "babel-plugin-const-enum": "^1.0.1",
45
45
  "babel-plugin-macros": "^2.8.0",
46
46
  "babel-plugin-transform-typescript-metadata": "^0.3.1",
@@ -58,5 +58,5 @@
58
58
  "access": "public"
59
59
  },
60
60
  "types": "./src/index.d.ts",
61
- "gitHead": "347d6dd92077b793139c77a7a6bd9baf7a1f975c"
61
+ "gitHead": "cbf33c478661e0c4f4795f9986a2357b641cc497"
62
62
  }
package/src/executors/node/node.impl.js CHANGED
@@ -14,7 +14,7 @@ const processMap = new Map();
14
14
  const hashedMap = new Map();
15
15
  function nodeExecutor(options, context) {
16
16
  return tslib_1.__asyncGenerator(this, arguments, function* nodeExecutor_1() {
17
- var e_1, _a;
17
+ var _a, e_1, _b, _c;
18
18
  const uniqueKey = (0, crypto_1.randomUUID)();
19
19
  process.on('SIGTERM', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
20
20
  yield killCurrentProcess(uniqueKey, options, 'SIGTERM');
@@ -38,20 +38,27 @@ function nodeExecutor(options, context) {
38
38
  }
39
39
  const mappings = calculateResolveMappings(context, options);
40
40
  try {
41
- for (var _b = tslib_1.__asyncValues(startBuild(options, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
42
- const event = _c.value;
43
- if (!event.success) {
44
- devkit_1.logger.error('There was an error with the build. See above.');
45
- devkit_1.logger.info(`${event.outfile} was not restarted.`);
41
+ for (var _d = true, _e = tslib_1.__asyncValues(startBuild(options, context)), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a;) {
42
+ _c = _f.value;
43
+ _d = false;
44
+ try {
45
+ const event = _c;
46
+ if (!event.success) {
47
+ devkit_1.logger.error('There was an error with the build. See above.');
48
+ devkit_1.logger.info(`${event.outfile} was not restarted.`);
49
+ }
50
+ yield tslib_1.__await(handleBuildEvent(uniqueKey, event, options, mappings));
51
+ yield yield tslib_1.__await(event);
52
+ }
53
+ finally {
54
+ _d = true;
46
55
  }
47
- yield tslib_1.__await(handleBuildEvent(uniqueKey, event, options, mappings));
48
- yield yield tslib_1.__await(event);
49
56
  }
50
57
  }
51
58
  catch (e_1_1) { e_1 = { error: e_1_1 }; }
52
59
  finally {
53
60
  try {
54
- if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
61
+ if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
55
62
  }
56
63
  finally { if (e_1) throw e_1.error; }
57
64
  }
package/src/executors/node/node.impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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"}
package/src/generators/init/init.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { Tree } from '@nrwl/devkit';
1
+ import { GeneratorCallback, Tree } from '@nrwl/devkit';
2
2
  import { InitSchema } from './schema';
3
- export declare function initGenerator(host: Tree, schema: InitSchema): Promise<void>;
3
+ export declare function initGenerator(tree: Tree, schema: InitSchema): Promise<GeneratorCallback>;
4
4
  export default initGenerator;
5
5
  export declare const initSchematic: (generatorOptions: InitSchema) => (tree: any, context: any) => Promise<any>;
package/src/generators/init/init.js CHANGED
@@ -5,18 +5,28 @@ const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
6
  const ts_config_1 = require("../../utils/typescript/ts-config");
7
7
  const versions_1 = require("../../utils/versions");
8
- function initGenerator(host, schema) {
8
+ function initGenerator(tree, schema) {
9
+ var _a;
9
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
- if (!schema.js) {
11
- (0, devkit_1.ensurePackage)(host, 'typescript', versions_1.typescriptVersion);
12
- }
13
11
  // add tsconfig.base.json
14
- if (!(0, ts_config_1.getRootTsConfigFileName)()) {
15
- (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), '.', {});
12
+ if (!(0, ts_config_1.getRootTsConfigFileName)(tree)) {
13
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), '.', {
14
+ fileName: (_a = schema.tsConfigName) !== null && _a !== void 0 ? _a : 'tsconfig.base.json',
15
+ });
16
+ }
17
+ const devDependencies = {
18
+ '@nrwl/js': versions_1.nxVersion,
19
+ };
20
+ if (!schema.js) {
21
+ devDependencies['typescript'] = versions_1.typescriptVersion;
16
22
  }
23
+ const installTask = !schema.skipPackageJson
24
+ ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies)
25
+ : () => { };
17
26
  if (!schema.skipFormat) {
18
- yield (0, devkit_1.formatFiles)(host);
27
+ yield (0, devkit_1.formatFiles)(tree);
19
28
  }
29
+ return installTask;
20
30
  });
21
31
  }
22
32
  exports.initGenerator = initGenerator;
package/src/generators/init/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,gEAA2E;AAC3E,mDAAyD;AAGzD,SAAsB,aAAa,CACjC,IAAU,EACV,MAAkB;;QAElB,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,IAAA,sBAAa,EAAC,IAAI,EAAE,YAAY,EAAE,4BAAiB,CAAC,CAAC;SACtD;QAED,yBAAyB;QACzB,IAAI,CAAC,IAAA,mCAAuB,GAAE,EAAE;YAC9B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SACvE;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAhBD,sCAgBC;AAED,kBAAe,aAAa,CAAC;AAEhB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,gEAA2E;AAC3E,mDAAoE;AAGpE,SAAsB,aAAa,CACjC,IAAU,EACV,MAAkB;;;QAElB,yBAAyB;QACzB,IAAI,CAAC,IAAA,mCAAuB,EAAC,IAAI,CAAC,EAAE;YAClC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE;gBAChE,QAAQ,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,oBAAoB;aACtD,CAAC,CAAC;SACJ;QACD,MAAM,eAAe,GAAG;YACtB,UAAU,EAAE,oBAAS;SACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,eAAe,CAAC,YAAY,CAAC,GAAG,4BAAiB,CAAC;SACnD;QAED,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,eAAe;YACzC,CAAC,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;YACzD,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QAEb,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;;CACpB;AA3BD,sCA2BC;AAED,kBAAe,aAAa,CAAC;AAEhB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
package/src/generators/init/schema.d.ts CHANGED
@@ -1,4 +1,6 @@
1
1
  export interface InitSchema {
2
2
  js?: boolean;
3
3
  skipFormat?: boolean;
4
+ skipPackageJson?: boolean;
5
+ tsConfigName?: string;
4
6
  }
package/src/generators/init/schema.json CHANGED
@@ -14,7 +14,16 @@
14
14
  "type": "boolean",
15
15
  "aliases": ["skip-format"],
16
16
  "description": "Skip formatting files.",
17
- "default": true,
17
+ "x-priority": "internal"
18
+ },
19
+ "skipPackageJson": {
20
+ "type": "boolean",
21
+ "description": "Skip adding package.json dependencies",
22
+ "x-priority": "internal"
23
+ },
24
+ "tsConfigName": {
25
+ "type": "string",
26
+ "description": "Customize the generated tsconfig file name.",
18
27
  "x-priority": "internal"
19
28
  }
20
29
  }
package/src/generators/library/library.js CHANGED
@@ -23,19 +23,14 @@ function libraryGenerator(tree, schema) {
23
23
  exports.libraryGenerator = libraryGenerator;
24
24
  function projectGenerator(tree, schema, destinationDir, filesDir) {
25
25
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
26
- yield (0, init_1.default)(tree, {
27
- js: schema.js,
28
- skipFormat: true,
29
- });
30
26
  const tasks = [];
27
+ tasks.push(yield (0, init_1.default)(tree, Object.assign(Object.assign({}, schema), { skipFormat: true })));
31
28
  const options = normalizeOptions(tree, schema, destinationDir);
32
29
  createFiles(tree, options, `${filesDir}/lib`);
33
30
  addProject(tree, options, destinationDir);
34
31
  tasks.push(addProjectDependencies(tree, options));
35
32
  if (options.bundler === 'vite') {
36
- (0, devkit_1.ensurePackage)(tree, '@nrwl/vite', versions_1.nxVersion);
37
- // nx-ignore-next-line
38
- const { viteConfigurationGenerator } = require('@nrwl/vite');
33
+ const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
39
34
  const viteTask = yield viteConfigurationGenerator(tree, {
40
35
  project: options.name,
41
36
  newProject: true,
@@ -45,7 +40,7 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
45
40
  });
46
41
  tasks.push(viteTask);
47
42
  }
48
- if (schema.bundler === 'webpack' || schema.bundler === 'rollup') {
43
+ if (schema.bundler === 'rollup') {
49
44
  ensureBabelRootConfigExists(tree);
50
45
  }
51
46
  if (options.linter !== 'none') {
@@ -62,9 +57,7 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
62
57
  else if (options.unitTestRunner === 'vitest' &&
63
58
  options.bundler !== 'vite' // Test would have been set up already
64
59
  ) {
65
- (0, devkit_1.ensurePackage)(tree, '@nrwl/vite', versions_1.nxVersion);
66
- // nx-ignore-next-line
67
- const { vitestGenerator } = require('@nrwl/vite');
60
+ const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
68
61
  const vitestTask = yield vitestGenerator(tree, {
69
62
  project: options.name,
70
63
  uiFramework: 'none',
@@ -101,10 +94,8 @@ function addProject(tree, options, destinationDir) {
101
94
  outputPath,
102
95
  main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
103
96
  tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
104
- // TODO(jack): assets for webpack and rollup have validation that we need to fix (assets must be under <project-root>/src)
105
- assets: options.bundler === 'webpack' || options.bundler === 'rollup'
106
- ? []
107
- : [`${options.projectRoot}/*.md`],
97
+ // TODO(jack): assets for rollup have validation that we need to fix (assets must be under <project-root>/src)
98
+ assets: options.bundler === 'rollup' ? [] : [`${options.projectRoot}/*.md`],
108
99
  },
109
100
  };
110
101
  if (options.compiler === 'swc' && options.skipTypeCheck) {
@@ -134,8 +125,7 @@ function addProject(tree, options, destinationDir) {
134
125
  }
135
126
  function addLint(tree, options) {
136
127
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
137
- (0, devkit_1.ensurePackage)(tree, '@nrwl/linter', versions_1.nxVersion);
138
- const { lintProjectGenerator } = require('@nrwl/linter');
128
+ const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/linter', versions_1.nxVersion);
139
129
  return lintProjectGenerator(tree, {
140
130
  project: options.name,
141
131
  linter: options.linter,
@@ -160,23 +150,6 @@ function updateTsConfig(tree, options) {
160
150
  return json;
161
151
  });
162
152
  }
163
- /**
164
- * Currently `@nrwl/js:library` TypeScript files can be compiled by most NX applications scaffolded via the Plugin system. However, `@nrwl/react:app` is an exception that due to its babel configuration, won't transpile external TypeScript files from packages/libs that do not contain a .babelrc.
165
- *
166
- * If a user doesn't explicitly set the flag, to prevent breaking the experience (they see the application failing, and they need to manually add the babelrc themselves), we want to detect whether they have the `@nrwl/web` plugin installed, and generate it automatically for them (even when they do not explicity request it).
167
- *
168
- * You can find more details on why this is necessary here:
169
- * https://github.com/nrwl/nx/pull/10055
170
- */
171
- function shouldAddBabelRc(tree, options) {
172
- if (typeof options.includeBabelRc === 'undefined') {
173
- const webPluginName = '@nrwl/web';
174
- const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
175
- const hasNxWebPlugin = Object.keys(packageJson.devDependencies).includes(webPluginName);
176
- return hasNxWebPlugin;
177
- }
178
- return options.includeBabelRc;
179
- }
180
153
  function addBabelRc(tree, options) {
181
154
  const filename = '.babelrc';
182
155
  const babelrc = {
@@ -193,7 +166,7 @@ function createFiles(tree, options, filesDir) {
193
166
  (0, add_swc_dependencies_1.addSwcDependencies)(tree);
194
167
  (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
195
168
  }
196
- else if (shouldAddBabelRc(tree, options)) {
169
+ else if (options.includeBabelRc) {
197
170
  addBabelRc(tree, options);
198
171
  }
199
172
  if (options.unitTestRunner === 'none') {
@@ -220,8 +193,7 @@ function createFiles(tree, options, filesDir) {
220
193
  }
221
194
  function addJest(tree, options) {
222
195
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
223
- (0, devkit_1.ensurePackage)(tree, '@nrwl/jest', versions_1.nxVersion);
224
- const { jestProjectGenerator } = require('@nrwl/jest');
196
+ const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
225
197
  return yield jestProjectGenerator(tree, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: false, skipSerializers: true, testEnvironment: options.testEnvironment, skipFormat: true, compiler: options.compiler }));
226
198
  });
227
199
  }
@@ -302,9 +274,6 @@ function addProjectDependencies(tree, options) {
302
274
  if (options.bundler == 'rollup') {
303
275
  return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/rollup': versions_1.nxVersion, '@types/node': versions_1.typesNodeVersion });
304
276
  }
305
- if (options.bundler == 'webpack') {
306
- return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/webpack': versions_1.nxVersion, '@types/node': versions_1.typesNodeVersion });
307
- }
308
277
  // noop
309
278
  return () => { };
310
279
  }
@@ -314,8 +283,6 @@ function getBuildExecutor(options) {
314
283
  return `@nrwl/esbuild:esbuild`;
315
284
  case 'rollup':
316
285
  return `@nrwl/rollup:rollup`;
317
- case 'webpack':
318
- return `@nrwl/webpack:webpack`;
319
286
  default:
320
287
  return `@nrwl/js:${options.compiler}`;
321
288
  }
package/src/generators/library/library.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"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"}
package/src/generators/library/schema.json CHANGED
@@ -113,7 +113,7 @@
113
113
  "bundler": {
114
114
  "description": "The bundler to use.",
115
115
  "type": "string",
116
- "enum": ["none", "esbuild", "rollup", "vite", "webpack"],
116
+ "enum": ["none", "esbuild", "rollup", "vite"],
117
117
  "default": "none",
118
118
  "x-priority": "important"
119
119
  },
package/src/utils/assets/copy-assets-handler.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { AssetGlob } from '@nrwl/workspace/src/utilities/assets';
2
- export declare type FileEventType = 'create' | 'update' | 'delete';
2
+ export type FileEventType = 'create' | 'update' | 'delete';
3
3
  export interface FileEvent {
4
4
  type: FileEventType;
5
5
  src: string;
package/src/utils/package-json/update-package-json.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
2
2
  import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
3
3
  import type { PackageJson } from 'nx/src/utils/package-json';
4
- export declare type SupportedFormat = 'cjs' | 'esm';
4
+ export type SupportedFormat = 'cjs' | 'esm';
5
5
  export interface UpdatePackageJsonOption {
6
6
  projectRoot: string;
7
7
  main: string;
package/src/utils/schema.d.ts CHANGED
@@ -7,7 +7,7 @@ import type {
7
7
  import { TransformerEntry } from './typescript/types';
8
8
 
9
9
  export type Compiler = 'tsc' | 'swc';
10
- export type Bundler = 'none' | 'rollup' | 'esbuild' | 'vite' | 'webpack';
10
+ export type Bundler = 'none' | 'rollup' | 'esbuild' | 'vite';
11
11
 
12
12
  export interface LibraryGeneratorSchema {
13
13
  name: string;
package/src/utils/typescript/ensure-typescript.d.ts ADDED
@@ -0,0 +1 @@
1
+ export declare function ensureTypescript(): typeof import("typescript");
package/src/utils/typescript/ensure-typescript.js ADDED
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ensureTypescript = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const versions_1 = require("../versions");
6
+ function ensureTypescript() {
7
+ return (0, devkit_1.ensurePackage)('typescript', versions_1.typescriptVersion);
8
+ }
9
+ exports.ensureTypescript = ensureTypescript;
10
+ //# sourceMappingURL=ensure-typescript.js.map
package/src/utils/typescript/ensure-typescript.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ensure-typescript.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ensure-typescript.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAC7C,0CAAgD;AAEhD,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,sBAAa,EAClB,YAAY,EACZ,4BAAiB,CAClB,CAAC;AACJ,CAAC;AALD,4CAKC"}
package/src/utils/typescript/run-type-check.d.ts CHANGED
@@ -6,7 +6,7 @@ export interface TypeCheckResult {
6
6
  totalFilesCount: number;
7
7
  incremental: boolean;
8
8
  }
9
- export declare type TypeCheckOptions = BaseTypeCheckOptions & Mode;
9
+ export type TypeCheckOptions = BaseTypeCheckOptions & Mode;
10
10
  interface BaseTypeCheckOptions {
11
11
  workspaceRoot: string;
12
12
  tsConfigPath: string;
@@ -14,7 +14,7 @@ interface BaseTypeCheckOptions {
14
14
  incremental?: boolean;
15
15
  rootDir?: string;
16
16
  }
17
- declare type Mode = NoEmitMode | EmitDeclarationOnlyMode;
17
+ type Mode = NoEmitMode | EmitDeclarationOnlyMode;
18
18
  interface NoEmitMode {
19
19
  mode: 'noEmit';
20
20
  }
package/src/utils/typescript/ts-config.d.ts CHANGED
@@ -2,8 +2,7 @@ import { Tree } from '@nrwl/devkit';
2
2
  export declare function readTsConfig(tsConfigPath: string): import("typescript").ParsedCommandLine;
3
3
  export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
4
4
  export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
5
- export declare function getRootTsConfigFileName(): string | null;
6
- export declare function getRootTsConfigPath(): string | null;
5
+ export declare function getRootTsConfigFileName(tree: Tree): string | null;
7
6
  export declare function updateRootTsConfig(host: Tree, options: {
8
7
  name: string;
9
8
  importPath?: string;
package/src/utils/typescript/ts-config.js CHANGED
@@ -1,8 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateRootTsConfig = exports.getRootTsConfigPath = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
3
+ exports.updateRootTsConfig = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
- const fs_1 = require("fs");
6
5
  const path_1 = require("path");
7
6
  let tsModule;
8
7
  function readTsConfig(tsConfigPath) {
@@ -26,21 +25,15 @@ function getRelativePathToRootTsConfig(tree, targetPath) {
26
25
  return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
27
26
  }
28
27
  exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
29
- function getRootTsConfigFileName() {
28
+ function getRootTsConfigFileName(tree) {
30
29
  for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
31
- const tsConfigPath = (0, path_1.join)(devkit_1.workspaceRoot, tsConfigName);
32
- if ((0, fs_1.existsSync)(tsConfigPath)) {
30
+ if (tree.exists(tsConfigName)) {
33
31
  return tsConfigName;
34
32
  }
35
33
  }
36
34
  return null;
37
35
  }
38
36
  exports.getRootTsConfigFileName = getRootTsConfigFileName;
39
- function getRootTsConfigPath() {
40
- const tsConfigFileName = getRootTsConfigFileName();
41
- return tsConfigFileName ? (0, path_1.join)(devkit_1.workspaceRoot, tsConfigFileName) : null;
42
- }
43
- exports.getRootTsConfigPath = getRootTsConfigPath;
44
37
  function updateRootTsConfig(host, options) {
45
38
  if (!options.importPath) {
46
39
  throw new Error(`Unable to update ${options.name} using the import path "${options.importPath}". Make sure to specify a valid import path one.`);
package/src/utils/typescript/ts-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,2BAAgC;AAChC,+BAAqC;AAErC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB;IACrC,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;QACvD,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;YAC5B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0DASC;AAED,SAAgB,mBAAmB;IACjC,MAAM,gBAAgB,GAAG,uBAAuB,EAAE,CAAC;IAEnD,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACzE,CAAC;AAJD,kDAIC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAKC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,IAAI,2BAA2B,OAAO,CAAC,UAAU,kDAAkD,CAChI,CAAC;KACH;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,gDAmCC"}
1
+ {"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/ts-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAEtB,+BAAqC;AAErC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;KAClC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU;IAChD,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,0DAQC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAKC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,IAAI,2BAA2B,OAAO,CAAC,UAAU,kDAAkD,CAChI,CAAC;KACH;IACD,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACtC;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,gDAmCC"}
package/src/utils/typescript/types.d.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import type { CustomTransformerFactory, Node, Program, TransformerFactory as TypescriptTransformerFactory } from 'typescript';
2
- declare type TransformerFactory = TypescriptTransformerFactory<Node> | CustomTransformerFactory;
2
+ type TransformerFactory = TypescriptTransformerFactory<Node> | CustomTransformerFactory;
3
3
  export interface TransformerPlugin {
4
4
  name: string;
5
5
  options: Record<string, unknown>;
6
6
  }
7
- export declare type TransformerEntry = string | TransformerPlugin;
7
+ export type TransformerEntry = string | TransformerPlugin;
8
8
  export interface CompilerPlugin {
9
9
  before?: (options?: Record<string, unknown>, program?: Program) => TransformerFactory;
10
10
  after?: (options?: Record<string, unknown>, program?: Program) => TransformerFactory;
package/src/utils/versions.d.ts CHANGED
@@ -4,4 +4,4 @@ export declare const esbuildVersion = "^0.17.5";
4
4
  export declare const swcCliVersion = "~0.1.55";
5
5
  export declare const swcHelpersVersion = "~0.4.11";
6
6
  export declare const typesNodeVersion = "18.7.1";
7
- export declare const typescriptVersion = "~4.8.2";
7
+ export declare const typescriptVersion = "~4.9.5";
package/src/utils/versions.js CHANGED
@@ -8,5 +8,5 @@ exports.esbuildVersion = '^0.17.5';
8
8
  exports.swcCliVersion = '~0.1.55';
9
9
  exports.swcHelpersVersion = '~0.4.11';
10
10
  exports.typesNodeVersion = '18.7.1';
11
- exports.typescriptVersion = '~4.8.2';
11
+ exports.typescriptVersion = '~4.9.5';
12
12
  //# sourceMappingURL=versions.js.map