@nrwl/angular 15.5.1 → 15.5.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 +1 -1
- package/migrations.json +13 -0
- package/package.json +18 -10
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +2 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +15 -19
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js +27 -4
- package/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.js.map +1 -1
- package/src/executors/utilities/angular-version-utils.d.ts +3 -2
- package/src/executors/utilities/angular-version-utils.js +7 -3
- package/src/executors/utilities/angular-version-utils.js.map +1 -1
- package/src/generators/add-linting/add-linting.js +2 -2
- package/src/generators/add-linting/add-linting.js.map +1 -1
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js +4 -4
- package/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.js.map +1 -1
- package/src/generators/add-linting/schema.json +10 -5
- package/src/generators/application/angular-v14/lib/update-config-files.js +3 -0
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/application.d.ts +1 -1
- package/src/generators/application/application.js +9 -4
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/schema.json +13 -7
- package/src/generators/change-storybook-targets/schema.json +2 -1
- package/src/generators/component/component.js +2 -2
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/schema.json +6 -3
- package/src/generators/component-cypress-spec/schema.json +12 -6
- package/src/generators/component-story/schema.json +10 -5
- package/src/generators/component-test/schema.json +10 -5
- package/src/generators/convert-to-with-mf/schema.json +2 -1
- package/src/generators/convert-tslint-to-eslint/schema.json +4 -2
- package/src/generators/cypress-component-configuration/schema.json +6 -3
- package/src/generators/downgrade-module/schema.json +8 -4
- package/src/generators/host/host.js +2 -2
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.json +10 -5
- package/src/generators/init/angular-v14/init.js +24 -23
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +2 -2
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.json +12 -6
- package/src/generators/karma/angular-v14/karma.js +10 -10
- package/src/generators/karma/angular-v14/karma.js.map +1 -1
- package/src/generators/karma/karma.js +2 -2
- package/src/generators/karma/karma.js.map +1 -1
- package/src/generators/karma/schema.json +2 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +6 -0
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/karma-project/lib/update-tsconfig.js +4 -2
- package/src/generators/karma-project/lib/update-tsconfig.js.map +1 -1
- package/src/generators/karma-project/lib/update-workspace-config.js +5 -5
- package/src/generators/karma-project/lib/update-workspace-config.js.map +1 -1
- package/src/generators/karma-project/lib/v14-test-file.d.ts +3 -0
- package/src/generators/karma-project/lib/v14-test-file.js +29 -0
- package/src/generators/karma-project/lib/v14-test-file.js.map +1 -0
- package/src/generators/karma-project/schema.json +6 -3
- package/src/generators/library/library.js +6 -9
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +18 -9
- package/src/generators/library-secondary-entry-point/schema.json +4 -2
- package/src/generators/move/schema.json +6 -3
- package/src/generators/ng-add/schema.json +14 -7
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.actions.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.effects.spec.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.effects.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.facade.spec.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.facade.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.models.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.reducer.spec.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.reducer.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.selectors.spec.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/{__directory__ → latest/__directory__}/__fileName__.selectors.ts__tmpl__ +0 -0
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +22 -0
- package/src/generators/ngrx/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +27 -0
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.js +12 -8
- package/src/generators/ngrx/lib/add-ngrx-to-package-json.js.map +1 -1
- package/src/generators/ngrx/lib/generate-files.js +7 -1
- package/src/generators/ngrx/lib/generate-files.js.map +1 -1
- package/src/generators/ngrx/lib/index.d.ts +1 -0
- package/src/generators/ngrx/lib/index.js +3 -1
- package/src/generators/ngrx/lib/index.js.map +1 -1
- package/src/generators/ngrx/lib/normalize-options.js +1 -1
- package/src/generators/ngrx/lib/normalize-options.js.map +1 -1
- package/src/generators/ngrx/lib/validate-options.d.ts +3 -0
- package/src/generators/ngrx/lib/validate-options.js +39 -0
- package/src/generators/ngrx/lib/validate-options.js.map +1 -0
- package/src/generators/ngrx/ngrx.js +1 -9
- package/src/generators/ngrx/ngrx.js.map +1 -1
- package/src/generators/ngrx/schema.json +12 -7
- package/src/generators/remote/remote.js +2 -2
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +6 -3
- package/src/generators/scam/schema.json +6 -3
- package/src/generators/scam-directive/schema.json +8 -4
- package/src/generators/scam-pipe/schema.json +8 -4
- package/src/generators/scam-to-standalone/scam-to-standalone.js +7 -0
- package/src/generators/scam-to-standalone/scam-to-standalone.js.map +1 -1
- package/src/generators/scam-to-standalone/schema.json +7 -4
- package/src/generators/setup-mf/schema.json +6 -3
- package/src/generators/setup-mf/setup-mf.js +2 -2
- package/src/generators/setup-mf/setup-mf.js.map +1 -1
- package/src/generators/setup-ssr/schema.json +2 -1
- package/src/generators/setup-ssr/setup-ssr.js +7 -14
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/setup-tailwind/schema.json +4 -2
- package/src/generators/stories/schema.json +6 -3
- package/src/generators/storybook-configuration/schema.json +2 -1
- package/src/generators/upgrade-module/schema.json +10 -5
- package/src/generators/utils/create-ts-config.js +2 -2
- package/src/generators/utils/create-ts-config.js.map +1 -1
- package/src/generators/utils/{angular-version-utils.d.ts → version-utils.d.ts} +4 -0
- package/src/generators/utils/{angular-version-utils.js → version-utils.js} +13 -2
- package/src/generators/utils/version-utils.js.map +1 -0
- package/src/generators/web-worker/schema.json +6 -3
- package/src/utils/backward-compatible-versions.d.ts +6 -0
- package/src/utils/backward-compatible-versions.js +41 -0
- package/src/utils/backward-compatible-versions.js.map +1 -0
- package/src/utils/nx-devkit/route-utils.js +1 -1
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/version-utils.d.ts +3 -0
- package/src/utils/version-utils.js +22 -0
- package/src/utils/version-utils.js.map +1 -0
- package/src/utils/versions.d.ts +1 -38
- package/src/utils/versions.js +2 -39
- package/src/utils/versions.js.map +1 -1
- package/src/generators/utils/angular-version-utils.js.map +0 -1
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.5.
|
|
6
|
+
## [15.5.3](https://github.com/nrwl/nx/compare/15.5.2...15.5.3) (2023-01-20)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/migrations.json
CHANGED
|
@@ -1757,6 +1757,19 @@
|
|
|
1757
1757
|
"alwaysAddToPackageJson": false
|
|
1758
1758
|
}
|
|
1759
1759
|
}
|
|
1760
|
+
},
|
|
1761
|
+
"15.5.2": {
|
|
1762
|
+
"version": "15.5.2-beta.0",
|
|
1763
|
+
"packages": {
|
|
1764
|
+
"@nguniversal/builders": {
|
|
1765
|
+
"version": "~15.1.0",
|
|
1766
|
+
"alwaysAddToPackageJson": false
|
|
1767
|
+
},
|
|
1768
|
+
"@nguniversal/express-engine": {
|
|
1769
|
+
"version": "~15.1.0",
|
|
1770
|
+
"alwaysAddToPackageJson": false
|
|
1771
|
+
}
|
|
1772
|
+
}
|
|
1760
1773
|
}
|
|
1761
1774
|
}
|
|
1762
1775
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.5.
|
|
3
|
+
"version": "15.5.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"repository": {
|
|
@@ -67,16 +67,15 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.1.0",
|
|
70
|
-
"@
|
|
71
|
-
"@nrwl/
|
|
72
|
-
"@nrwl/
|
|
73
|
-
"@nrwl/
|
|
74
|
-
"@nrwl/
|
|
75
|
-
"@nrwl/
|
|
76
|
-
"@nrwl/workspace": "15.5.1",
|
|
70
|
+
"@nrwl/cypress": "15.5.3",
|
|
71
|
+
"@nrwl/devkit": "15.5.3",
|
|
72
|
+
"@nrwl/jest": "15.5.3",
|
|
73
|
+
"@nrwl/linter": "15.5.3",
|
|
74
|
+
"@nrwl/webpack": "15.5.3",
|
|
75
|
+
"@nrwl/workspace": "15.5.3",
|
|
77
76
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
77
|
"@schematics/angular": "~15.1.0",
|
|
79
|
-
"chalk": "4.1.0",
|
|
78
|
+
"chalk": "^4.1.0",
|
|
80
79
|
"chokidar": "^3.5.1",
|
|
81
80
|
"http-server": "^14.1.0",
|
|
82
81
|
"ignore": "^5.0.4",
|
|
@@ -89,6 +88,15 @@
|
|
|
89
88
|
"webpack": "^5.75.0",
|
|
90
89
|
"webpack-merge": "5.7.3"
|
|
91
90
|
},
|
|
91
|
+
"peerDependencies": {
|
|
92
|
+
"@nguniversal/builders": "~15.1.0",
|
|
93
|
+
"rxjs": "^6.5.3 || ^7.5.0"
|
|
94
|
+
},
|
|
95
|
+
"peerDependenciesMeta": {
|
|
96
|
+
"@nguniversal/builders": {
|
|
97
|
+
"optional": true
|
|
98
|
+
}
|
|
99
|
+
},
|
|
92
100
|
"publishConfig": {
|
|
93
101
|
"access": "public"
|
|
94
102
|
},
|
|
@@ -99,5 +107,5 @@
|
|
|
99
107
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
100
108
|
"typings": "index.d.ts",
|
|
101
109
|
"sideEffects": false,
|
|
102
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "7285ee50fca7136f38ce159ef3ed2977b8e7816a"
|
|
103
111
|
}
|
|
@@ -12,9 +12,10 @@ const lib_1 = require("./lib");
|
|
|
12
12
|
const buildable_libs_1 = require("../utilities/buildable-libs");
|
|
13
13
|
const rxjs_1 = require("rxjs");
|
|
14
14
|
const operators_2 = require("rxjs/operators");
|
|
15
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
15
16
|
function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
16
17
|
var _a, _b, _c, _d, _e;
|
|
17
|
-
process.env.NX_TSCONFIG_PATH = (0,
|
|
18
|
+
process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
|
|
18
19
|
const options = (0, lib_1.normalizeOptions)(rawOptions);
|
|
19
20
|
const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
|
|
20
21
|
const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAIsB;AACtB,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAAgE;AAChE,+BAAyC;AAEzC,gEAAgF;AAChF,+BAA4B;AAC5B,8CAA2C;
|
|
1
|
+
{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,36 +80,32 @@ function copyAssets(graph, entryPointNode, ngPackageNode) {
|
|
|
80
80
|
`${ngPackage.dest}/**`,
|
|
81
81
|
];
|
|
82
82
|
const assets = [];
|
|
83
|
-
for (const
|
|
84
|
-
|
|
85
|
-
if (typeof
|
|
86
|
-
asset
|
|
87
|
-
asset.input = path.join(ngPackage.src, item.input);
|
|
88
|
-
asset.output = path.join(ngPackage.dest, item.output);
|
|
89
|
-
asset.ignore = item.ignore;
|
|
83
|
+
for (const assetPath of ngPackage.assets) {
|
|
84
|
+
let asset;
|
|
85
|
+
if (typeof assetPath === 'object') {
|
|
86
|
+
asset = Object.assign({}, assetPath);
|
|
90
87
|
}
|
|
91
88
|
else {
|
|
92
|
-
const
|
|
93
|
-
const assetFullPath = path.join(ngPackage.src, assetPath);
|
|
94
|
-
const [isDir, isFile] = yield (0, fs_1.stat)(assetFullPath)
|
|
89
|
+
const [isDir, isFile] = yield (0, fs_1.stat)(path.join(ngPackage.src, assetPath))
|
|
95
90
|
.then((stats) => [stats.isDirectory(), stats.isFile()])
|
|
96
91
|
.catch(() => [false, false]);
|
|
97
92
|
if (isDir) {
|
|
98
|
-
asset
|
|
99
|
-
asset.input = assetFullPath;
|
|
100
|
-
asset.output = path.join(ngPackage.dest, assetPath);
|
|
93
|
+
asset = { glob: '**/*', input: assetPath, output: assetPath };
|
|
101
94
|
}
|
|
102
95
|
else if (isFile) {
|
|
103
|
-
|
|
104
|
-
asset
|
|
105
|
-
|
|
96
|
+
// filenames are their own glob
|
|
97
|
+
asset = {
|
|
98
|
+
glob: path.basename(assetPath),
|
|
99
|
+
input: path.dirname(assetPath),
|
|
100
|
+
output: path.dirname(assetPath),
|
|
101
|
+
};
|
|
106
102
|
}
|
|
107
103
|
else {
|
|
108
|
-
asset
|
|
109
|
-
asset.input = ngPackage.src;
|
|
110
|
-
asset.output = ngPackage.dest;
|
|
104
|
+
asset = { glob: assetPath, input: '/', output: '/' };
|
|
111
105
|
}
|
|
112
106
|
}
|
|
107
|
+
asset.input = path.join(ngPackage.src, asset.input);
|
|
108
|
+
asset.output = path.join(ngPackage.dest, asset.output);
|
|
113
109
|
const isAncestorPath = (target, datum) => path.relative(datum, target).startsWith('..');
|
|
114
110
|
if (isAncestorPath(asset.input, ngPackage.src)) {
|
|
115
111
|
throw new Error('Cannot read assets from a location outside of the project root.');
|
|
@@ -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":"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
|
|
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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"}
|
|
@@ -13,9 +13,12 @@ const node_1 = require("ng-packagr/lib/graph/node");
|
|
|
13
13
|
const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
|
|
14
14
|
const path_1 = require("ng-packagr/lib/utils/path");
|
|
15
15
|
const path = require("path");
|
|
16
|
+
const semver_1 = require("semver");
|
|
16
17
|
const ts = require("typescript");
|
|
18
|
+
const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
|
|
17
19
|
function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionCache, stylesheetProcessor, inlineStyleLanguage, sourcesFileCache = entryPoint.cache.sourcesFileCache) {
|
|
18
20
|
const compilerHost = ts.createIncrementalCompilerHost(compilerOptions);
|
|
21
|
+
const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
|
|
19
22
|
const getNode = (fileName) => {
|
|
20
23
|
const nodeUri = (0, nodes_1.fileUrl)((0, path_1.ensureUnixPath)(fileName));
|
|
21
24
|
let node = graph.get(nodeUri);
|
|
@@ -72,10 +75,30 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
|
|
|
72
75
|
else {
|
|
73
76
|
fileName = fileName.replace(/\.js(\.map)?$/, '.mjs$1');
|
|
74
77
|
const outputCache = entryPoint.cache.outputCache;
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
78
|
+
// added in https://github.com/ng-packagr/ng-packagr/pull/2502, first released in 15.0.2
|
|
79
|
+
if ((0, semver_1.gte)(ngPackagrVersion, '15.0.2')) {
|
|
80
|
+
// Extract inline sourcemap which will later be used by rollup.
|
|
81
|
+
const version = (0, crypto_1.createHash)('sha256').update(data).digest('hex');
|
|
82
|
+
let map = undefined;
|
|
83
|
+
if (fileName.endsWith('.mjs')) {
|
|
84
|
+
const cachedData = outputCache.get(fileName);
|
|
85
|
+
map =
|
|
86
|
+
(cachedData === null || cachedData === void 0 ? void 0 : cachedData.version) === version
|
|
87
|
+
? cachedData.map
|
|
88
|
+
: require('convert-source-map').fromComment(data).toJSON();
|
|
89
|
+
}
|
|
90
|
+
outputCache.set(fileName, {
|
|
91
|
+
content: data,
|
|
92
|
+
version,
|
|
93
|
+
map,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
outputCache.set(fileName, {
|
|
98
|
+
content: data,
|
|
99
|
+
version: (0, crypto_1.createHash)('sha256').update(data).digest('hex'),
|
|
100
|
+
});
|
|
101
|
+
}
|
|
79
102
|
}
|
|
80
103
|
compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);
|
|
81
104
|
}, readFile: (fileName) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAGH,mCAAoC;AAGpC,oDAAiD;AACjD,2DAA0E;AAC1E,oDAA2D;AAE3D,6BAA6B;AAC7B,iCAAiC;
|
|
1
|
+
{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ts/cache-compiler-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
declare type
|
|
1
|
+
declare type VersionInfo = {
|
|
2
2
|
major: number;
|
|
3
3
|
version: string;
|
|
4
4
|
};
|
|
5
|
-
export declare function getInstalledAngularVersionInfo():
|
|
5
|
+
export declare function getInstalledAngularVersionInfo(): VersionInfo | null;
|
|
6
|
+
export declare function getInstalledPackageVersionInfo(pkgName: string): VersionInfo | null;
|
|
6
7
|
export {};
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getInstalledAngularVersionInfo = void 0;
|
|
3
|
+
exports.getInstalledPackageVersionInfo = exports.getInstalledAngularVersionInfo = void 0;
|
|
4
4
|
const package_json_1 = require("nx/src/utils/package-json");
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
6
|
function getInstalledAngularVersionInfo() {
|
|
7
|
+
return getInstalledPackageVersionInfo('@angular/core');
|
|
8
|
+
}
|
|
9
|
+
exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
|
|
10
|
+
function getInstalledPackageVersionInfo(pkgName) {
|
|
7
11
|
try {
|
|
8
|
-
const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)(
|
|
12
|
+
const { packageJson: { version }, } = (0, package_json_1.readModulePackageJson)(pkgName);
|
|
9
13
|
return { major: (0, semver_1.major)(version), version };
|
|
10
14
|
}
|
|
11
15
|
catch (_a) {
|
|
12
16
|
return null;
|
|
13
17
|
}
|
|
14
18
|
}
|
|
15
|
-
exports.
|
|
19
|
+
exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
|
|
16
20
|
//# sourceMappingURL=angular-version-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/angular-version-utils.ts"],"names":[],"mappings":";;;AAAA,4DAAkE;AAClE,mCAA+B;AAI/B,SAAgB,8BAA8B;IAC5C,IAAI;QACF,MAAM,EACJ,WAAW,EAAE,EAAE,OAAO,EAAE,GACzB,GAAG,IAAA,oCAAqB,EAAC,
|
|
1
|
+
{"version":3,"file":"angular-version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/angular-version-utils.ts"],"names":[],"mappings":";;;AAAA,4DAAkE;AAClE,mCAA+B;AAI/B,SAAgB,8BAA8B;IAC5C,OAAO,8BAA8B,CAAC,eAAe,CAAC,CAAC;AACzD,CAAC;AAFD,wEAEC;AAED,SAAgB,8BAA8B,CAC5C,OAAe;IAEf,IAAI;QACF,MAAM,EACJ,WAAW,EAAE,EAAE,OAAO,EAAE,GACzB,GAAG,IAAA,oCAAqB,EAAC,OAAO,CAAC,CAAC;QAEnC,OAAO,EAAE,KAAK,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;KAC3C;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAZD,wEAYC"}
|
|
@@ -7,12 +7,12 @@ const linter_1 = require("@nrwl/linter");
|
|
|
7
7
|
const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
|
|
8
8
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
9
|
const path_1 = require("path");
|
|
10
|
-
const
|
|
10
|
+
const version_utils_1 = require("../utils/version-utils");
|
|
11
11
|
const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
|
|
12
12
|
const create_eslint_configuration_1 = require("./lib/create-eslint-configuration");
|
|
13
13
|
function addLintingGenerator(tree, options) {
|
|
14
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
-
const generatorDirectory = (0,
|
|
15
|
+
const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
16
16
|
if (generatorDirectory) {
|
|
17
17
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'add-linting')));
|
|
18
18
|
yield previousGenerator.default(tree, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,yCAA4D;AAC5D,wFAAuF;AACvF,2FAAqF;AACrF,+BAA4B;AAC5B,0DAAyF;AACzF,2FAAqF;AACrF,mFAA4E;AAG5E,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAkC;;QAElC,MAAM,kBAAkB,GACtB,IAAA,+DAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,aAAa,CAAC,EACnD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO;SACR;QAED,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,GAAG,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;aAC5D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE;gBAClB,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;gBACtD,IAAA,6BAAc,EAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC;aACzD;YACD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,qDAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,CACjD,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,8DAA4B,EAAC,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA7CD,kDA6CC;AAED,kBAAe,mBAAmB,CAAC"}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addAngularEsLintDependencies = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const backward_compatible_versions_1 = require("../../../../utils/backward-compatible-versions");
|
|
6
6
|
function addAngularEsLintDependencies(tree) {
|
|
7
7
|
return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
8
|
-
'@angular-eslint/eslint-plugin':
|
|
9
|
-
'@angular-eslint/eslint-plugin-template':
|
|
10
|
-
'@angular-eslint/template-parser':
|
|
8
|
+
'@angular-eslint/eslint-plugin': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularEslintVersion,
|
|
9
|
+
'@angular-eslint/eslint-plugin-template': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularEslintVersion,
|
|
10
|
+
'@angular-eslint/template-parser': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularEslintVersion,
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
13
|
exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/add-linting/angular-v14/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,iGAA4F;AAE5F,SAAgB,4BAA4B,CAAC,IAAU;IACrD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAC7B,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;QAC5D,wCAAwC,EACtC,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;QAC5D,iCAAiC,EAC/B,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;KAC7D,CACF,CAAC;AACJ,CAAC;AAbD,oEAaC"}
|
|
@@ -15,15 +15,18 @@
|
|
|
15
15
|
"prefix": {
|
|
16
16
|
"type": "string",
|
|
17
17
|
"format": "html-selector",
|
|
18
|
-
"description": "The prefix to apply to generated selectors."
|
|
18
|
+
"description": "The prefix to apply to generated selectors.",
|
|
19
|
+
"x-priority": "important"
|
|
19
20
|
},
|
|
20
21
|
"projectName": {
|
|
21
22
|
"type": "string",
|
|
22
|
-
"description": "The name of the project."
|
|
23
|
+
"description": "The name of the project.",
|
|
24
|
+
"x-priority": "important"
|
|
23
25
|
},
|
|
24
26
|
"projectRoot": {
|
|
25
27
|
"type": "string",
|
|
26
|
-
"description": "The path to the root of the selected project."
|
|
28
|
+
"description": "The path to the root of the selected project.",
|
|
29
|
+
"x-priority": "important"
|
|
27
30
|
},
|
|
28
31
|
"setParserOptionsProject": {
|
|
29
32
|
"type": "boolean",
|
|
@@ -33,12 +36,14 @@
|
|
|
33
36
|
"skipFormat": {
|
|
34
37
|
"type": "boolean",
|
|
35
38
|
"description": "Skip formatting files.",
|
|
36
|
-
"default": false
|
|
39
|
+
"default": false,
|
|
40
|
+
"x-priority": "internal"
|
|
37
41
|
},
|
|
38
42
|
"skipPackageJson": {
|
|
39
43
|
"type": "boolean",
|
|
40
44
|
"default": false,
|
|
41
|
-
"description": "Do not add dependencies to `package.json`."
|
|
45
|
+
"description": "Do not add dependencies to `package.json`.",
|
|
46
|
+
"x-priority": "internal"
|
|
42
47
|
}
|
|
43
48
|
},
|
|
44
49
|
"additionalProperties": false,
|
|
@@ -70,5 +70,8 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
70
70
|
(0, devkit_1.removeProjectConfiguration)(host, options.e2eProjectName);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
+
// delete some default test configs
|
|
74
|
+
host.delete(`${options.appProjectRoot}/karma.conf.js`);
|
|
75
|
+
host.delete(`${options.appProjectRoot}/src/test.ts`);
|
|
73
76
|
}
|
|
74
77
|
//# sourceMappingURL=update-config-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-config-files.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Schema } from './schema';
|
|
3
|
-
export declare function applicationGenerator(tree: Tree, schema: Partial<Schema>): Promise<
|
|
3
|
+
export declare function applicationGenerator(tree: Tree, schema: Partial<Schema>): Promise<any>;
|
|
4
4
|
export default applicationGenerator;
|
|
@@ -9,15 +9,20 @@ const path_1 = require("path");
|
|
|
9
9
|
const test_runners_1 = require("../../utils/test-runners");
|
|
10
10
|
const init_1 = require("../init/init");
|
|
11
11
|
const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
|
|
12
|
-
const
|
|
12
|
+
const version_utils_1 = require("../utils/version-utils");
|
|
13
13
|
const lib_1 = require("./lib");
|
|
14
|
+
const semver_1 = require("semver");
|
|
14
15
|
function applicationGenerator(tree, schema) {
|
|
15
16
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const
|
|
17
|
+
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
18
|
+
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
|
|
19
|
+
throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
|
|
20
|
+
You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
|
|
21
|
+
}
|
|
22
|
+
const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
|
|
17
23
|
if (generatorDirectory) {
|
|
18
24
|
let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'application')));
|
|
19
|
-
yield previousGenerator.default(tree, schema);
|
|
20
|
-
return;
|
|
25
|
+
return yield previousGenerator.default(tree, schema);
|
|
21
26
|
}
|
|
22
27
|
const options = (0, lib_1.normalizeOptions)(tree, schema);
|
|
23
28
|
yield (0, init_1.angularInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
},
|
|
19
19
|
"directory": {
|
|
20
20
|
"description": "The directory of the new application.",
|
|
21
|
-
"type": "string"
|
|
21
|
+
"type": "string",
|
|
22
|
+
"x-priority": "important"
|
|
22
23
|
},
|
|
23
24
|
"style": {
|
|
24
25
|
"description": "The file extension to be used for style files.",
|
|
@@ -52,7 +53,8 @@
|
|
|
52
53
|
"type": "boolean",
|
|
53
54
|
"description": "Generate a routing module.",
|
|
54
55
|
"default": false,
|
|
55
|
-
"x-prompt": "Would you like to configure routing for this application?"
|
|
56
|
+
"x-prompt": "Would you like to configure routing for this application?",
|
|
57
|
+
"x-priority": "important"
|
|
56
58
|
},
|
|
57
59
|
"inlineStyle": {
|
|
58
60
|
"description": "Specifies if the style will be in the ts file.",
|
|
@@ -86,12 +88,14 @@
|
|
|
86
88
|
"skipFormat": {
|
|
87
89
|
"description": "Skip formatting files.",
|
|
88
90
|
"type": "boolean",
|
|
89
|
-
"default": false
|
|
91
|
+
"default": false,
|
|
92
|
+
"x-priority": "internal"
|
|
90
93
|
},
|
|
91
94
|
"skipPackageJson": {
|
|
92
95
|
"type": "boolean",
|
|
93
96
|
"default": false,
|
|
94
|
-
"description": "Do not add dependencies to `package.json`."
|
|
97
|
+
"description": "Do not add dependencies to `package.json`.",
|
|
98
|
+
"x-priority": "internal"
|
|
95
99
|
},
|
|
96
100
|
"unitTestRunner": {
|
|
97
101
|
"type": "string",
|
|
@@ -126,7 +130,8 @@
|
|
|
126
130
|
},
|
|
127
131
|
"standaloneConfig": {
|
|
128
132
|
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
129
|
-
"type": "boolean"
|
|
133
|
+
"type": "boolean",
|
|
134
|
+
"x-priority": "internal"
|
|
130
135
|
},
|
|
131
136
|
"port": {
|
|
132
137
|
"type": "number",
|
|
@@ -143,7 +148,7 @@
|
|
|
143
148
|
"default": false
|
|
144
149
|
},
|
|
145
150
|
"standalone": {
|
|
146
|
-
"description": "Generate an application that is setup to use standalone components.",
|
|
151
|
+
"description": "Generate an application that is setup to use standalone components. _Note: This is only supported in Angular versions >= 14.1.0_",
|
|
147
152
|
"type": "boolean",
|
|
148
153
|
"default": false
|
|
149
154
|
},
|
|
@@ -151,7 +156,8 @@
|
|
|
151
156
|
"description": "Create an application at the root of the workspace.",
|
|
152
157
|
"type": "boolean",
|
|
153
158
|
"default": false,
|
|
154
|
-
"hidden": true
|
|
159
|
+
"hidden": true,
|
|
160
|
+
"x-priority": "internal"
|
|
155
161
|
}
|
|
156
162
|
},
|
|
157
163
|
"additionalProperties": false,
|
|
@@ -7,11 +7,11 @@ const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
|
|
|
7
7
|
const path_1 = require("../utils/path");
|
|
8
8
|
const component_1 = require("./lib/component");
|
|
9
9
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
10
|
-
const
|
|
10
|
+
const version_utils_1 = require("../utils/version-utils");
|
|
11
11
|
const semver_1 = require("semver");
|
|
12
12
|
function componentGenerator(tree, rawOptions) {
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const installedAngularVersionInfo = (0,
|
|
14
|
+
const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
15
15
|
if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') &&
|
|
16
16
|
rawOptions.standalone) {
|
|
17
17
|
throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
|