@nrwl/js 15.0.0-beta.2 → 15.0.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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [15.0.0-beta.2](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.2) (2022-10-11)
6
+ # [15.0.0-beta.3](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.3) (2022-10-11)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/js
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/js",
3
- "version": "15.0.0-beta.2",
3
+ "version": "15.0.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": {
@@ -32,10 +32,10 @@
32
32
  "executors": "./executors.json",
33
33
  "builders": "./executors.json",
34
34
  "dependencies": {
35
- "@nrwl/devkit": "15.0.0-beta.2",
36
- "@nrwl/jest": "15.0.0-beta.2",
37
- "@nrwl/linter": "15.0.0-beta.2",
38
- "@nrwl/workspace": "15.0.0-beta.2",
35
+ "@nrwl/devkit": "15.0.0-beta.3",
36
+ "@nrwl/jest": "15.0.0-beta.3",
37
+ "@nrwl/linter": "15.0.0-beta.3",
38
+ "@nrwl/workspace": "15.0.0-beta.3",
39
39
  "@parcel/watcher": "2.0.4",
40
40
  "chalk": "4.1.0",
41
41
  "fast-glob": "3.2.7",
@@ -50,5 +50,5 @@
50
50
  "access": "public"
51
51
  },
52
52
  "types": "./src/index.d.ts",
53
- "gitHead": "66a086413b95691f5c3859dac6879ccba0404531"
53
+ "gitHead": "834e2db7cb7bf9e075da45fe0334fc872bd35358"
54
54
  }
@@ -3,8 +3,5 @@ import type { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities
3
3
  import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
4
4
  export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot: string, projectRoot: string): NormalizedExecutorOptions;
5
5
  export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
6
- export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<{
7
- success: boolean;
8
- outfile: string;
9
- }, any, undefined>;
6
+ export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
10
7
  export default tscExecutor;
@@ -76,26 +76,29 @@ function tscExecutor(_options, context) {
76
76
  outputDir: _options.outputPath,
77
77
  assets: _options.assets,
78
78
  });
79
- if (options.watch) {
80
- const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
81
- const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)((0, path_1.join)(context.root, projectRoot), 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
82
- const handleTermination = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
83
- yield disposeWatchAssetChanges();
84
- yield disposePackageJsonChanges();
85
- });
86
- process.on('SIGINT', () => handleTermination());
87
- process.on('SIGTERM', () => handleTermination());
88
- }
89
79
  const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
90
80
  const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
91
81
  if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
92
82
  tsCompilationOptions.rootDir = '.';
93
83
  }
94
- return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
84
+ const typescriptCompilation = (0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
95
85
  yield assetHandler.processAllAssetsOnce();
96
86
  (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
97
87
  (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
98
- }))))));
88
+ }));
89
+ if (options.watch) {
90
+ const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
91
+ const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)((0, path_1.join)(context.root, projectRoot), 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
92
+ const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
93
+ yield disposeWatchAssetChanges();
94
+ yield disposePackageJsonChanges();
95
+ yield typescriptCompilation.close();
96
+ process.exit(exitCode);
97
+ });
98
+ process.on('SIGINT', () => handleTermination(128 + 2));
99
+ process.on('SIGTERM', () => handleTermination(128 + 15));
100
+ }
101
+ return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(typescriptCompilation.iterator))));
99
102
  });
100
103
  }
101
104
  exports.tscExecutor = tscExecutor;
@@ -1 +1 @@
1
- {"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAG8C;AAE9C,+BAAqC;AAOrC,gFAA2E;AAC3E,uEAAmE;AACnE,uFAGgD;AAChD,+CAI4B;AAC5B,sFAAiF;AAEjF,8FAAyF;AACzF,sFAAiF;AACjF,6FAAsF;AAEtF,SAAgB,gBAAgB,CAC9B,OAAwB,EACxB,WAAmB,EACnB,UAAkB,EAClB,WAAmB;IAEnB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC;QACpC,CAAC,CAAC,WAAW,CAAC;IAEhB,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;QACzB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAED,oDAAoD;IACpD,kCAAkC;IAClC,8BAA8B;IAC9B,iFAAiF;IACjF,+BAA+B;IAC/B,IAAI;IAEJ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,MAAM,EAAE;YAC/C,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;SAC9B;KACF;IAED,MAAM,KAAK,GAAsB,IAAA,0BAAiB,EAChD,OAAO,CAAC,MAAM,EACd,WAAW,EACX,UAAU,CACX,CAAC;IAEF,uCACK,OAAO,KACV,IAAI,EAAE,WAAW,EACjB,UAAU;QACV,WAAW;QACX,KAAK;QACL,UAAU,EACV,QAAQ,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,EACP,cAAc,EAAE,IAAA,cAAO,EACrB,UAAU,EACV,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAClE,IACD;AACJ,CAAC;AAjDD,4CAiDC;AAED,SAAgB,kCAAkC,CAChD,iBAA4C,EAC5C,OAAwB;IAExB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,yCAAkB,EAChD,iBAAiB,CAAC,YAAY,CAC/B,CAAC;IACF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAsB,EAAE,CAAC,CAAC;QACvE,MAAM,EAAE,mBAAmB,CAAC,WAAW,CAAC,GAAG,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;QACD,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,GAAG,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;QACD,iBAAiB,EAAE,mBAAmB,CAAC,sBAAsB,CAAC,GAAG,CAC/D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;KACF,CAAC,CAAC;IAEH,OAAO;QACL,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,iBAAiB,CAAC,WAAW;QAC1C,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;QACpC,KAAK,EAAE,iBAAiB,CAAC,KAAK;QAC9B,gBAAgB,EAAE,iBAAiB,CAAC,KAAK;QACzC,qBAAqB;KACtB,CAAC;AACJ,CAAC;AA7BD,gFA6BC;AAED,SAAuB,WAAW,CAChC,QAAyB,EACzB,OAAwB;;QAExB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC7E,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE3E,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,sCAAiB,EAC1E,OAAO,EACP,QAAQ,CAAC,QAAQ,CAClB,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC;SAChC;QAED,MAAM,eAAe,GAAG,IAAA,gDAAmB,EACzC,6CAAgB,CAAC,GAAG,EACpB,OAAO,CAAC,QAAQ,EAChB,YAAY,EACZ,OAAO,CAAC,YAAY,CACrB,CAAC;QAEF,IAAI,eAAe,EAAE;YACnB,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACpC;QAED,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC;YACzC,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,SAAS,EAAE,QAAQ,CAAC,UAAU;YAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;SACxB,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,kCAAkC,CAC7D,OAAO,EACP,OAAO,CACR,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAA,4BAAmB,EAC5C,OAAO,EACP,OAAO,EACP,oBAAoB,CAAC,QAAQ,CAC9B,CAAC;QAEF,IAAI,CAAC,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,EAAE;YAC3C,oBAAoB,CAAC,OAAO,GAAG,GAAG,CAAC;SACpC;QAED,MAAM,qBAAqB,GAAG,IAAA,iDAAsB,EAClD,OAAO,EACP,oBAAoB,EACpB,GAAS,EAAE;YACT,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;YAC1C,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,IAAA,uCAA8B,EAC5B,oBAAoB,CAAC,UAAU,EAC/B,oBAAoB,CAAC,WAAW,EAChC,kBAAkB,CACnB,CAAC;QACJ,CAAC,CAAA,CACF,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,wBAAwB,GAC5B,sBAAM,YAAY,CAAC,4BAA4B,EAAE,CAAA,CAAC;YACpD,MAAM,yBAAyB,GAAG,sBAAM,IAAA,yDAAyB,EAC/D,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC/B,cAAc,EACd,GAAG,EAAE,CAAC,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChE,CAAA,CAAC;YACF,MAAM,iBAAiB,GAAG,CAAO,QAAgB,EAAE,EAAE;gBACnD,MAAM,wBAAwB,EAAE,CAAC;gBACjC,MAAM,yBAAyB,EAAE,CAAC;gBAClC,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,CAAC,CAAA,CAAC;YACF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACvD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;SAC1D;QAED,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,qBAAqB,CAAC,QAAQ,CAAA,CAAA,CAAA,EAAC;IAC/C,CAAC;CAAA;AAlFD,kCAkFC;AAED,kBAAe,WAAW,CAAC"}
@@ -15,5 +15,4 @@ export interface InlineProjectGraph {
15
15
  export declare function isInlineGraphEmpty(inlineGraph: InlineProjectGraph): boolean;
16
16
  export declare function handleInliningBuild(context: ExecutorContext, options: NormalizedExecutorOptions, tsConfigPath: string): InlineProjectGraph;
17
17
  export declare function postProcessInlinedDependencies(outputPath: string, parentOutputPath: string, inlineGraph: InlineProjectGraph): void;
18
- export declare function movePackage(from: string, to: string): void;
19
18
  export {};
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.movePackage = exports.postProcessInlinedDependencies = exports.handleInliningBuild = exports.isInlineGraphEmpty = void 0;
3
+ exports.postProcessInlinedDependencies = exports.handleInliningBuild = exports.isInlineGraphEmpty = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const fs_extra_1 = require("fs-extra");
6
6
  const path_1 = require("path");
@@ -34,7 +34,16 @@ function postProcessInlinedDependencies(outputPath, parentOutputPath, inlineGrap
34
34
  const depOutputPath = inlineDependency.buildOutputPath ||
35
35
  (0, path_1.join)(outputPath, inlineDependency.root);
36
36
  const destDepOutputPath = (0, path_1.join)(outputPath, inlineDependency.name);
37
- movePackage(depOutputPath, destDepOutputPath);
37
+ const isBuildable = !!inlineDependency.buildOutputPath;
38
+ if (isBuildable) {
39
+ (0, fs_extra_1.copySync)(depOutputPath, destDepOutputPath, {
40
+ overwrite: true,
41
+ recursive: true,
42
+ });
43
+ }
44
+ else {
45
+ movePackage(depOutputPath, destDepOutputPath);
46
+ }
38
47
  // TODO: hard-coded "src"
39
48
  inlinedDepsDestOutputRecord[inlineDependency.pathAlias] =
40
49
  destDepOutputPath + '/src';
@@ -142,7 +151,6 @@ function movePackage(from, to) {
142
151
  (0, fs_extra_1.copySync)(from, to, { overwrite: true, recursive: true });
143
152
  (0, fs_extra_1.removeSync)(from);
144
153
  }
145
- exports.movePackage = movePackage;
146
154
  function updateImports(destOutputPath, inlinedDepsDestOutputRecord) {
147
155
  const importRegex = new RegExp(Object.keys(inlinedDepsDestOutputRecord)
148
156
  .map((pathAlias) => `["'](${pathAlias})["']`)
@@ -179,10 +187,11 @@ function getPathAliasForPackage(packageNode, pathAliases) {
179
187
  return '';
180
188
  }
181
189
  function getBuildOutputPath(projectName, context, options) {
182
- var _a;
183
- const buildTarget = options.externalBuildTargets.find((buildTarget) => { var _a, _b, _c; return (_c = (_b = (_a = context.projectGraph.nodes[projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets) === null || _c === void 0 ? void 0 : _c[buildTarget]; });
184
- if (buildTarget)
185
- return (_a = context.projectGraph.nodes[projectName].data.targets) === null || _a === void 0 ? void 0 : _a[buildTarget].options['outputPath'];
186
- return '';
190
+ var _a, _b;
191
+ const projectTargets = (_b = (_a = context.projectGraph.nodes[projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets;
192
+ if (!projectTargets)
193
+ return '';
194
+ const buildTarget = options.externalBuildTargets.find((buildTarget) => projectTargets[buildTarget]);
195
+ return buildTarget ? projectTargets[buildTarget].options['outputPath'] : '';
187
196
  }
188
197
  //# sourceMappingURL=inline.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/inline.ts"],"names":[],"mappings":";;;AACA,yCAA4C;AAC5C,uCAMkB;AAClB,+BAAsC;AAiBtC,SAAgB,kBAAkB,CAAC,WAA+B;IAChE,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACrD,CAAC;AAFD,gDAEC;AAED,SAAgB,mBAAmB,CACjC,OAAwB,EACxB,OAAkC,EAClC,YAAoB;IAEpB,MAAM,YAAY,GAAG,IAAA,qBAAY,EAAC,YAAY,CAAC,CAAC;IAChD,MAAM,WAAW,GACf,YAAY,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAErE,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACnC,OAAO,WAAW,CAAC;KACpB;IAED,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE7D,OAAO,WAAW,CAAC;AACrB,CAAC;AAjBD,kDAiBC;AAED,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,gBAAwB,EACxB,WAA+B;IAE/B,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE;QACnC,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE1D,oBAAoB;IACpB,WAAW,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAExC,MAAM,2BAA2B,GAA2B,EAAE,CAAC;IAC/D,uBAAuB;IAEvB,KAAK,MAAM,uBAAuB,IAAI,MAAM,CAAC,MAAM,CACjD,WAAW,CAAC,YAAY,CACzB,EAAE;QACD,KAAK,MAAM,sBAAsB,IAAI,uBAAuB,EAAE;YAC5D,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACnE,MAAM,aAAa,GACjB,gBAAgB,CAAC,eAAe;gBAChC,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClE,WAAW,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAE9C,yBAAyB;YACzB,2BAA2B,CAAC,gBAAgB,CAAC,SAAS,CAAC;gBACrD,iBAAiB,GAAG,MAAM,CAAC;SAC9B;KACF;IAED,aAAa,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;AACzD,CAAC;AAnCD,wEAmCC;AAED,SAAS,mBAAmB,CAAC,OAAwB;;IACnD,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC9D,OAAO,CAAA,MAAA,IAAA,qBAAY,EAAC,YAAY,CAAC,0CAAG,iBAAiB,EAAE,OAAO,CAAC,KAAI,EAAE,CAAC;AACxE,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,8BAA8B,CACrC,WAAoC,EACpC,SAAS,GAAG,EAAE,EACd,eAAe,GAAG,EAAE;IAEpB,OAAO;QACL,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI;QAC3B,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,UAAU;QACvC,SAAS;QACT,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAwB,EACxB,OAAkC,EAClC,WAAqC,EACrC,cAAsB,OAAO,CAAC,WAAW,EACzC,cAAkC,gBAAgB,EAAE;;;IAEpD,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI;QAAE,OAAO,WAAW,CAAC;IAEjD,MAAM,mBAAmB,GACvB,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IACvD,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAEzD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;QACnC,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,8BAA8B,CAC7D,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CACxC,CAAC;KACH;IAED,MAAM,oBAAoB,GACxB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;IAE1E,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE;QACnD,oBAAoB;QACpB,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9C,SAAS;SACV;QAED,4BAA4B;QAC5B,IAAI,oBAAoB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;YAC3D,SAAS;SACV;QAED,MAAM,SAAS,GAAG,sBAAsB,CACtC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EACpD,WAAW,CACZ,CAAC;QAEF,MAAM,eAAe,GAAG,kBAAkB,CACxC,iBAAiB,CAAC,MAAM,EACxB,OAAO,EACP,OAAO,CACR,CAAC;QAEF,MAAM,YAAY;QAChB;;;WAGG;QACH,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,eAAe,CAAC;YAChD;;;eAGG;YACH,OAAO,CAAC,QAAQ,KAAK,MAAM;YAC3B;;;eAGG;YACH,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAC3B,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACvD,CAAC,eAAe,CAAC;QAEnB,IAAI,YAAY,EAAE;YAChB,YAAA,WAAW,CAAC,YAAY,EAAC,WAAW,wCAAX,WAAW,IAAM,EAAE,EAAC;YAC7C,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SACtE;QAED,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACzC,8BAA8B,CAC5B,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EACpD,SAAS,EACT,eAAe,CAChB,CAAC;QAEJ,IACE,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EACtE;YACA,WAAW,GAAG,iBAAiB,CAC7B,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,CAAC,MAAM,EACxB,WAAW,CACZ,CAAC;SACH;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAwB,EACxB,kBAAsC,EACtC,WAAqC;IAErC,MAAM,QAAQ,qBAAQ,OAAO,CAAC,YAAY,CAAC,KAAK,CAAE,CAAC;IAEnD,KAAK,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CACjD,kBAAkB,CAAC,YAAY,CAChC,EAAE;QACD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE;YACpB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC;SACzB;QAED,KAAK,MAAM,cAAc,IAAI,YAAY,EAAE;YACzC,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAEhE,yDAAyD;YACzD,IAAI,cAAc,CAAC,eAAe,EAAE;gBAClC,SAAS;aACV;YAED,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC5B,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;aACjC;SACF;KACF;IAED,KAAK,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE;YAC9C,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;gBACvC,8BAA8B,CAC5B,WAAW,EACX,sBAAsB,CAAC,WAAW,EAAE,WAAW,CAAC,CACjD,CAAC;SACL;KACF;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,IAAY,EAAE,EAAU;IAClD,IAAA,mBAAQ,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,IAAA,qBAAU,EAAC,IAAI,CAAC,CAAC;AACnB,CAAC;AAHD,kCAGC;AAED,SAAS,aAAa,CACpB,cAAsB,EACtB,2BAAmD;IAEnD,MAAM,WAAW,GAAG,IAAI,MAAM,CAC5B,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC;SACrC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,SAAS,OAAO,CAAC;SAC5C,IAAI,CAAC,GAAG,CAAC,EACZ,GAAG,CACJ,CAAC;IACF,qBAAqB,CACnB,cAAc,EACd,WAAW,EACX,2BAA2B,CAC5B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAe,EACf,WAAmB,EACnB,2BAAmD;IAEnD,MAAM,KAAK,GAAG,IAAA,sBAAW,EAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,iCAAiC;QACjC,IACE,IAAI,CAAC,MAAM,EAAE;YACb,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1D;YACA,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,IAAA,uBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE;gBAClE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC5C,OAAO,IAAI,IAAA,eAAQ,EAAC,OAAO,EAAE,2BAA2B,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC;YACvE,CAAC,CAAC,CAAC;YACH,IAAA,wBAAa,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SACzC;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YAC7B,qBAAqB,CACnB,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EACxB,WAAW,EACX,2BAA2B,CAC5B,CAAC;SACH;KACF;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,WAAoC,EACpC,WAAqC;IAErC,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACxD,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;YAC9D,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CACzB,WAAmB,EACnB,OAAwB,EACxB,OAAkC;;IAElC,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CACnD,CAAC,WAAW,EAAE,EAAE,mBACd,OAAA,MAAA,MAAA,MAAA,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,0CAAE,IAAI,0CAAE,OAAO,0CAAG,WAAW,CAAC,CAAA,EAAA,CACxE,CAAC;IAEF,IAAI,WAAW;QACb,OAAO,MAAA,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,0CAAG,WAAW,EACtE,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC;AACZ,CAAC"}
1
+ {"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/inline.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,10 @@
1
1
  import { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
2
2
  import { NormalizedExecutorOptions } from '../schema';
3
- export declare function compileTypeScriptFiles(normalizedOptions: NormalizedExecutorOptions, tscOptions: TypeScriptCompilationOptions, postCompilationCallback: () => void | Promise<void>): AsyncGenerator<{
3
+ export interface TypescriptCompilationResult {
4
4
  success: boolean;
5
5
  outfile: string;
6
- }, any, undefined>;
6
+ }
7
+ export declare function compileTypeScriptFiles(normalizedOptions: NormalizedExecutorOptions, tscOptions: TypeScriptCompilationOptions, postCompilationCallback: () => void | Promise<void>): {
8
+ iterator: AsyncIterable<TypescriptCompilationResult>;
9
+ close: () => void | Promise<void>;
10
+ };
@@ -12,19 +12,24 @@ function getErrorCountFromMessage(messageText) {
12
12
  return Number.parseInt(ERROR_COUNT_REGEX.exec(messageText)[1]);
13
13
  }
14
14
  function compileTypeScriptFiles(normalizedOptions, tscOptions, postCompilationCallback) {
15
- return tslib_1.__asyncGenerator(this, arguments, function* compileTypeScriptFiles_1() {
16
- const getResult = (success) => ({
17
- success,
18
- outfile: normalizedOptions.mainOutputPath,
19
- });
20
- return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, create_async_iteratable_1.createAsyncIterable)(({ next, done }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
15
+ const getResult = (success) => ({
16
+ success,
17
+ outfile: normalizedOptions.mainOutputPath,
18
+ });
19
+ let tearDown;
20
+ return {
21
+ iterator: (0, create_async_iteratable_1.createAsyncIterable)(({ next, done }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
21
22
  if (normalizedOptions.watch) {
22
- (0, compilation_1.compileTypeScriptWatcher)(tscOptions, (d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
23
+ const host = (0, compilation_1.compileTypeScriptWatcher)(tscOptions, (d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
23
24
  if (d.code === TYPESCRIPT_FOUND_N_ERRORS_WATCHING_FOR_FILE_CHANGES) {
24
25
  yield postCompilationCallback();
25
26
  next(getResult(getErrorCountFromMessage(d.messageText) === 0));
26
27
  }
27
28
  }));
29
+ tearDown = () => {
30
+ host.close();
31
+ done();
32
+ };
28
33
  }
29
34
  else {
30
35
  const { success } = (0, compilation_1.compileTypeScript)(tscOptions);
@@ -32,8 +37,9 @@ function compileTypeScriptFiles(normalizedOptions, tscOptions, postCompilationCa
32
37
  next(getResult(success));
33
38
  done();
34
39
  }
35
- }))))));
36
- });
40
+ })),
41
+ close: () => tearDown === null || tearDown === void 0 ? void 0 : tearDown(),
42
+ };
37
43
  }
38
44
  exports.compileTypeScriptFiles = compileTypeScriptFiles;
39
45
  //# sourceMappingURL=compile-typescript-files.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compile-typescript-files.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":";;;;AAAA,sFAI8D;AAE9D,8FAAuF;AAGvF,MAAM,mDAAmD,GAAG,IAAI,CAAC;AACjE,uFAAuF;AACvF,yIAAyI;AACzI,MAAM,iBAAiB,GAAG,oBAAoB,CAAC;AAE/C,SAAS,wBAAwB,CAAC,WAAmB;IACnD,OAAO,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAuB,sBAAsB,CAC3C,iBAA4C,EAC5C,UAAwC,EACxC,uBAAmD;;QAEnD,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;YACvC,OAAO;YACP,OAAO,EAAE,iBAAiB,CAAC,cAAc;SAC1C,CAAC,CAAC;QAEH,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,6CAAmB,EAC/B,CAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,IAAI,iBAAiB,CAAC,KAAK,EAAE;gBAC3B,IAAA,sCAAwB,EAAC,UAAU,EAAE,CAAO,CAAa,EAAE,EAAE;oBAC3D,IAAI,CAAC,CAAC,IAAI,KAAK,mDAAmD,EAAE;wBAClE,MAAM,uBAAuB,EAAE,CAAC;wBAChC,IAAI,CACF,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC,WAAqB,CAAC,KAAK,CAAC,CAAC,CACnE,CAAC;qBACH;gBACH,CAAC,CAAA,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,+BAAiB,EAAC,UAAU,CAAC,CAAC;gBAClD,MAAM,uBAAuB,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzB,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAA,CACF,CAAA,CAAA,CAAA,EAAC;IACJ,CAAC;CAAA;AA7BD,wDA6BC"}
1
+ {"version":3,"file":"compile-typescript-files.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":";;;;AAAA,sFAI8D;AAE9D,8FAAuF;AAGvF,MAAM,mDAAmD,GAAG,IAAI,CAAC;AACjE,uFAAuF;AACvF,yIAAyI;AACzI,MAAM,iBAAiB,GAAG,oBAAoB,CAAC;AAE/C,SAAS,wBAAwB,CAAC,WAAmB;IACnD,OAAO,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAOD,SAAgB,sBAAsB,CACpC,iBAA4C,EAC5C,UAAwC,EACxC,uBAAmD;IAKnD,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;QACvC,OAAO;QACP,OAAO,EAAE,iBAAiB,CAAC,cAAc;KAC1C,CAAC,CAAC;IAEH,IAAI,QAAkC,CAAC;IAEvC,OAAO;QACL,QAAQ,EAAE,IAAA,6CAAmB,EAC3B,CAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,IAAI,iBAAiB,CAAC,KAAK,EAAE;gBAC3B,MAAM,IAAI,GAAG,IAAA,sCAAwB,EACnC,UAAU,EACV,CAAO,CAAa,EAAE,EAAE;oBACtB,IACE,CAAC,CAAC,IAAI,KAAK,mDAAmD,EAC9D;wBACA,MAAM,uBAAuB,EAAE,CAAC;wBAChC,IAAI,CACF,SAAS,CACP,wBAAwB,CAAC,CAAC,CAAC,WAAqB,CAAC,KAAK,CAAC,CACxD,CACF,CAAC;qBACH;gBACH,CAAC,CAAA,CACF,CAAC;gBAEF,QAAQ,GAAG,GAAG,EAAE;oBACd,IAAI,CAAC,KAAK,EAAE,CAAC;oBACb,IAAI,EAAE,CAAC;gBACT,CAAC,CAAC;aACH;iBAAM;gBACL,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,+BAAiB,EAAC,UAAU,CAAC,CAAC;gBAClD,MAAM,uBAAuB,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzB,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAA,CACF;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,EAAI;KAC1B,CAAC;AACJ,CAAC;AAjDD,wDAiDC"}