@nrwl/angular 15.3.0-beta.1 → 15.3.0-beta.10
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/executors.d.ts +1 -0
- package/executors.js +1 -0
- package/executors.js.map +1 -1
- package/executors.json +9 -4
- package/fesm2015/nrwl-angular-mf.mjs +1 -0
- package/fesm2015/nrwl-angular-testing.mjs +1 -0
- package/fesm2015/nrwl-angular.mjs +1 -0
- package/fesm2020/nrwl-angular-mf.mjs +1 -0
- package/fesm2020/nrwl-angular-testing.mjs +1 -0
- package/fesm2020/nrwl-angular.mjs +1 -0
- package/migrations.json +38 -0
- package/ng-package.json +1 -0
- package/package.json +12 -11
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +4 -66
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.d.ts +6 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +85 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -0
- package/src/builders/module-federation-dev-ssr/schema.d.ts +16 -0
- package/src/builders/module-federation-dev-ssr/schema.json +84 -0
- package/src/builders/utilities/module-federation.d.ts +7 -0
- package/src/builders/utilities/module-federation.js +70 -0
- package/src/builders/utilities/module-federation.js.map +1 -0
- package/src/executors/delegate-build/schema.json +1 -1
- package/src/executors/file-server/schema.json +1 -1
- package/src/executors/ng-packagr-lite/schema.json +1 -1
- package/src/executors/package/schema.json +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +1 -0
- package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +5 -3
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/component/component.js +1 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/lib/normalize-options.d.ts +1 -1
- package/src/generators/component/lib/normalize-options.js +17 -9
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/host/files/src/main.server.ts__tmpl__ +66 -0
- package/src/generators/host/files/webpack.server.config.js__tmpl__ +3 -0
- package/src/generators/host/host.d.ts +1 -1
- package/src/generators/host/host.js +9 -2
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/lib/add-ssr.d.ts +3 -0
- package/src/generators/host/lib/add-ssr.js +40 -0
- package/src/generators/host/lib/add-ssr.js.map +1 -0
- package/src/generators/host/lib/index.d.ts +1 -0
- package/src/generators/host/lib/index.js +5 -0
- package/src/generators/host/lib/index.js.map +1 -0
- package/src/generators/host/schema.d.ts +1 -0
- package/src/generators/host/schema.json +5 -0
- package/src/generators/library/lib/normalize-options.js +9 -9
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.d.ts +2 -2
- package/src/generators/ng-add/migrate-from-angular-cli.js +13 -9
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/utilities/format-files-task.d.ts +2 -0
- package/src/generators/ng-add/utilities/format-files-task.js +19 -0
- package/src/generators/ng-add/utilities/format-files-task.js.map +1 -0
- package/src/generators/ng-add/utilities/index.d.ts +1 -0
- package/src/generators/ng-add/utilities/index.js +1 -0
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.d.ts +3 -0
- package/src/generators/ng-add/utilities/workspace.js +74 -11
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/files/__directory__/__fileName__.facade.ts__tmpl__ +5 -5
- package/src/generators/ngrx/files/__directory__/__fileName__.selectors.spec.ts__tmpl__ +8 -8
- package/src/generators/ngrx/files/__directory__/__fileName__.selectors.ts__tmpl__ +14 -14
- package/src/generators/remote/files/src/main.server.ts__tmpl__ +8 -0
- package/src/generators/remote/lib/add-ssr.d.ts +4 -2
- package/src/generators/remote/lib/add-ssr.js +10 -2
- package/src/generators/remote/lib/add-ssr.js.map +1 -1
- package/src/generators/remote/remote.js +1 -1
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/setup-ssr/files/src/main.ts__tpl__ +1 -1
- package/src/generators/setup-ssr/lib/update-project-config.js +1 -0
- package/src/generators/setup-ssr/lib/update-project-config.js.map +1 -1
- package/src/generators/storybook-configuration/schema.json +1 -2
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +2 -2
- package/src/utils/versions.js.map +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"outputCapture": "direct-nodejs",
|
|
4
4
|
"$schema": "http://json-schema.org/schema",
|
|
5
5
|
"title": "ng-packagr Target",
|
|
6
|
-
"description": "
|
|
6
|
+
"description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nrwl/angular:package` executor but with some key differences:\n- It doesn't run `ngcc` automatically (`ngcc` needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2020 bundles.\n- It doesn't generate package exports in the `package.json`.",
|
|
7
7
|
"cli": "nx",
|
|
8
8
|
"type": "object",
|
|
9
9
|
"presets": [
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"outputCapture": "direct-nodejs",
|
|
4
4
|
"$schema": "http://json-schema.org/schema",
|
|
5
5
|
"title": "ng-packagr Target",
|
|
6
|
-
"description": "
|
|
6
|
+
"description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
|
|
7
7
|
"cli": "nx",
|
|
8
8
|
"type": "object",
|
|
9
9
|
"presets": [
|
|
@@ -14,6 +14,7 @@ function addUnitTestRunner(host, options) {
|
|
|
14
14
|
supportTsx: false,
|
|
15
15
|
skipSerializers: false,
|
|
16
16
|
skipPackageJson: options.skipPackageJson,
|
|
17
|
+
rootProject: options.rootProject,
|
|
17
18
|
});
|
|
18
19
|
}
|
|
19
20
|
else if (options.unitTestRunner === test_runners_1.UnitTestRunner.Karma) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAC7D,qEAAsE;AAEtE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;
|
|
1
|
+
{"version":3,"file":"add-unit-test-runner.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-unit-test-runner.ts"],"names":[],"mappings":";;;;AAGA,qCAAkD;AAElD,8DAA6D;AAC7D,qEAAsE;AAEtE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;;QAC3E,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;YAClD,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;gBAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,KAAK;gBACtB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,KAAK,EAAE;YAC1D,MAAM,IAAA,uBAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAhBD,8CAgBC"}
|
|
@@ -8,12 +8,14 @@ const linter_1 = require("@nrwl/linter");
|
|
|
8
8
|
const project_1 = require("../../utils/project");
|
|
9
9
|
function normalizeOptions(host, options) {
|
|
10
10
|
var _a;
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
12
|
+
const appDirectory = (0, project_1.normalizeDirectory)(options.name, projectDirectory);
|
|
13
|
+
const appProjectName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
|
|
13
14
|
const e2eProjectName = options.rootProject
|
|
14
15
|
? 'e2e'
|
|
15
16
|
: `${(0, devkit_2.names)(options.name).fileName}-e2e`;
|
|
16
|
-
const { appsDir, npmScope, standaloneAsDefault } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
17
|
+
const { appsDir: defaultAppsDir, npmScope, standaloneAsDefault, } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
18
|
+
const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
|
|
17
19
|
const appProjectRoot = options.rootProject
|
|
18
20
|
? '.'
|
|
19
21
|
: (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const component_1 = require("./lib/component");
|
|
|
9
9
|
const normalize_options_1 = require("./lib/normalize-options");
|
|
10
10
|
function componentGenerator(tree, rawOptions) {
|
|
11
11
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
-
const options = (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
12
|
+
const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
|
|
13
13
|
const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
|
|
14
14
|
checkPathUnderProjectRoot(tree, options);
|
|
15
15
|
const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,gDAeC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { NormalizedSchema, Schema } from '../schema';
|
|
3
|
-
export declare function normalizeOptions(tree: Tree, options: Schema): NormalizedSchema
|
|
3
|
+
export declare function normalizeOptions(tree: Tree, options: Schema): Promise<NormalizedSchema>;
|
|
@@ -1,19 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
7
|
+
function findProjectFromOptions(options) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
10
|
+
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
11
|
+
return (0, find_project_for_path_1.findProjectForPath)(options.path, projectRootMappings);
|
|
12
|
+
});
|
|
13
|
+
}
|
|
6
14
|
function normalizeOptions(tree, options) {
|
|
7
15
|
var _a, _b, _c;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
17
|
+
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
18
|
+
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
19
|
+
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
20
|
+
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
21
|
+
return Object.assign(Object.assign({}, options), { path,
|
|
22
|
+
project,
|
|
23
|
+
projectSourceRoot });
|
|
24
|
+
});
|
|
17
25
|
}
|
|
18
26
|
exports.normalizeOptions = normalizeOptions;
|
|
19
27
|
//# sourceMappingURL=normalize-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1E,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC/D,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAClD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1BD,4CA0BC"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import 'zone.js/dist/zone-node';
|
|
2
|
+
|
|
3
|
+
import { APP_BASE_HREF } from '@angular/common';
|
|
4
|
+
import { ngExpressEngine } from '@nguniversal/express-engine';
|
|
5
|
+
import * as express from 'express';
|
|
6
|
+
import * as cors from 'cors';
|
|
7
|
+
import { existsSync } from 'fs';
|
|
8
|
+
import { join } from 'path';
|
|
9
|
+
|
|
10
|
+
import { AppServerModule } from './bootstrap.server';
|
|
11
|
+
|
|
12
|
+
// The Express app is exported so that it can be used by serverless Functions.
|
|
13
|
+
export function app(): express.Express {
|
|
14
|
+
const server = express();
|
|
15
|
+
const browserBundles = join(process.cwd(), 'dist/apps/<%= appName %>/browser');
|
|
16
|
+
|
|
17
|
+
server.use(cors());
|
|
18
|
+
const indexHtml = existsSync(join(browserBundles, 'index.original.html'))
|
|
19
|
+
? 'index.original.html'
|
|
20
|
+
: 'index';
|
|
21
|
+
|
|
22
|
+
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
|
|
23
|
+
server.engine(
|
|
24
|
+
'html',
|
|
25
|
+
ngExpressEngine({
|
|
26
|
+
bootstrap: AppServerModule,
|
|
27
|
+
})
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
server.set('view engine', 'html');
|
|
31
|
+
server.set('views', browserBundles);
|
|
32
|
+
|
|
33
|
+
// Serve static files from /browser
|
|
34
|
+
server.get(
|
|
35
|
+
'*.*',
|
|
36
|
+
express.static(browserBundles, {
|
|
37
|
+
maxAge: '1y',
|
|
38
|
+
})
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
// All regular routes use the Universal engine
|
|
42
|
+
server.get('*', (req, res) => {
|
|
43
|
+
// keep it async to avoid blocking the server thread
|
|
44
|
+
|
|
45
|
+
res.render(indexHtml, {
|
|
46
|
+
providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
|
|
47
|
+
req,
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
return server;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function run(): void {
|
|
55
|
+
const port = process.env['PORT'] || 4000;
|
|
56
|
+
|
|
57
|
+
// Start up the Node server
|
|
58
|
+
const server = app();
|
|
59
|
+
server.listen(port, () => {
|
|
60
|
+
console.log(`Node Express server listening on http://localhost:${port}`);
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
run();
|
|
65
|
+
|
|
66
|
+
export * from './bootstrap.server';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { Schema } from './schema';
|
|
3
|
-
export declare function host(tree: Tree, options: Schema): Promise<()
|
|
3
|
+
export declare function host(tree: Tree, options: Schema): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
4
4
|
export default host;
|
|
@@ -8,6 +8,8 @@ const remote_1 = require("../remote/remote");
|
|
|
8
8
|
const project_1 = require("../utils/project");
|
|
9
9
|
const setup_mf_1 = require("../setup-mf/setup-mf");
|
|
10
10
|
const test_runners_1 = require("../../utils/test-runners");
|
|
11
|
+
const lib_1 = require("./lib");
|
|
12
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
11
13
|
function host(tree, options) {
|
|
12
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
15
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
@@ -24,7 +26,7 @@ function host(tree, options) {
|
|
|
24
26
|
});
|
|
25
27
|
}
|
|
26
28
|
const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
|
|
27
|
-
const
|
|
29
|
+
const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { routing: true, port: 4200, skipFormat: true }));
|
|
28
30
|
const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
|
|
29
31
|
yield (0, setup_mf_1.setupMf)(tree, {
|
|
30
32
|
appName,
|
|
@@ -38,13 +40,18 @@ function host(tree, options) {
|
|
|
38
40
|
skipE2E,
|
|
39
41
|
e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
|
|
40
42
|
});
|
|
43
|
+
let installTasks = [appInstallTask];
|
|
44
|
+
if (options.ssr) {
|
|
45
|
+
let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, appName);
|
|
46
|
+
installTasks.push(ssrInstallTask);
|
|
47
|
+
}
|
|
41
48
|
for (const remote of remotesToGenerate) {
|
|
42
49
|
yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: appName, skipFormat: true, standalone: options.standalone }));
|
|
43
50
|
}
|
|
44
51
|
if (!options.skipFormat) {
|
|
45
52
|
yield (0, devkit_1.formatFiles)(tree);
|
|
46
53
|
}
|
|
47
|
-
return
|
|
54
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...installTasks);
|
|
48
55
|
});
|
|
49
56
|
}
|
|
50
57
|
exports.host = host;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,yCAA8D;AAE9D,4DAA8D;AAC9D,6CAA+C;AAC/C,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,yCAA8D;AAE9D,4DAA8D;AAC9D,6CAA+C;AAC/C,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAA+B;AAC/B,2FAAqF;AAErF,SAAsB,IAAI,CAAC,IAAU,EAAE,OAAe;;QACpD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,MAAM,kBAAkB,GAAa,EAAE,CAAC;QAExC,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACzB,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAChC;qBAAM;oBACL,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACjC;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAEtE,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,OAAO,EAAE,IAAI,EACb,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QACzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,EAAE;YACjC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YACtD,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;SACvD,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE;YACtC,MAAM,IAAA,gBAAe,EAAC,IAAI,kCACrB,OAAO,KACV,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,EACb,UAAU,EAAE,IAAI,EAChB,UAAU,EAAE,OAAO,CAAC,UAAU,IAC9B,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;IAC3C,CAAC;CAAA;AA7DD,oBA6DC;AAED,kBAAe,IAAI,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addSsr = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
|
|
7
|
+
const versions_1 = require("../../../utils/versions");
|
|
8
|
+
function addSsr(tree, options, appName) {
|
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
|
|
11
|
+
yield (0, setup_ssr_1.default)(tree, {
|
|
12
|
+
project: appName,
|
|
13
|
+
});
|
|
14
|
+
tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
|
|
15
|
+
tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
|
|
16
|
+
tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.ts'));
|
|
17
|
+
tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.ts'), `import("./bootstrap")`);
|
|
18
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files'), project.root, {
|
|
19
|
+
appName,
|
|
20
|
+
tmpl: '',
|
|
21
|
+
});
|
|
22
|
+
// update project.json
|
|
23
|
+
project = (0, devkit_1.readProjectConfiguration)(tree, appName);
|
|
24
|
+
project.targets.server.executor = '@nrwl/angular:webpack-server';
|
|
25
|
+
project.targets.server.options.customWebpackConfig = {
|
|
26
|
+
path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
|
|
27
|
+
};
|
|
28
|
+
project.targets['serve-ssr'].executor =
|
|
29
|
+
'@nrwl/angular:module-federation-dev-ssr';
|
|
30
|
+
(0, devkit_1.updateProjectConfiguration)(tree, appName, project);
|
|
31
|
+
const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
32
|
+
cors: versions_1.corsVersion,
|
|
33
|
+
express: versions_1.expressVersion,
|
|
34
|
+
'@module-federation/node': versions_1.moduleFederationNodeVersion,
|
|
35
|
+
}, {});
|
|
36
|
+
return installTask;
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
exports.addSsr = addSsr;
|
|
40
|
+
//# sourceMappingURL=add-ssr.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAGtB,yDAAiD;AACjD,sDAIiC;AAEjC,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;;QACvE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAChD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CACtD,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,EAChD,uBAAuB,CACxB,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,8BAA8B,CAAC;QACjE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QAEF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ;YACnC,yCAAyC,CAAC;QAE5C,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAtDD,wBAsDC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './add-ssr';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B"}
|
|
@@ -154,6 +154,11 @@
|
|
|
154
154
|
"type": "boolean",
|
|
155
155
|
"description": "Whether to generate a host application that uses standalone components.",
|
|
156
156
|
"default": false
|
|
157
|
+
},
|
|
158
|
+
"ssr": {
|
|
159
|
+
"description": "Whether to configure SSR for the host application",
|
|
160
|
+
"type": "boolean",
|
|
161
|
+
"default": false
|
|
157
162
|
}
|
|
158
163
|
},
|
|
159
164
|
"additionalProperties": false,
|
|
@@ -16,15 +16,17 @@ function normalizeOptions(host, schema) {
|
|
|
16
16
|
? 'partial'
|
|
17
17
|
: (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
|
|
18
18
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
19
|
-
const projectDirectory = options.directory
|
|
20
|
-
|
|
19
|
+
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
20
|
+
const fullProjectDirectory = projectDirectory
|
|
21
|
+
? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`.replace(/\/+/g, '/')
|
|
21
22
|
: name;
|
|
22
|
-
const { libsDir, npmScope, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
23
|
-
const
|
|
23
|
+
const { libsDir: defaultLibsDirectory, npmScope, standaloneAsDefault, } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
24
|
+
const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDirectory;
|
|
25
|
+
const projectName = fullProjectDirectory
|
|
24
26
|
.replace(new RegExp('/', 'g'), '-')
|
|
25
27
|
.replace(/-\d+/g, '');
|
|
26
28
|
const fileName = options.simpleModuleName ? name : projectName;
|
|
27
|
-
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir,
|
|
29
|
+
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
|
|
28
30
|
const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
|
|
29
31
|
const parsedTags = options.tags
|
|
30
32
|
? options.tags.split(',').map((s) => s.trim())
|
|
@@ -32,7 +34,7 @@ function normalizeOptions(host, schema) {
|
|
|
32
34
|
const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
|
|
33
35
|
const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
|
|
34
36
|
options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
|
|
35
|
-
const importPath = options.importPath || (0, path_1.getImportPath)(npmScope,
|
|
37
|
+
const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, fullProjectDirectory);
|
|
36
38
|
// Determine the roots where @schematics/angular will place the projects
|
|
37
39
|
// This might not be where the projects actually end up
|
|
38
40
|
const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
|
|
@@ -43,9 +45,7 @@ function normalizeOptions(host, schema) {
|
|
|
43
45
|
const ngCliSchematicLibRoot = newProjectRoot
|
|
44
46
|
? `${newProjectRoot}/${projectName}`
|
|
45
47
|
: projectName;
|
|
46
|
-
const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
|
|
47
|
-
projectDirectory,
|
|
48
|
-
modulePath,
|
|
48
|
+
const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName, projectDirectory: fullProjectDirectory, modulePath,
|
|
49
49
|
parsedTags,
|
|
50
50
|
fileName,
|
|
51
51
|
importPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { Tree } from '@nrwl/devkit';
|
|
1
|
+
import type { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { GeneratorOptions } from './schema';
|
|
3
|
-
export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<
|
|
3
|
+
export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<GeneratorCallback>;
|
|
@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateFromAngularCli = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const generators_1 = require("@nrwl/workspace/generators");
|
|
7
|
+
const versions_1 = require("@nrwl/workspace/src/utils/versions");
|
|
8
|
+
const versions_2 = require("../../utils/versions");
|
|
7
9
|
const migrators_1 = require("./migrators");
|
|
8
10
|
const utilities_1 = require("./utilities");
|
|
9
11
|
function migrateFromAngularCli(tree, rawOptions) {
|
|
@@ -11,14 +13,19 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
11
13
|
(0, utilities_1.validateWorkspace)(tree);
|
|
12
14
|
const projects = (0, utilities_1.getAllProjects)(tree);
|
|
13
15
|
const options = (0, utilities_1.normalizeOptions)(tree, rawOptions, projects);
|
|
14
|
-
const defaultProject = projects.apps.find((app) => app.config.root === '');
|
|
15
16
|
if (options.preserveAngularCliLayout) {
|
|
16
17
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
17
|
-
nx:
|
|
18
|
-
'@nrwl/workspace':
|
|
18
|
+
nx: versions_2.nxVersion,
|
|
19
|
+
'@nrwl/workspace': versions_2.nxVersion,
|
|
20
|
+
prettier: versions_1.prettierVersion,
|
|
19
21
|
});
|
|
20
22
|
(0, utilities_1.createNxJson)(tree, options, true);
|
|
21
23
|
(0, utilities_1.decorateAngularCli)(tree);
|
|
24
|
+
(0, utilities_1.updateVsCodeRecommendedExtensions)(tree);
|
|
25
|
+
yield (0, utilities_1.updatePrettierConfig)(tree);
|
|
26
|
+
// convert workspace config format to standalone project configs
|
|
27
|
+
(0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
|
|
28
|
+
yield (0, generators_1.convertToNxProjectGenerator)(tree, { all: true, skipFormat: true });
|
|
22
29
|
}
|
|
23
30
|
else {
|
|
24
31
|
const migrators = [
|
|
@@ -61,15 +68,12 @@ function migrateFromAngularCli(tree, rawOptions) {
|
|
|
61
68
|
(0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
|
|
62
69
|
(0, utilities_1.cleanupEsLintPackages)(tree);
|
|
63
70
|
}
|
|
64
|
-
yield (0, devkit_1.formatFiles)(tree);
|
|
65
|
-
}
|
|
66
|
-
if (defaultProject) {
|
|
67
|
-
const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
68
|
-
(0, devkit_1.updateWorkspaceConfiguration)(tree, Object.assign(Object.assign({}, workspaceConfig), { defaultProject: defaultProject.name }));
|
|
69
71
|
}
|
|
72
|
+
(0, utilities_1.deleteAngularJson)(tree);
|
|
70
73
|
if (!options.skipInstall) {
|
|
71
74
|
return () => {
|
|
72
75
|
(0, devkit_1.installPackagesTask)(tree);
|
|
76
|
+
(0, utilities_1.formatFilesTask)(tree);
|
|
73
77
|
};
|
|
74
78
|
}
|
|
75
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatFilesTask = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
6
|
+
function formatFilesTask(tree) {
|
|
7
|
+
if (!tree
|
|
8
|
+
.listChanges()
|
|
9
|
+
.some((change) => change.type === 'CREATE' || change.type === 'UPDATE')) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
13
|
+
try {
|
|
14
|
+
(0, child_process_1.execSync)(`${pmc.exec} nx format`, { cwd: tree.root, stdio: [0, 1, 2] });
|
|
15
|
+
}
|
|
16
|
+
catch (_a) { }
|
|
17
|
+
}
|
|
18
|
+
exports.formatFilesTask = formatFilesTask;
|
|
19
|
+
//# sourceMappingURL=format-files-task.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format-files-task.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/format-files-task.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,iDAAyC;AAEzC,SAAgB,eAAe,CAAC,IAAU;IACxC,IACE,CAAC,IAAI;SACF,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,EACzE;QACA,OAAO;KACR;IAED,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,IAAI;QACF,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,YAAY,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KACzE;IAAC,WAAM,GAAE;AACZ,CAAC;AAbD,0CAaC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./file-change-recorder"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./format-files-task"), exports);
|
|
5
6
|
tslib_1.__exportStar(require("./get-all-projects"), exports);
|
|
6
7
|
tslib_1.__exportStar(require("./logger"), exports);
|
|
7
8
|
tslib_1.__exportStar(require("./normalize-options"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,6DAAmC;AACnC,mDAAyB;AACzB,8DAAoC;AACpC,kDAAwB;AACxB,8DAAoC;AACpC,+DAAqC;AACrC,sDAA4B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,8DAAoC;AACpC,6DAAmC;AACnC,mDAAyB;AACzB,8DAAoC;AACpC,kDAAwB;AACxB,8DAAoC;AACpC,+DAAqC;AACrC,sDAA4B"}
|
|
@@ -13,3 +13,6 @@ export declare function cleanupEsLintPackages(tree: Tree): void;
|
|
|
13
13
|
export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
|
|
14
14
|
export declare function createRootKarmaConfig(tree: Tree): void;
|
|
15
15
|
export declare function getWorkspaceRootFileTypesInfo(tree: Tree, migrators: ProjectMigrator[]): WorkspaceRootFileTypesInfo;
|
|
16
|
+
export declare function updateVsCodeRecommendedExtensions(tree: Tree): void;
|
|
17
|
+
export declare function updatePrettierConfig(tree: Tree): Promise<void>;
|
|
18
|
+
export declare function deleteAngularJson(tree: Tree): void;
|