@nrwl/angular 14.1.9-beta.1 → 14.2.0-beta.1
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 +1 -1
- package/esm2020/src/runtime/nx/data-persistence.mjs +4 -4
- package/esm2020/src/runtime/nx/nx.module.mjs +5 -5
- package/fesm2015/nrwl-angular.mjs +7 -7
- package/fesm2015/nrwl-angular.mjs.map +1 -1
- package/fesm2020/nrwl-angular.mjs +7 -7
- package/fesm2020/nrwl-angular.mjs.map +1 -1
- package/generators.json +2 -0
- package/migrations.json +111 -0
- package/package.json +14 -14
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +29 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-browser/schema.json +59 -38
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +108 -76
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +3 -2
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js +12 -0
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts +0 -6
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js +1 -8
- package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.d.ts +3 -2
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +12 -0
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/application/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +3 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/component/component.js +0 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/schema.d.ts +1 -0
- package/src/generators/component/schema.json +5 -0
- package/src/generators/init/init.js +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js +1 -1
- package/src/generators/library/lib/enable-strict-type-checking.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -0
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.js +5 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/stories/lib/component-info.d.ts +2 -1
- package/src/generators/stories/lib/component-info.js +29 -1
- package/src/generators/stories/lib/component-info.js.map +1 -1
- package/src/generators/stories/stories.js +5 -1
- package/src/generators/stories/stories.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.d.ts +2 -0
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js +27 -0
- package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js.map +1 -0
- package/src/migrations/update-14-2-0/update-angular-cli.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-angular-cli.js +26 -0
- package/src/migrations/update-14-2-0/update-angular-cli.js.map +1 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js +38 -0
- package/src/migrations/update-14-2-0/update-libraries-secondary-entrypoints.js.map +1 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.js +22 -0
- package/src/migrations/update-14-2-0/update-ngcc-target.js.map +1 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.d.ts +2 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.js +158 -0
- package/src/migrations/update-14-2-0/update-tsconfig-target.js.map +1 -0
- package/src/utils/mfe/mfe-webpack.js +24 -8
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/testing.d.ts +1 -1
- package/src/utils/versions.d.ts +6 -5
- package/src/utils/versions.js +7 -6
- package/src/utils/versions.js.map +1 -1
- package/mfe/nrwl-angular-mfe.d.ts +0 -5
- package/mfe/package.json +0 -10
- package/nrwl-angular.d.ts +0 -5
- package/testing/nrwl-angular-testing.d.ts +0 -5
- package/testing/package.json +0 -10
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.2.0-beta.1",
|
|
4
4
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"default": "./package.json"
|
|
28
28
|
},
|
|
29
29
|
".": {
|
|
30
|
-
"types": "./
|
|
30
|
+
"types": "./index.d.ts",
|
|
31
31
|
"esm2020": "./esm2020/nrwl-angular.mjs",
|
|
32
32
|
"es2020": "./fesm2020/nrwl-angular.mjs",
|
|
33
33
|
"es2015": "./fesm2015/nrwl-angular.mjs",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"default": "./fesm2020/nrwl-angular.mjs"
|
|
36
36
|
},
|
|
37
37
|
"./mfe": {
|
|
38
|
-
"types": "./mfe/
|
|
38
|
+
"types": "./mfe/index.d.ts",
|
|
39
39
|
"esm2020": "./esm2020/mfe/nrwl-angular-mfe.mjs",
|
|
40
40
|
"es2020": "./fesm2020/nrwl-angular-mfe.mjs",
|
|
41
41
|
"es2015": "./fesm2015/nrwl-angular-mfe.mjs",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"default": "./fesm2020/nrwl-angular-mfe.mjs"
|
|
44
44
|
},
|
|
45
45
|
"./testing": {
|
|
46
|
-
"types": "./testing/
|
|
46
|
+
"types": "./testing/index.d.ts",
|
|
47
47
|
"esm2020": "./esm2020/testing/nrwl-angular-testing.mjs",
|
|
48
48
|
"es2020": "./fesm2020/nrwl-angular-testing.mjs",
|
|
49
49
|
"es2015": "./fesm2015/nrwl-angular-testing.mjs",
|
|
@@ -64,15 +64,15 @@
|
|
|
64
64
|
"migrations": "./migrations.json"
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@angular-devkit/schematics": "~
|
|
68
|
-
"@nrwl/cypress": "14.
|
|
69
|
-
"@nrwl/devkit": "14.
|
|
70
|
-
"@nrwl/jest": "14.
|
|
71
|
-
"@nrwl/linter": "14.
|
|
72
|
-
"@nrwl/storybook": "14.
|
|
73
|
-
"@nrwl/workspace": "14.
|
|
67
|
+
"@angular-devkit/schematics": "~14.0.0-rc.2",
|
|
68
|
+
"@nrwl/cypress": "14.2.0-beta.1",
|
|
69
|
+
"@nrwl/devkit": "14.2.0-beta.1",
|
|
70
|
+
"@nrwl/jest": "14.2.0-beta.1",
|
|
71
|
+
"@nrwl/linter": "14.2.0-beta.1",
|
|
72
|
+
"@nrwl/storybook": "14.2.0-beta.1",
|
|
73
|
+
"@nrwl/workspace": "14.2.0-beta.1",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
|
-
"@schematics/angular": "~
|
|
75
|
+
"@schematics/angular": "~14.0.0-rc.2",
|
|
76
76
|
"chalk": "4.1.0",
|
|
77
77
|
"chokidar": "^3.5.1",
|
|
78
78
|
"http-server": "^14.1.0",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"esm2020": "esm2020/nrwl-angular.mjs",
|
|
92
92
|
"fesm2020": "fesm2020/nrwl-angular.mjs",
|
|
93
93
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
94
|
-
"typings": "
|
|
94
|
+
"typings": "index.d.ts",
|
|
95
95
|
"sideEffects": false,
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "912e81957f44eb072286987183e6912807bc26e5"
|
|
97
97
|
}
|
|
@@ -7,6 +7,32 @@ const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
|
|
|
7
7
|
const architect_1 = require("@angular-devkit/architect");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const webpack_server_impl_1 = require("../webpack-server/webpack-server.impl");
|
|
10
|
+
const fs_1 = require("fs");
|
|
11
|
+
function getDynamicRemotesIfExists(context, p) {
|
|
12
|
+
// check for dynamic remotes
|
|
13
|
+
// we should only check for dynamic based on what we generate
|
|
14
|
+
// and fallback to empty array
|
|
15
|
+
const standardPathToGeneratedMFManifestJson = (0, path_1.join)(context.workspaceRoot, p.sourceRoot, 'assets/module-federation.manifest.json');
|
|
16
|
+
if (!(0, fs_1.existsSync)(standardPathToGeneratedMFManifestJson)) {
|
|
17
|
+
return [];
|
|
18
|
+
}
|
|
19
|
+
const moduleFederationManifestJson = (0, fs_1.readFileSync)(standardPathToGeneratedMFManifestJson, 'utf-8');
|
|
20
|
+
if (moduleFederationManifestJson) {
|
|
21
|
+
// This should have shape of
|
|
22
|
+
// {
|
|
23
|
+
// "remoteName": "remoteLocation",
|
|
24
|
+
// }
|
|
25
|
+
const parsedManifest = JSON.parse(moduleFederationManifestJson);
|
|
26
|
+
if (!Object.keys(parsedManifest).every((key) => typeof key === 'string' && typeof parsedManifest[key] === 'string')) {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
return Object.entries(parsedManifest).reduce((remotesArray, [remoteName, remoteLocation]) => [
|
|
30
|
+
...remotesArray,
|
|
31
|
+
[remoteName, remoteLocation],
|
|
32
|
+
], []);
|
|
33
|
+
}
|
|
34
|
+
return [];
|
|
35
|
+
}
|
|
10
36
|
function executeModuleFederationDevServerBuilder(schema, context) {
|
|
11
37
|
const workspaces = new devkit_1.Workspaces(context.workspaceRoot);
|
|
12
38
|
const workspaceConfig = workspaces.readWorkspaceConfiguration();
|
|
@@ -20,7 +46,9 @@ function executeModuleFederationDevServerBuilder(schema, context) {
|
|
|
20
46
|
throw new Error(`Could not load ${mfConfigPath}. Was this project generated with "@nrwl/angular:host"?`);
|
|
21
47
|
}
|
|
22
48
|
const options = tslib_1.__rest(schema, []);
|
|
23
|
-
|
|
49
|
+
let unparsedRemotes = mfeConfig.remotes.length > 0 ? mfeConfig.remotes : [];
|
|
50
|
+
const dynamicRemotes = getDynamicRemotesIfExists(context, p);
|
|
51
|
+
unparsedRemotes = [...unparsedRemotes, ...dynamicRemotes];
|
|
24
52
|
const remotes = unparsedRemotes.map((a) => (Array.isArray(a) ? a[0] : a));
|
|
25
53
|
const devServeRemotes = !options.devRemotes
|
|
26
54
|
? []
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,35 @@
|
|
|
47
47
|
"type": "array",
|
|
48
48
|
"default": [],
|
|
49
49
|
"items": {
|
|
50
|
-
"
|
|
50
|
+
"oneOf": [
|
|
51
|
+
{
|
|
52
|
+
"type": "object",
|
|
53
|
+
"properties": {
|
|
54
|
+
"input": {
|
|
55
|
+
"type": "string",
|
|
56
|
+
"description": "The file to include.",
|
|
57
|
+
"pattern": "\\.[cm]?jsx?$"
|
|
58
|
+
},
|
|
59
|
+
"bundleName": {
|
|
60
|
+
"type": "string",
|
|
61
|
+
"pattern": "^[\\w\\-.]*$",
|
|
62
|
+
"description": "The bundle name for this extra entry point."
|
|
63
|
+
},
|
|
64
|
+
"inject": {
|
|
65
|
+
"type": "boolean",
|
|
66
|
+
"description": "If the bundle will be referenced in the HTML file.",
|
|
67
|
+
"default": true
|
|
68
|
+
}
|
|
69
|
+
},
|
|
70
|
+
"additionalProperties": false,
|
|
71
|
+
"required": ["input"]
|
|
72
|
+
},
|
|
73
|
+
{
|
|
74
|
+
"type": "string",
|
|
75
|
+
"description": "The file to include.",
|
|
76
|
+
"pattern": "\\.[cm]?jsx?$"
|
|
77
|
+
}
|
|
78
|
+
]
|
|
51
79
|
}
|
|
52
80
|
},
|
|
53
81
|
"styles": {
|
|
@@ -55,7 +83,35 @@
|
|
|
55
83
|
"type": "array",
|
|
56
84
|
"default": [],
|
|
57
85
|
"items": {
|
|
58
|
-
"
|
|
86
|
+
"oneOf": [
|
|
87
|
+
{
|
|
88
|
+
"type": "object",
|
|
89
|
+
"properties": {
|
|
90
|
+
"input": {
|
|
91
|
+
"type": "string",
|
|
92
|
+
"description": "The file to include.",
|
|
93
|
+
"pattern": "\\.(?:css|scss|sass|less|styl)$"
|
|
94
|
+
},
|
|
95
|
+
"bundleName": {
|
|
96
|
+
"type": "string",
|
|
97
|
+
"pattern": "^[\\w\\-.]*$",
|
|
98
|
+
"description": "The bundle name for this extra entry point."
|
|
99
|
+
},
|
|
100
|
+
"inject": {
|
|
101
|
+
"type": "boolean",
|
|
102
|
+
"description": "If the bundle will be referenced in the HTML file.",
|
|
103
|
+
"default": true
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
"additionalProperties": false,
|
|
107
|
+
"required": ["input"]
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
"type": "string",
|
|
111
|
+
"description": "The file to include.",
|
|
112
|
+
"pattern": "\\.(?:css|scss|sass|less|styl)$"
|
|
113
|
+
}
|
|
114
|
+
]
|
|
59
115
|
}
|
|
60
116
|
},
|
|
61
117
|
"inlineStyleLanguage": {
|
|
@@ -291,15 +347,9 @@
|
|
|
291
347
|
"description": "Extract all licenses in a separate file.",
|
|
292
348
|
"default": true
|
|
293
349
|
},
|
|
294
|
-
"showCircularDependencies": {
|
|
295
|
-
"type": "boolean",
|
|
296
|
-
"description": "Show circular dependency warnings on builds.",
|
|
297
|
-
"default": false,
|
|
298
|
-
"x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
|
|
299
|
-
},
|
|
300
350
|
"buildOptimizer": {
|
|
301
351
|
"type": "boolean",
|
|
302
|
-
"description": "Enables
|
|
352
|
+
"description": "Enables advanced build optimizations when using the 'aot' option.",
|
|
303
353
|
"default": true
|
|
304
354
|
},
|
|
305
355
|
"namedChunks": {
|
|
@@ -471,35 +521,6 @@
|
|
|
471
521
|
}
|
|
472
522
|
]
|
|
473
523
|
},
|
|
474
|
-
"extraEntryPoint": {
|
|
475
|
-
"oneOf": [
|
|
476
|
-
{
|
|
477
|
-
"type": "object",
|
|
478
|
-
"properties": {
|
|
479
|
-
"input": {
|
|
480
|
-
"type": "string",
|
|
481
|
-
"description": "The file to include."
|
|
482
|
-
},
|
|
483
|
-
"bundleName": {
|
|
484
|
-
"type": "string",
|
|
485
|
-
"pattern": "^[\\w\\-.]*$",
|
|
486
|
-
"description": "The bundle name for this extra entry point."
|
|
487
|
-
},
|
|
488
|
-
"inject": {
|
|
489
|
-
"type": "boolean",
|
|
490
|
-
"description": "If the bundle will be referenced in the HTML file.",
|
|
491
|
-
"default": true
|
|
492
|
-
}
|
|
493
|
-
},
|
|
494
|
-
"additionalProperties": false,
|
|
495
|
-
"required": ["input"]
|
|
496
|
-
},
|
|
497
|
-
{
|
|
498
|
-
"type": "string",
|
|
499
|
-
"description": "The file to include."
|
|
500
|
-
}
|
|
501
|
-
]
|
|
502
|
-
},
|
|
503
524
|
"budget": {
|
|
504
525
|
"type": "object",
|
|
505
526
|
"properties": {
|
|
@@ -24,78 +24,112 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
|
|
|
24
24
|
const ngPackageNode = graph.find(nodes_1.isPackage);
|
|
25
25
|
const ngPackage = ngPackageNode.data;
|
|
26
26
|
const { destinationFiles } = entryPoint.data;
|
|
27
|
-
const ignorePaths = [
|
|
28
|
-
'.gitkeep',
|
|
29
|
-
'**/.DS_Store',
|
|
30
|
-
'**/Thumbs.db',
|
|
31
|
-
'**/node_modules/**',
|
|
32
|
-
`${ngPackage.dest}/**`,
|
|
33
|
-
];
|
|
34
27
|
if (!ngEntryPoint.isSecondaryEntryPoint) {
|
|
35
|
-
const assetFiles = [];
|
|
36
|
-
// COPY ASSET FILES TO DESTINATION
|
|
37
28
|
devkit_1.logger.log('Copying assets');
|
|
38
29
|
try {
|
|
39
|
-
|
|
40
|
-
let assetFullPath = path.join(ngPackage.src, asset);
|
|
41
|
-
try {
|
|
42
|
-
const stats = yield (0, fs_1.stat)(assetFullPath);
|
|
43
|
-
if (stats.isFile()) {
|
|
44
|
-
assetFiles.push(assetFullPath);
|
|
45
|
-
continue;
|
|
46
|
-
}
|
|
47
|
-
if (stats.isDirectory()) {
|
|
48
|
-
assetFullPath = path.join(assetFullPath, '**/*');
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
catch (_b) { }
|
|
52
|
-
const files = yield (0, glob_1.globFiles)(assetFullPath, {
|
|
53
|
-
ignore: ignorePaths,
|
|
54
|
-
cache: ngPackageNode.cache.globCache,
|
|
55
|
-
dot: true,
|
|
56
|
-
nodir: true,
|
|
57
|
-
});
|
|
58
|
-
if (files.length) {
|
|
59
|
-
assetFiles.push(...files);
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
for (const file of assetFiles) {
|
|
63
|
-
const relativePath = path.relative(ngPackage.src, file);
|
|
64
|
-
const destination = path.resolve(ngPackage.dest, relativePath);
|
|
65
|
-
const nodeUri = (0, nodes_1.fileUrl)((0, path_1.ensureUnixPath)(file));
|
|
66
|
-
let node = graph.get(nodeUri);
|
|
67
|
-
if (!node) {
|
|
68
|
-
node = new node_1.Node(nodeUri);
|
|
69
|
-
graph.put(node);
|
|
70
|
-
}
|
|
71
|
-
entryPoint.dependsOn(node);
|
|
72
|
-
yield (0, fs_1.copyFile)(file, destination);
|
|
73
|
-
}
|
|
30
|
+
yield copyAssets(graph, entryPoint, ngPackageNode);
|
|
74
31
|
}
|
|
75
32
|
catch (error) {
|
|
76
33
|
throw error;
|
|
77
34
|
}
|
|
78
35
|
}
|
|
79
36
|
// 6. WRITE PACKAGE.JSON
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
37
|
+
// As of APF 14 only the primary entrypoint has a package.json
|
|
38
|
+
if (!ngEntryPoint.isSecondaryEntryPoint) {
|
|
39
|
+
try {
|
|
40
|
+
devkit_1.logger.info('Writing package manifest');
|
|
41
|
+
const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
|
|
42
|
+
yield writePackageJson(ngEntryPoint, ngPackage, {
|
|
43
|
+
module: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
44
|
+
es2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
45
|
+
esm2020: relativeUnixFromDestPath(destinationFiles.esm2020),
|
|
46
|
+
typings: relativeUnixFromDestPath(destinationFiles.declarations),
|
|
47
|
+
// webpack v4+ specific flag to enable advanced optimizations and code splitting
|
|
48
|
+
sideEffects: (_a = ngEntryPoint.packageJson.sideEffects) !== null && _a !== void 0 ? _a : false,
|
|
49
|
+
}, !!options.watch);
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
94
54
|
}
|
|
95
55
|
devkit_1.logger.info(`Built ${ngEntryPoint.moduleId}`);
|
|
96
56
|
return graph;
|
|
97
57
|
}));
|
|
98
58
|
exports.nxWritePackageTransform = nxWritePackageTransform;
|
|
59
|
+
function copyAssets(graph, entryPointNode, ngPackageNode) {
|
|
60
|
+
var _a;
|
|
61
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
62
|
+
const ngPackage = ngPackageNode.data;
|
|
63
|
+
const globsForceIgnored = [
|
|
64
|
+
'.gitkeep',
|
|
65
|
+
'**/.DS_Store',
|
|
66
|
+
'**/Thumbs.db',
|
|
67
|
+
`${ngPackage.dest}/**`,
|
|
68
|
+
];
|
|
69
|
+
const assets = [];
|
|
70
|
+
for (const item of ngPackage.assets) {
|
|
71
|
+
const asset = {};
|
|
72
|
+
if (typeof item == 'object') {
|
|
73
|
+
asset.glob = item.glob;
|
|
74
|
+
asset.input = path.join(ngPackage.src, item.input);
|
|
75
|
+
asset.output = path.join(ngPackage.dest, item.output);
|
|
76
|
+
asset.ignore = item.ignore;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const assetPath = item; // might be a glob
|
|
80
|
+
const assetFullPath = path.join(ngPackage.src, assetPath);
|
|
81
|
+
const [isDir, isFile] = yield (0, fs_1.stat)(assetFullPath)
|
|
82
|
+
.then((stats) => [stats.isDirectory(), stats.isFile()])
|
|
83
|
+
.catch(() => [false, false]);
|
|
84
|
+
if (isDir) {
|
|
85
|
+
asset.glob = '**/*';
|
|
86
|
+
asset.input = assetFullPath;
|
|
87
|
+
asset.output = path.join(ngPackage.dest, assetPath);
|
|
88
|
+
}
|
|
89
|
+
else if (isFile) {
|
|
90
|
+
asset.glob = path.basename(assetFullPath); // filenames are their own glob
|
|
91
|
+
asset.input = path.dirname(assetFullPath);
|
|
92
|
+
asset.output = path.dirname(path.join(ngPackage.dest, assetPath));
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
asset.glob = assetPath;
|
|
96
|
+
asset.input = ngPackage.src;
|
|
97
|
+
asset.output = ngPackage.dest;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
const isAncestorPath = (target, datum) => path.relative(datum, target).startsWith('..');
|
|
101
|
+
if (isAncestorPath(asset.input, ngPackage.src)) {
|
|
102
|
+
throw new Error('Cannot read assets from a location outside of the project root.');
|
|
103
|
+
}
|
|
104
|
+
if (isAncestorPath(asset.output, ngPackage.dest)) {
|
|
105
|
+
throw new Error('Cannot write assets to a location outside of the output path.');
|
|
106
|
+
}
|
|
107
|
+
assets.push(asset);
|
|
108
|
+
}
|
|
109
|
+
for (const asset of assets) {
|
|
110
|
+
const filePaths = yield (0, glob_1.globFiles)(asset.glob, {
|
|
111
|
+
cwd: asset.input,
|
|
112
|
+
ignore: [...((_a = asset.ignore) !== null && _a !== void 0 ? _a : []), ...globsForceIgnored],
|
|
113
|
+
cache: ngPackageNode.cache.globCache,
|
|
114
|
+
dot: true,
|
|
115
|
+
nodir: true,
|
|
116
|
+
follow: asset.followSymlinks,
|
|
117
|
+
});
|
|
118
|
+
for (const filePath of filePaths) {
|
|
119
|
+
const fileSrcFullPath = path.join(asset.input, filePath);
|
|
120
|
+
const fileDestFullPath = path.join(asset.output, filePath);
|
|
121
|
+
const nodeUri = (0, nodes_1.fileUrl)((0, path_1.ensureUnixPath)(fileSrcFullPath));
|
|
122
|
+
let node = graph.get(nodeUri);
|
|
123
|
+
if (!node) {
|
|
124
|
+
node = new node_1.Node(nodeUri);
|
|
125
|
+
graph.put(node);
|
|
126
|
+
}
|
|
127
|
+
entryPointNode.dependsOn(node);
|
|
128
|
+
yield (0, fs_1.copyFile)(fileSrcFullPath, fileDestFullPath);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
}
|
|
99
133
|
/**
|
|
100
134
|
* Creates and writes a `package.json` file of the entry point used by the `node_module`
|
|
101
135
|
* resolution strategies.
|
|
@@ -120,26 +154,24 @@ function writePackageJson(entryPoint, pkg, additionalProperties, isWatchMode) {
|
|
|
120
154
|
// version at least matches that of angular if we use require('tslib').version
|
|
121
155
|
// it will get what installed and not the minimum version nor if it is a `~` or `^`
|
|
122
156
|
// this is only required for primary
|
|
123
|
-
if (
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), { tslib: tsLibVersion });
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
else if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c.tslib) {
|
|
138
|
-
devkit_1.logger.warn(`'tslib' is no longer recommended to be used as a 'peerDependencies'. Moving it to 'dependencies'.`);
|
|
139
|
-
packageJson.dependencies = Object.assign(Object.assign({}, (packageJson.dependencies || {})), { tslib: packageJson.peerDependencies.tslib });
|
|
140
|
-
delete packageJson.peerDependencies.tslib;
|
|
157
|
+
if (isWatchMode) {
|
|
158
|
+
// Needed because of Webpack's 5 `cachemanagedpaths`
|
|
159
|
+
// https://github.com/angular/angular-cli/issues/20962
|
|
160
|
+
packageJson.version = `0.0.0-watch+${Date.now()}`;
|
|
161
|
+
}
|
|
162
|
+
if (!((_a = packageJson.peerDependencies) === null || _a === void 0 ? void 0 : _a.tslib) &&
|
|
163
|
+
!((_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b.tslib)) {
|
|
164
|
+
const { peerDependencies: angularPeerDependencies = {}, dependencies: angularDependencies = {}, } = require('@angular/compiler/package.json');
|
|
165
|
+
const tsLibVersion = angularPeerDependencies.tslib || angularDependencies.tslib;
|
|
166
|
+
if (tsLibVersion) {
|
|
167
|
+
packageJson.dependencies = Object.assign(Object.assign({}, packageJson.dependencies), { tslib: tsLibVersion });
|
|
141
168
|
}
|
|
142
169
|
}
|
|
170
|
+
else if ((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c.tslib) {
|
|
171
|
+
devkit_1.logger.warn(`'tslib' is no longer recommended to be used as a 'peerDependencies'. Moving it to 'dependencies'.`);
|
|
172
|
+
packageJson.dependencies = Object.assign(Object.assign({}, (packageJson.dependencies || {})), { tslib: packageJson.peerDependencies.tslib });
|
|
173
|
+
delete packageJson.peerDependencies.tslib;
|
|
174
|
+
}
|
|
143
175
|
// Verify non-peerDependencies as they can easily lead to duplicate installs or version conflicts
|
|
144
176
|
// in the node_modules folder of an application
|
|
145
177
|
const allowedList = pkg.allowedNonPeerDependencies.map((value) => new RegExp(value));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,yCAAsC;
|
|
1
|
+
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ import type { CompilerHost, CompilerOptions } from '@angular/compiler-cli';
|
|
|
8
8
|
import { FileCache } from 'ng-packagr/lib/file-system/file-cache';
|
|
9
9
|
import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
|
|
10
10
|
import { EntryPointNode } from 'ng-packagr/lib/ng-package/nodes';
|
|
11
|
+
import { NgPackageConfig } from 'ng-packagr/ng-package.schema';
|
|
11
12
|
import * as ts from 'typescript';
|
|
12
|
-
import {
|
|
13
|
-
export declare function cacheCompilerHost(graph: BuildGraph, entryPoint: EntryPointNode, compilerOptions: CompilerOptions, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor?: StylesheetProcessor, inlineStyleLanguage?:
|
|
13
|
+
import { StylesheetProcessor } from '../styles/stylesheet-processor';
|
|
14
|
+
export declare function cacheCompilerHost(graph: BuildGraph, entryPoint: EntryPointNode, compilerOptions: CompilerOptions, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor?: StylesheetProcessor, inlineStyleLanguage?: NgPackageConfig['inlineStyleLanguage'], sourcesFileCache?: FileCache): CompilerHost;
|
|
14
15
|
export declare function augmentProgramWithVersioning(program: ts.Program): void;
|
|
@@ -29,6 +29,9 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
29
29
|
const node = getNode(fileName);
|
|
30
30
|
entryPoint.dependsOn(node);
|
|
31
31
|
};
|
|
32
|
+
const { flatModuleFile, entryFile } = entryPoint.data.entryPoint;
|
|
33
|
+
const flatModuleFileDtsFilename = `${flatModuleFile}.d.ts`;
|
|
34
|
+
const hasIndexEntryFile = path.basename(entryFile.toLowerCase()) === 'index.ts';
|
|
32
35
|
return Object.assign(Object.assign({}, compilerHost), {
|
|
33
36
|
// ts specific
|
|
34
37
|
fileExists: (fileName) => {
|
|
@@ -46,6 +49,15 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
46
49
|
return cache.sourceFile;
|
|
47
50
|
}, writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
|
|
48
51
|
if (fileName.endsWith('.d.ts')) {
|
|
52
|
+
if (hasIndexEntryFile &&
|
|
53
|
+
path.basename(fileName) === flatModuleFileDtsFilename) {
|
|
54
|
+
// In case the entry file is index.ts, we should not emit the `d.ts` which are a re-export of the `index.ts`.
|
|
55
|
+
// Because it will cause a conflict.
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
// Rename file to index.d.ts so that TypeScript can resolve types without
|
|
59
|
+
// them needing to be referenced in the package.json manifest.
|
|
60
|
+
fileName = fileName.replace(flatModuleFileDtsFilename, 'index.d.ts');
|
|
49
61
|
sourceFiles.forEach((source) => {
|
|
50
62
|
const cache = sourcesFileCache.getOrCreate(source.fileName);
|
|
51
63
|
if (!cache.declarationFileName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,mCAAoC;AAGpC,oDAAiD;AACjD,2DAA0E;AAC1E,oDAA2D;
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/ng-packagr-lite/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,6 @@ export declare enum CssUrl {
|
|
|
11
11
|
inline = "inline",
|
|
12
12
|
none = "none"
|
|
13
13
|
}
|
|
14
|
-
export declare enum InlineStyleLanguage {
|
|
15
|
-
sass = "sass",
|
|
16
|
-
scss = "scss",
|
|
17
|
-
css = "css",
|
|
18
|
-
less = "less"
|
|
19
|
-
}
|
|
20
14
|
export interface Result {
|
|
21
15
|
css: string;
|
|
22
16
|
warnings: string[];
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* - Added watch mode parameter.
|
|
10
10
|
*/
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.StylesheetProcessor = exports.
|
|
12
|
+
exports.StylesheetProcessor = exports.CssUrl = void 0;
|
|
13
13
|
const tslib_1 = require("tslib");
|
|
14
14
|
const browserslist = require("browserslist");
|
|
15
15
|
const fs_1 = require("fs");
|
|
@@ -26,13 +26,6 @@ var CssUrl;
|
|
|
26
26
|
CssUrl["inline"] = "inline";
|
|
27
27
|
CssUrl["none"] = "none";
|
|
28
28
|
})(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
|
|
29
|
-
var InlineStyleLanguage;
|
|
30
|
-
(function (InlineStyleLanguage) {
|
|
31
|
-
InlineStyleLanguage["sass"] = "sass";
|
|
32
|
-
InlineStyleLanguage["scss"] = "scss";
|
|
33
|
-
InlineStyleLanguage["css"] = "css";
|
|
34
|
-
InlineStyleLanguage["less"] = "less";
|
|
35
|
-
})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
|
|
36
29
|
class StylesheetProcessor {
|
|
37
30
|
constructor(basePath, cssUrl, includePaths, cacheDirectory, watch, tailwindConfig) {
|
|
38
31
|
// By default, browserslist defaults are too inclusive
|