@nrwl/js 14.7.15 → 14.7.16

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
- ## [14.7.15](https://github.com/nrwl/nx/compare/14.7.14...14.7.15) (2022-09-27)
6
+ ## [14.7.16](https://github.com/nrwl/nx/compare/14.7.15...14.7.16) (2022-09-27)
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": "14.7.15",
3
+ "version": "14.7.16",
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": "14.7.15",
36
- "@nrwl/jest": "14.7.15",
37
- "@nrwl/linter": "14.7.15",
38
- "@nrwl/workspace": "14.7.15",
35
+ "@nrwl/devkit": "14.7.16",
36
+ "@nrwl/jest": "14.7.16",
37
+ "@nrwl/linter": "14.7.16",
38
+ "@nrwl/workspace": "14.7.16",
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": "b2e12445028d625521de9ccda952af82375809a8"
53
+ "gitHead": "0ba053a8778fc3e87ab5fc9ccac820bdcb074767"
54
54
  }
@@ -61,20 +61,6 @@
61
61
  "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
62
62
  "enum": ["dependencies", "peerDependencies"],
63
63
  "default": "peerDependencies"
64
- },
65
- "external": {
66
- "type": "string",
67
- "description": "A list projects to be treated as external.",
68
- "enum": ["all", "none"],
69
- "default": "all"
70
- },
71
- "externalBuildTargets": {
72
- "type": "array",
73
- "items": {
74
- "type": "string"
75
- },
76
- "description": "List of target names that annotate a build target for a project",
77
- "default": ["build"]
78
64
  }
79
65
  },
80
66
  "required": ["main", "outputPath", "tsConfig"],
@@ -1,5 +1,5 @@
1
1
  import { ExecutorContext } from '@nrwl/devkit';
2
- import type { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
2
+ import { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
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;
@@ -4,13 +4,12 @@ exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.norma
4
4
  const tslib_1 = require("tslib");
5
5
  const assets_1 = require("@nrwl/workspace/src/utilities/assets");
6
6
  const path_1 = require("path");
7
- const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
8
7
  const check_dependencies_1 = require("../../utils/check-dependencies");
9
8
  const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
10
- const inline_1 = require("../../utils/inline");
11
- const update_package_json_1 = require("../../utils/package-json/update-package-json");
9
+ const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
12
10
  const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
13
11
  const load_ts_transformers_1 = require("../../utils/typescript/load-ts-transformers");
12
+ const update_package_json_1 = require("../../utils/package-json/update-package-json");
14
13
  const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
15
14
  function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
16
15
  const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
@@ -20,9 +19,6 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
20
19
  if (options.watch == null) {
21
20
  options.watch = false;
22
21
  }
23
- if (options.external == null) {
24
- options.external = 'all';
25
- }
26
22
  const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
27
23
  return Object.assign(Object.assign({}, options), { root: contextRoot, sourceRoot,
28
24
  projectRoot,
@@ -77,15 +73,9 @@ function tscExecutor(_options, context) {
77
73
  process.on('SIGINT', () => handleTermination());
78
74
  process.on('SIGTERM', () => handleTermination());
79
75
  }
80
- const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
81
- const inlinedDependencies = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
82
- if (inlinedDependencies.length > 0) {
83
- tsCompilationOptions.rootDir = '.';
84
- }
85
- 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* () {
76
+ return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_typescript_files_1.compileTypeScriptFiles)(options, createTypeScriptCompilationOptions(options, context), () => tslib_1.__awaiter(this, void 0, void 0, function* () {
86
77
  yield assetHandler.processAllAssetsOnce();
87
78
  (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
88
- (0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions, inlinedDependencies);
89
79
  }))))));
90
80
  });
91
81
  }
@@ -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":"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"}
@@ -45,8 +45,6 @@ export interface ExecutorOptions {
45
45
  transformers: TransformerEntry[];
46
46
  updateBuildableProjectDepsInPackageJson?: boolean;
47
47
  buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
48
- external?: 'all' | 'none';
49
- externalBuildTargets?: string[];
50
48
  }
51
49
 
52
50
  export interface NormalizedExecutorOptions extends ExecutorOptions {
@@ -1,9 +0,0 @@
1
- import type { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
2
- import type { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
3
- import type { NormalizedExecutorOptions } from './schema';
4
- export declare function handleInliningBuild(context: ExecutorContext, options: NormalizedExecutorOptions, tsConfigPath: string): Array<ProjectGraphProjectNode & {
5
- pathAlias: string;
6
- }>;
7
- export declare function postProcessInlinedDependencies(tsCompilationOptions: TypeScriptCompilationOptions, inlinedDependencies: Array<ProjectGraphProjectNode & {
8
- pathAlias: string;
9
- }>): void;
@@ -1,110 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.postProcessInlinedDependencies = exports.handleInliningBuild = void 0;
4
- const devkit_1 = require("@nrwl/devkit");
5
- const fs_extra_1 = require("fs-extra");
6
- const path_1 = require("path");
7
- function handleInliningBuild(context, options, tsConfigPath) {
8
- const projectDependencies = context.projectGraph.dependencies[context.projectName];
9
- const dependencies = [];
10
- if (projectDependencies && projectDependencies.length) {
11
- const tsConfigJson = (0, devkit_1.readJsonFile)(tsConfigPath);
12
- // handle inlining
13
- // 1. figure out a list of dependencies that need to be inlined
14
- for (const projectDependency of projectDependencies) {
15
- // skip npm packages
16
- if (projectDependency.target.startsWith('npm')) {
17
- continue;
18
- }
19
- let shouldInline = false;
20
- if (options.external === 'all') {
21
- /**
22
- * if all buildable libraries are marked as external,
23
- * then push the project dependency that doesn't have a build target
24
- */
25
- if (!hasBuildTarget(projectDependency.target, context, options)) {
26
- shouldInline = true;
27
- }
28
- }
29
- else if (options.external === 'none') {
30
- /**
31
- * if all buildable libraries are marked as internal,
32
- * then push every project dependency to be inlined
33
- */
34
- shouldInline = true;
35
- }
36
- if (shouldInline) {
37
- dependencies.push({
38
- name: projectDependency.target,
39
- path: getPathAliasForPackage(context.projectGraph.nodes[projectDependency.target], tsConfigJson['compilerOptions']['paths']),
40
- });
41
- }
42
- }
43
- // 2. adjust rootDir of tmp tsConfig if we have dependencies to inline
44
- if (dependencies.length > 0) {
45
- devkit_1.logger.log('List of dependencies to be inlined:', JSON.stringify(dependencies, null, 2));
46
- }
47
- }
48
- return dependencies.map((dependency) => (Object.assign(Object.assign({}, context.projectGraph.nodes[dependency.name]), { pathAlias: dependency.path })));
49
- }
50
- exports.handleInliningBuild = handleInliningBuild;
51
- function postProcessInlinedDependencies(tsCompilationOptions, inlinedDependencies) {
52
- if (inlinedDependencies.length === 0) {
53
- return;
54
- }
55
- const destOutputPath = tsCompilationOptions.outputPath;
56
- const parentLibDir = tsCompilationOptions.projectRoot;
57
- const parentOutputPath = (0, path_1.join)(destOutputPath, parentLibDir);
58
- // move parentOutput
59
- movePackage(parentOutputPath, destOutputPath);
60
- const inlinedDepsDestOutputRecord = {};
61
- // move inlined outputs
62
- for (const inlinedDependency of inlinedDependencies) {
63
- const depOutputPath = (0, path_1.join)(destOutputPath, inlinedDependency.data.root);
64
- const destDepOutputPath = (0, path_1.join)(destOutputPath, inlinedDependency.name);
65
- movePackage(depOutputPath, destDepOutputPath);
66
- // TODO: hard-coded "src"
67
- inlinedDepsDestOutputRecord[inlinedDependency.pathAlias] =
68
- destDepOutputPath + '/src';
69
- }
70
- updateImports(destOutputPath, inlinedDepsDestOutputRecord);
71
- }
72
- exports.postProcessInlinedDependencies = postProcessInlinedDependencies;
73
- function movePackage(from, to) {
74
- (0, fs_extra_1.copySync)(from, to, { overwrite: true, recursive: true });
75
- (0, fs_extra_1.removeSync)(from);
76
- }
77
- function updateImports(destOutputPath, inlinedDepsDestOutputRecord) {
78
- const importRegex = new RegExp(Object.keys(inlinedDepsDestOutputRecord).join('|'), 'g');
79
- recursiveUpdateImport(destOutputPath + '/src', importRegex, inlinedDepsDestOutputRecord);
80
- }
81
- function recursiveUpdateImport(dirPath, importRegex, inlinedDepsDestOutputRecord) {
82
- const files = (0, fs_extra_1.readdirSync)(dirPath, { withFileTypes: true });
83
- for (const file of files) {
84
- // only check .js and .d.ts files
85
- if (file.isFile() &&
86
- (file.name.endsWith('.js') || file.name.endsWith('.d.ts'))) {
87
- const filePath = (0, path_1.join)(dirPath, file.name);
88
- const fileContent = (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
89
- const updatedContent = fileContent.replace(importRegex, (matched) => (0, path_1.relative)(dirPath, inlinedDepsDestOutputRecord[matched]));
90
- (0, fs_extra_1.writeFileSync)(filePath, updatedContent);
91
- }
92
- else if (file.isDirectory()) {
93
- recursiveUpdateImport((0, path_1.join)(dirPath, file.name), importRegex, inlinedDepsDestOutputRecord);
94
- }
95
- }
96
- }
97
- function getPathAliasForPackage(packageNode, pathAliases) {
98
- if (!packageNode)
99
- return '';
100
- for (const [alias, paths] of Object.entries(pathAliases)) {
101
- if (paths.some((path) => path.includes(packageNode.data.root))) {
102
- return alias;
103
- }
104
- }
105
- return '';
106
- }
107
- function hasBuildTarget(projectName, context, options) {
108
- return options.externalBuildTargets.some((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]; });
109
- }
110
- //# sourceMappingURL=inline.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/inline.ts"],"names":[],"mappings":"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"}