@nrwl/angular 12.10.0-beta.1 → 12.10.0-beta.2
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/migrations.json +9 -0
- package/package.json +7 -7
- package/src/builders/webpack-browser/webpack-browser.impl.js +14 -3
- package/src/builders/webpack-browser/webpack-browser.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js +15 -3
- package/src/builders/webpack-server/webpack-server.impl.js.map +1 -1
- package/src/generators/application/lib/add-e2e.js +1 -0
- package/src/generators/application/lib/add-e2e.js.map +1 -1
- package/src/generators/application/lib/update-component-template.js +1 -1
- package/src/generators/application/lib/update-component-template.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +5 -0
- package/src/generators/move/lib/update-ng-package.d.ts +3 -0
- package/src/generators/move/lib/update-ng-package.js +30 -0
- package/src/generators/move/lib/update-ng-package.js.map +1 -0
- package/src/generators/move/move.js +2 -0
- package/src/generators/move/move.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/migrations.json
CHANGED
|
@@ -867,6 +867,15 @@
|
|
|
867
867
|
"alwaysAddToPackageJson": false
|
|
868
868
|
}
|
|
869
869
|
}
|
|
870
|
+
},
|
|
871
|
+
"12.10.0-beta.1": {
|
|
872
|
+
"version": "12.10.0-beta.1",
|
|
873
|
+
"packages": {
|
|
874
|
+
"jasmine-marbles": {
|
|
875
|
+
"version": "~0.8.4",
|
|
876
|
+
"alwaysAddToPackageJson": false
|
|
877
|
+
}
|
|
878
|
+
}
|
|
870
879
|
}
|
|
871
880
|
}
|
|
872
881
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "12.10.0-beta.
|
|
3
|
+
"version": "12.10.0-beta.2",
|
|
4
4
|
"description": "Angular Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -35,15 +35,15 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@angular-devkit/schematics": "~12.2.0",
|
|
38
|
-
"@nrwl/cypress": "12.10.0-beta.
|
|
39
|
-
"@nrwl/devkit": "12.10.0-beta.
|
|
40
|
-
"@nrwl/jest": "12.10.0-beta.
|
|
41
|
-
"@nrwl/linter": "12.10.0-beta.
|
|
42
|
-
"@nrwl/storybook": "12.10.0-beta.
|
|
38
|
+
"@nrwl/cypress": "12.10.0-beta.2",
|
|
39
|
+
"@nrwl/devkit": "12.10.0-beta.2",
|
|
40
|
+
"@nrwl/jest": "12.10.0-beta.2",
|
|
41
|
+
"@nrwl/linter": "12.10.0-beta.2",
|
|
42
|
+
"@nrwl/storybook": "12.10.0-beta.2",
|
|
43
43
|
"@schematics/angular": "~12.2.0",
|
|
44
44
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
45
45
|
"ignore": "^5.0.4",
|
|
46
|
-
"jasmine-marbles": "~0.8.
|
|
46
|
+
"jasmine-marbles": "~0.8.4",
|
|
47
47
|
"rxjs-for-await": "0.0.2",
|
|
48
48
|
"webpack-merge": "5.7.3",
|
|
49
49
|
"tslib": "^2.2.0"
|
|
@@ -32,10 +32,21 @@ function buildApp(options, context) {
|
|
|
32
32
|
}
|
|
33
33
|
function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
|
|
34
34
|
return build_angular_1.executeBrowserBuilder(options, context, {
|
|
35
|
-
webpackConfiguration: (baseWebpackConfig) => {
|
|
35
|
+
webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
36
|
const customWebpackConfiguration = require(pathToWebpackConfig);
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
// The extra Webpack configuration file can export a synchronous or asynchronous function,
|
|
38
|
+
// for instance: `module.exports = async config => { ... }`.
|
|
39
|
+
if (typeof customWebpackConfiguration === 'function') {
|
|
40
|
+
return customWebpackConfiguration(baseWebpackConfig);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
return webpack_merge_1.merge(baseWebpackConfig,
|
|
44
|
+
// The extra Webpack configuration file can also export a Promise, for instance:
|
|
45
|
+
// `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
|
|
46
|
+
// then await will just resolve that object.
|
|
47
|
+
yield customWebpackConfiguration);
|
|
48
|
+
}
|
|
49
|
+
}),
|
|
39
50
|
});
|
|
40
51
|
}
|
|
41
52
|
function run(options, context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;AAAA,yDAImC;AACnC,iEAAsE;AAEtE,+BAA4C;AAC5C,yFAIwD;AACxD,yCAAiD;AACjD,+BAA4B;AAC5B,0EAAgF;AAEhF,8CAA2C;AAC3C,2BAAgC;AAChC,iDAAsC;AAQtC,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,KAAyB,OAAO,EAA3B,eAAe,kBAAK,OAAO,EAArD,uBAA2C,CAAU,CAAC;IAC5D,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,0BAAiB,CAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,eAAU,CAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,sCAAsC,CAC3C,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAC9C,uCAAuC,EACvC,eAAsC,EACtC;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAa;KAC9B,CACF,CAAC;IAEF,OAAO,WAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,qCAAqB,CAAC,OAAO,EAAE,OAAO,EAAE;QAC7C,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;AAAA,yDAImC;AACnC,iEAAsE;AAEtE,+BAA4C;AAC5C,yFAIwD;AACxD,yCAAiD;AACjD,+BAA4B;AAC5B,0EAAgF;AAEhF,8CAA2C;AAC3C,2BAAgC;AAChC,iDAAsC;AAQtC,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,KAAyB,OAAO,EAA3B,eAAe,kBAAK,OAAO,EAArD,uBAA2C,CAAU,CAAC;IAC5D,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,0BAAiB,CAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,eAAU,CAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,sCAAsC,CAC3C,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAC9C,uCAAuC,EACvC,eAAsC,EACtC;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAa;KAC9B,CACF,CAAC;IAEF,OAAO,WAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,qBAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,qCAAqB,CAAC,OAAO,EAAE,OAAO,EAAE;QAC7C,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,MAAM,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAChE,0FAA0F;YAC1F,4DAA4D;YAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;gBACpD,OAAO,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;aACtD;iBAAM;gBACL,OAAO,qBAAK,CACV,iBAAiB;gBACjB,gFAAgF;gBAChF,yFAAyF;gBACzF,4CAA4C;gBAC5C,MAAM,0BAA0B,CACjC,CAAC;aACH;QACH,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,GAAG,CACV,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mDAA4B,CAC3D,sCAAsB,CAAC,KAAK,CAAC,EAC7B,OAAO,CACR,CAAC;IAEF,OAAO,CAAC,QAAQ,GAAG,wCAAiB,CAClC,WAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;IAEF,OAAO,SAAE,CAAC,0DAAmC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CACxE,qBAAS,CAAC,CAAC,MAAM,EAAE,EAAE;QACnB,IAAI,MAAM,EAAE;YACV,OAAO,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACnC;aAAM;YACL,0BAA0B;YAC1B,OAAO,SAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,kBAAe,yBAAa,CAAoC,GAAG,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.webpackServer = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const architect_1 = require("@angular-devkit/architect");
|
|
5
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
7
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
@@ -24,10 +25,21 @@ function webpackServer(schema, context) {
|
|
|
24
25
|
const pathToWebpackConfig = devkit_1.joinPathFragments(context.workspaceRoot, customWebpackConfig.path);
|
|
25
26
|
if (fs_1.existsSync(pathToWebpackConfig)) {
|
|
26
27
|
return dev_server_1.serveWebpackBrowser(options, context, {
|
|
27
|
-
webpackConfiguration: (baseWebpackConfig) => {
|
|
28
|
+
webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
29
|
const customWebpackConfiguration = require(pathToWebpackConfig);
|
|
29
|
-
|
|
30
|
-
|
|
30
|
+
// The extra Webpack configuration file can export a synchronous or asynchronous function,
|
|
31
|
+
// for instance: `module.exports = async config => { ... }`.
|
|
32
|
+
if (typeof customWebpackConfiguration === 'function') {
|
|
33
|
+
return customWebpackConfiguration(baseWebpackConfig);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
return webpack_merge_1.merge(baseWebpackConfig,
|
|
37
|
+
// The extra Webpack configuration file can also export a Promise, for instance:
|
|
38
|
+
// `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
|
|
39
|
+
// then await will just resolve that object.
|
|
40
|
+
yield customWebpackConfiguration);
|
|
41
|
+
}
|
|
42
|
+
}),
|
|
31
43
|
});
|
|
32
44
|
}
|
|
33
45
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAI1E,yCAAoE;AACpE,8DAA4D;AAC5D,6EAGsD;AACtD,2BAAgC;AAChC,iDAAsC;AACtC,+BAAyC;AAEzC,SAAgB,aAAa,CAAC,MAAc,EAAE,OAAuB;;IACnE,MAAM,OAAO,GAAG,sBAAgB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAI,sBAAU,CACpC,OAAO,CAAC,aAAa,CACtB,CAAC,0BAA0B,EAAE,CAAC;IAE/B,MAAM,mBAAmB,GAAG,0BAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,WAAW,GACf,eAAe,CAAC,QAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAC3D,mBAAmB,CAAC,MAAM,CAC3B,CAAC;IAEJ,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,aAAa;QAC7D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;IAExB,MAAM,mBAAmB,GACvB,MAAA,qBAAqB,CAAC,mBAAmB,mCACzC,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,0BAAiB,CAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,eAAU,CAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,gCAAmB,CAAC,OAAkC,EAAE,OAAO,EAAE;gBACtE,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;oBAChD,MAAM,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;oBAChE,0FAA0F;oBAC1F,4DAA4D;oBAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;wBACpD,OAAO,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;qBACtD;yBAAM;wBACL,OAAO,qBAAK,CACV,iBAAiB;wBACjB,gFAAgF;wBAChF,yFAAyF;wBACzF,4CAA4C;wBAC5C,MAAM,0BAA0B,CACjC,CAAC;qBACH;gBACH,CAAC,CAAA;aACF,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,gCAAmB,CAAC,OAAkC,EAAE,OAAO,CAAC,CAAC;AAC1E,CAAC;AAvDD,sCAuDC;AAED,kBAAe,yBAAa,CAAsB,aAAa,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAiD;AAEjD;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,2CAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,iCAAuB,CAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,qCAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,uCAA2B,CAAC,IAAI,EAAE;oBAChC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,6BAAoB,CAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAiD;AAEjD;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,2CAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,iCAAuB,CAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,qCAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,uCAA2B,CAAC,IAAI,EAAE;oBAChC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,6BAAoB,CAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;IACH,CAAC;CAAA;AAzCD,wBAyCC"}
|
|
@@ -16,7 +16,7 @@ function updateComponentTemplate(host, options) {
|
|
|
16
16
|
// Inline component update
|
|
17
17
|
const componentPath = `${options.appProjectRoot}/src/app/app.component.ts`;
|
|
18
18
|
const templateNodeValue = ast_utils_2.getDecoratorPropertyValueNode(host, componentPath, 'Component', 'template', '@angular/core');
|
|
19
|
-
ast_utils_1.replaceNodeValue(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.html}\n
|
|
19
|
+
ast_utils_1.replaceNodeValue(host, ts.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), ts.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.html}\n\``);
|
|
20
20
|
}
|
|
21
21
|
exports.updateComponentTemplate = updateComponentTemplate;
|
|
22
22
|
//# sourceMappingURL=update-component-template.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,uBAAuB,CAAC,IAAU,EAAE,OAAyB;IAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,IAAI,mCAAmC;QAC7D,CAAC,CAAC,gCAAgB,CAAC,IAAI,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,yCAA6B,CACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,4BAAgB,CACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"update-component-template.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-component-template.ts"],"names":[],"mappings":";;;AAGA,iCAAiC;AACjC,uEAA2E;AAC3E,kEAAmF;AAEnF,mDAAmD;AAEnD,SAAgB,uBAAuB,CAAC,IAAU,EAAE,OAAyB;IAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,IAAI,mCAAmC;QAC7D,CAAC,CAAC,gCAAgB,CAAC,IAAI,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,yCAA6B,CACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,4BAAgB,CACd,IAAI,EACJ,EAAE,CAAC,gBAAgB,CACjB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,IAAI,MAAM,CACnC,CAAC;AACJ,CAAC;AAjCD,0DAiCC"}
|
|
@@ -150,6 +150,11 @@
|
|
|
150
150
|
"host": {
|
|
151
151
|
"type": "string",
|
|
152
152
|
"description": "The name of the host application that the remote application will be consumed by."
|
|
153
|
+
},
|
|
154
|
+
"setParserOptionsProject": {
|
|
155
|
+
"type": "boolean",
|
|
156
|
+
"description": "Whether or not to configure the ESLint \"parserOptions.project\" option. We do not do this by default for lint performance reasons.",
|
|
157
|
+
"default": false
|
|
153
158
|
}
|
|
154
159
|
},
|
|
155
160
|
"required": []
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateNgPackage = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
|
+
const utils_1 = require("@nrwl/workspace/src/generators/move/lib/utils");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
function updateNgPackage(tree, schema) {
|
|
9
|
+
var _a, _b, _c;
|
|
10
|
+
const newProjectName = utils_1.getNewProjectName(schema.destination);
|
|
11
|
+
const project = devkit_1.readProjectConfiguration(tree, newProjectName);
|
|
12
|
+
if (project.projectType === 'application') {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const ngPackagePath = `${project.root}/ng-package.json`;
|
|
16
|
+
if (!tree.exists(ngPackagePath)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const rootOffset = path_1.relative(path_1.join(app_root_1.appRootPath, project.root), app_root_1.appRootPath);
|
|
20
|
+
let output = `dist/${project.root}`;
|
|
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
|
+
output = project.targets.build.outputs[0];
|
|
23
|
+
}
|
|
24
|
+
devkit_1.updateJson(tree, ngPackagePath, (json) => {
|
|
25
|
+
json.dest = `${rootOffset}/${output}`;
|
|
26
|
+
return json;
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.updateNgPackage = updateNgPackage;
|
|
30
|
+
//# sourceMappingURL=update-ng-package.js.map
|
|
@@ -0,0 +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,2DAA2D;AAC3D,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,yBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,iCAAwB,CAAC,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,eAAQ,CAAC,WAAI,CAAC,sBAAW,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAW,CAAC,CAAC;IAC1E,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,mBAAU,CAAC,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"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const workspace_1 = require("@nrwl/workspace");
|
|
7
7
|
const update_module_name_1 = require("./lib/update-module-name");
|
|
8
|
+
const update_ng_package_1 = require("./lib/update-ng-package");
|
|
8
9
|
/**
|
|
9
10
|
* Moves an Angular lib/app to another folder (and renames it in the process)
|
|
10
11
|
*
|
|
@@ -16,6 +17,7 @@ function angularMoveGenerator(tree, schema) {
|
|
|
16
17
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
18
|
yield workspace_1.moveGenerator(tree, Object.assign(Object.assign({}, schema), { skipFormat: true }));
|
|
18
19
|
update_module_name_1.updateModuleName(tree, schema);
|
|
20
|
+
update_ng_package_1.updateNgPackage(tree, schema);
|
|
19
21
|
if (!schema.skipFormat) {
|
|
20
22
|
yield devkit_1.formatFiles(tree);
|
|
21
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/move/move.ts"],"names":[],"mappings":";;;;AAAA,yCAAqE;AACrE,+CAAgD;AAChD,iEAA4D;
|
|
1
|
+
{"version":3,"file":"move.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/move/move.ts"],"names":[],"mappings":";;;;AAAA,yCAAqE;AACrE,+CAAgD;AAChD,iEAA4D;AAC5D,+DAA0D;AAG1D;;;;;;GAMG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAc;;QAEd,MAAM,yBAAa,CAAC,IAAI,kCAAO,MAAM,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;QAC3D,qCAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,mCAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE9B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,oDAWC;AAEY,QAAA,oBAAoB,GAAG,2BAAkB,CAAC,oBAAoB,CAAC,CAAC"}
|
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.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '12.10.0-beta.
|
|
4
|
+
exports.nxVersion = '12.10.0-beta.2';
|
|
5
5
|
exports.angularVersion = '^12.2.0';
|
|
6
6
|
exports.angularDevkitVersion = '~12.2.0';
|
|
7
7
|
exports.angularJsVersion = '1.7.9';
|