@nrwl/angular 13.10.0-beta.8 → 13.10.0-beta.9
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/generators.json +2 -4
- package/package.json +6 -6
- package/src/executors/utilities/tailwindcss.js +2 -2
- package/src/executors/utilities/tailwindcss.js.map +1 -1
- package/src/generators/mfe-host/schema.json +7 -11
- package/src/generators/move/lib/update-ng-package.js +1 -1
- package/src/generators/move/lib/update-ng-package.js.map +1 -1
- package/src/utils/mfe/mfe-webpack.js +2 -2
- package/src/utils/mfe/mfe-webpack.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/generators.json
CHANGED
|
@@ -30,8 +30,7 @@
|
|
|
30
30
|
"component-story": {
|
|
31
31
|
"factory": "./src/generators/component-story/compat",
|
|
32
32
|
"schema": "./src/generators/component-story/schema.json",
|
|
33
|
-
"description": "Creates a `stories.ts` file for a component."
|
|
34
|
-
"hidden": true
|
|
33
|
+
"description": "Creates a `stories.ts` file for a component."
|
|
35
34
|
},
|
|
36
35
|
"convert-tslint-to-eslint": {
|
|
37
36
|
"factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionSchematic",
|
|
@@ -190,8 +189,7 @@
|
|
|
190
189
|
"component-story": {
|
|
191
190
|
"factory": "./src/generators/component-story/component-story",
|
|
192
191
|
"schema": "./src/generators/component-story/schema.json",
|
|
193
|
-
"description": "Creates a stories.ts file for a component."
|
|
194
|
-
"hidden": true
|
|
192
|
+
"description": "Creates a stories.ts file for a component."
|
|
195
193
|
},
|
|
196
194
|
"convert-tslint-to-eslint": {
|
|
197
195
|
"factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "13.10.0-beta.
|
|
3
|
+
"version": "13.10.0-beta.9",
|
|
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",
|
|
@@ -65,11 +65,11 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~13.3.0",
|
|
68
|
-
"@nrwl/cypress": "13.10.0-beta.
|
|
69
|
-
"@nrwl/devkit": "13.10.0-beta.
|
|
70
|
-
"@nrwl/jest": "13.10.0-beta.
|
|
71
|
-
"@nrwl/linter": "13.10.0-beta.
|
|
72
|
-
"@nrwl/storybook": "13.10.0-beta.
|
|
68
|
+
"@nrwl/cypress": "13.10.0-beta.9",
|
|
69
|
+
"@nrwl/devkit": "13.10.0-beta.9",
|
|
70
|
+
"@nrwl/jest": "13.10.0-beta.9",
|
|
71
|
+
"@nrwl/linter": "13.10.0-beta.9",
|
|
72
|
+
"@nrwl/storybook": "13.10.0-beta.9",
|
|
73
73
|
"@schematics/angular": "~13.3.0",
|
|
74
74
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
75
75
|
"ignore": "^5.0.4",
|
|
@@ -19,7 +19,7 @@ function getTailwindSetup(basePath, tailwindConfig) {
|
|
|
19
19
|
if (!tailwindConfigPath) {
|
|
20
20
|
// Try to find TailwindCSS configuration file in the project or workspace root.
|
|
21
21
|
const tailwindConfigFile = 'tailwind.config.js';
|
|
22
|
-
for (const path of [basePath, devkit_2.
|
|
22
|
+
for (const path of [basePath, devkit_2.workspaceRoot]) {
|
|
23
23
|
const fullPath = (0, path_1.join)(path, tailwindConfigFile);
|
|
24
24
|
if ((0, fs_1.existsSync)(fullPath)) {
|
|
25
25
|
tailwindConfigPath = fullPath;
|
|
@@ -36,7 +36,7 @@ function getTailwindSetup(basePath, tailwindConfig) {
|
|
|
36
36
|
tailwindPackagePath = require.resolve('tailwindcss');
|
|
37
37
|
}
|
|
38
38
|
catch (_a) {
|
|
39
|
-
const relativeTailwindConfigPath = (0, path_1.relative)(devkit_2.
|
|
39
|
+
const relativeTailwindConfigPath = (0, path_1.relative)(devkit_2.workspaceRoot, tailwindConfigPath);
|
|
40
40
|
devkit_1.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
|
|
41
41
|
` but the 'tailwindcss' package is not installed.` +
|
|
42
42
|
` To enable Tailwind CSS, please install the 'tailwindcss' package.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,yCAA6C;AAC7C,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAOnC,QAAA,kBAAkB,GAAG;IAChC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,aAAa;IACb,SAAS;CACV,CAAC;AAEF,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,cAAuB;IAEvB,IAAI,kBAAkB,GAAG,cAAc,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,+EAA+E;QAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAa,CAAC,EAAE;YAC5C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;gBACxB,kBAAkB,GAAG,QAAQ,CAAC;gBAC9B,MAAM;aACP;SACF;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAa,EACb,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,SAAS,CAAC;KAClB;IAED,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;AACrD,CAAC;AA7CD,4CA6CC;AAED,SAAgB,yBAAyB,CACvC,EAAE,kBAAkB,EAAE,mBAAmB,EAAiB,EAC1D,YAAuB,EACvB,KAAe;IAEf,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACzE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AAhBD,8DAgBC"}
|
|
@@ -2,35 +2,31 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxMFEHost",
|
|
4
4
|
"cli": "nx",
|
|
5
|
-
"title": "Nx MFE Host
|
|
5
|
+
"title": "Nx MFE Host Application",
|
|
6
6
|
"description": "Create an Angular Host Micro Frontend Application",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
10
|
"command": "nx g @nrwl/angular:mfe-host appName --remotes=remote1",
|
|
11
|
-
"description": "Create an Angular
|
|
11
|
+
"description": "Create an Angular application with configuration in place for MFE. If the `remotes` option is provided, attach the remote application to this application's configuration"
|
|
12
12
|
}
|
|
13
13
|
],
|
|
14
14
|
"properties": {
|
|
15
15
|
"name": {
|
|
16
16
|
"type": "string",
|
|
17
|
-
"description": "The name to give to the host Angular
|
|
17
|
+
"description": "The name to give to the host Angular application.",
|
|
18
18
|
"$default": {
|
|
19
19
|
"$source": "argv",
|
|
20
20
|
"index": 0
|
|
21
21
|
}
|
|
22
22
|
},
|
|
23
|
-
"
|
|
24
|
-
"type": "
|
|
25
|
-
"description": "The
|
|
26
|
-
},
|
|
27
|
-
"port": {
|
|
28
|
-
"type": "number",
|
|
29
|
-
"description": "The port on which this app should be served."
|
|
23
|
+
"remotes": {
|
|
24
|
+
"type": "array",
|
|
25
|
+
"description": "The names of the remote applications to add to the host."
|
|
30
26
|
},
|
|
31
27
|
"dynamic": {
|
|
32
28
|
"type": "boolean",
|
|
33
|
-
"description": "Should the host
|
|
29
|
+
"description": "Should the host application use dynamic federation?",
|
|
34
30
|
"default": false
|
|
35
31
|
}
|
|
36
32
|
},
|
|
@@ -16,7 +16,7 @@ function updateNgPackage(tree, schema) {
|
|
|
16
16
|
if (!tree.exists(ngPackagePath)) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.
|
|
19
|
+
const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_2.workspaceRoot, project.root), devkit_2.workspaceRoot);
|
|
20
20
|
let output = `dist/${project.root}`;
|
|
21
21
|
if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
22
22
|
output = project.targets.build.outputs[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,yCAA6C;AAC7C,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAAC;IAC9E,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAvBD,0CAuBC"}
|
|
@@ -24,7 +24,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
24
24
|
const pathMappings = [];
|
|
25
25
|
for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
|
|
26
26
|
if (libraries && libraries.includes(key)) {
|
|
27
|
-
const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(devkit_1.
|
|
27
|
+
const pathToLib = (0, devkit_1.normalizePath)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, paths[0]));
|
|
28
28
|
pathMappings.push({
|
|
29
29
|
name: key,
|
|
30
30
|
path: pathToLib,
|
|
@@ -51,7 +51,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath) {
|
|
|
51
51
|
}
|
|
52
52
|
exports.shareWorkspaceLibraries = shareWorkspaceLibraries;
|
|
53
53
|
function sharePackages(packages) {
|
|
54
|
-
const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.
|
|
54
|
+
const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
|
|
55
55
|
if (!(0, fs_1.existsSync)(pkgJsonPath)) {
|
|
56
56
|
throw new Error('NX MFE: Could not find root package.json to determine dependency versions.');
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,qCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"mfe-webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mfe/mfe-webpack.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.10.0-beta.
|
|
4
|
+
exports.nxVersion = '13.10.0-beta.9';
|
|
5
5
|
exports.angularVersion = '~13.3.0';
|
|
6
6
|
exports.angularDevkitVersion = '~13.3.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|