@nrwl/angular 15.2.0 → 15.3.0-beta.0
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/fesm2015/nrwl-angular-mf.mjs +0 -1
- package/fesm2015/nrwl-angular-testing.mjs +0 -1
- package/fesm2015/nrwl-angular.mjs +0 -1
- package/fesm2020/nrwl-angular-mf.mjs +0 -1
- package/fesm2020/nrwl-angular-testing.mjs +0 -1
- package/fesm2020/nrwl-angular.mjs +0 -1
- package/migrations.json +17 -0
- package/package.json +9 -9
- package/plugins/component-testing.js +6 -5
- package/plugins/component-testing.js.map +1 -1
- package/src/builders/utilities/buildable-libs.d.ts +1 -1
- package/src/builders/utilities/buildable-libs.js +2 -2
- package/src/builders/utilities/buildable-libs.js.map +1 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js +6 -1
- package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map +1 -1
- package/src/builders/webpack-server/webpack-server.impl.js +18 -1
- 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/add-protractor.d.ts +1 -1
- package/src/generators/application/lib/add-protractor.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +10 -7
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/nrwl-home-tpl.js +1 -1
- package/src/generators/application/lib/update-config-files.js +1 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +6 -0
- package/src/generators/component/lib/normalize-options.js +4 -10
- package/src/generators/component/lib/normalize-options.js.map +1 -1
- package/src/generators/component-cypress-spec/lib/get-component-selector.js +1 -1
- package/src/generators/component-cypress-spec/lib/get-component-selector.js.map +1 -1
- package/src/generators/host/host.js +0 -28
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/karma-project/files/{karma.conf.js__tmpl__ → common/karma.conf.js__tmpl__} +1 -1
- package/src/generators/karma-project/files/{tsconfig.spec.json → common/tsconfig.spec.json} +0 -1
- package/src/generators/karma-project/files/root-project/karma.conf.js__tmpl__ +44 -0
- package/src/generators/karma-project/files/workspace-with-root-project/karma.conf.js__tmpl__ +15 -0
- package/src/generators/karma-project/karma-project.d.ts +2 -2
- package/src/generators/karma-project/karma-project.js +2 -1
- package/src/generators/karma-project/karma-project.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +23 -2
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/karma-project/lib/update-tsconfig.js +17 -3
- package/src/generators/karma-project/lib/update-tsconfig.js.map +1 -1
- package/src/generators/karma-project/lib/update-workspace-config.js +5 -2
- package/src/generators/karma-project/lib/update-workspace-config.js.map +1 -1
- package/src/generators/library/lib/update-ng-package.js +1 -1
- package/src/generators/library/lib/update-ng-package.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.d.ts +1 -1
- package/src/generators/library/lib/update-tsconfig.js +1 -1
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remote/files/src/main.server.ts__tmpl__ +66 -0
- package/src/generators/remote/files/webpack.server.config.js__tmpl__ +3 -0
- package/src/generators/remote/lib/add-ssr.d.ts +3 -0
- package/src/generators/remote/lib/add-ssr.js +37 -0
- package/src/generators/remote/lib/add-ssr.js.map +1 -0
- package/src/generators/remote/lib/find-next-available-port.d.ts +2 -0
- package/src/generators/remote/lib/find-next-available-port.js +19 -0
- package/src/generators/remote/lib/find-next-available-port.js.map +1 -0
- package/src/generators/remote/lib/index.d.ts +2 -0
- package/src/generators/remote/lib/index.js +6 -0
- package/src/generators/remote/lib/index.js.map +1 -0
- package/src/generators/remote/remote.d.ts +1 -1
- package/src/generators/remote/remote.js +10 -70
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.d.ts +1 -0
- package/src/generators/remote/schema.json +5 -0
- package/src/generators/{host/files → setup-mf/files/host-files}/app.component.spec.ts__tmpl__ +0 -0
- package/src/generators/setup-mf/lib/add-remote-entry.js +16 -18
- package/src/generators/setup-mf/lib/add-remote-entry.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mf/lib/generate-config.d.ts +1 -1
- package/src/generators/setup-mf/lib/generate-config.js +5 -5
- package/src/generators/setup-mf/lib/index.d.ts +2 -0
- package/src/generators/setup-mf/lib/index.js +2 -0
- package/src/generators/setup-mf/lib/index.js.map +1 -1
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.d.ts +3 -0
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js +60 -0
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js.map +1 -0
- package/src/generators/setup-mf/lib/setup-host-if-dynamic.js +1 -1
- package/src/generators/setup-mf/lib/setup-host-if-dynamic.js.map +1 -1
- package/src/generators/setup-mf/lib/update-host-app-routes.d.ts +3 -0
- package/src/generators/setup-mf/lib/update-host-app-routes.js +34 -0
- package/src/generators/setup-mf/lib/update-host-app-routes.js.map +1 -0
- package/src/generators/setup-mf/setup-mf.js +9 -3
- package/src/generators/setup-mf/setup-mf.js.map +1 -1
- package/src/generators/setup-ssr/files/src/__main__ +0 -8
- package/src/generators/setup-ssr/files/src/main.ts__tpl__ +0 -6
- package/src/generators/setup-ssr/lib/update-app-module.js +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-project-config.js +6 -10
- package/src/generators/setup-ssr/lib/update-project-config.js.map +1 -1
- package/src/generators/utils/path.js +3 -3
- package/src/generators/utils/path.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +1 -1
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/utils/storybook-ast/storybook-inputs.js +10 -9
- package/src/generators/utils/storybook-ast/storybook-inputs.js.map +1 -1
- package/src/migrations/update-15-2-0/update-typescript-target.js +2 -0
- package/src/migrations/update-15-2-0/update-typescript-target.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.js +6 -6
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/versions.d.ts +4 -1
- package/src/utils/versions.js +5 -2
- package/src/utils/versions.js.map +1 -1
- package/src/generators/karma-project/files/src/test.ts__tmpl__ +0 -22
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.
|
|
6
|
+
# [15.3.0-beta.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.0) (2022-11-24)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/migrations.json
CHANGED
|
@@ -1650,6 +1650,23 @@
|
|
|
1650
1650
|
"alwaysAddToPackageJson": false
|
|
1651
1651
|
}
|
|
1652
1652
|
}
|
|
1653
|
+
},
|
|
1654
|
+
"15.2.2": {
|
|
1655
|
+
"version": "15.2.2-beta.0",
|
|
1656
|
+
"packages": {
|
|
1657
|
+
"@angular-eslint/eslint-plugin": {
|
|
1658
|
+
"version": "~15.0.0",
|
|
1659
|
+
"alwaysAddToPackageJson": false
|
|
1660
|
+
},
|
|
1661
|
+
"@angular-eslint/eslint-plugin-template": {
|
|
1662
|
+
"version": "~15.0.0",
|
|
1663
|
+
"alwaysAddToPackageJson": false
|
|
1664
|
+
},
|
|
1665
|
+
"@angular-eslint/template-parser": {
|
|
1666
|
+
"version": "~15.0.0",
|
|
1667
|
+
"alwaysAddToPackageJson": false
|
|
1668
|
+
}
|
|
1669
|
+
}
|
|
1653
1670
|
}
|
|
1654
1671
|
}
|
|
1655
1672
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.3.0-beta.0",
|
|
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,13 +67,13 @@
|
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@angular-devkit/schematics": "~15.0.0",
|
|
70
|
-
"@nrwl/cypress": "15.
|
|
71
|
-
"@nrwl/devkit": "15.
|
|
72
|
-
"@nrwl/jest": "15.
|
|
73
|
-
"@nrwl/linter": "15.
|
|
74
|
-
"@nrwl/storybook": "15.
|
|
75
|
-
"@nrwl/webpack": "15.
|
|
76
|
-
"@nrwl/workspace": "15.
|
|
70
|
+
"@nrwl/cypress": "15.3.0-beta.0",
|
|
71
|
+
"@nrwl/devkit": "15.3.0-beta.0",
|
|
72
|
+
"@nrwl/jest": "15.3.0-beta.0",
|
|
73
|
+
"@nrwl/linter": "15.3.0-beta.0",
|
|
74
|
+
"@nrwl/storybook": "15.3.0-beta.0",
|
|
75
|
+
"@nrwl/webpack": "15.3.0-beta.0",
|
|
76
|
+
"@nrwl/workspace": "15.3.0-beta.0",
|
|
77
77
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
78
78
|
"@schematics/angular": "~15.0.0",
|
|
79
79
|
"chalk": "4.1.0",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
100
100
|
"typings": "index.d.ts",
|
|
101
101
|
"sideEffects": false,
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "61f6e2d7287beaac1993e32f3fe18703d2c63e41"
|
|
103
103
|
}
|
|
@@ -4,7 +4,6 @@ exports.nxComponentTestingPreset = void 0;
|
|
|
4
4
|
const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
|
|
5
5
|
const ct_helpers_1 = require("@nrwl/cypress/src/utils/ct-helpers");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
-
const runtime_lint_utils_1 = require("@nrwl/workspace/src/utils/runtime-lint-utils");
|
|
8
7
|
const fs_1 = require("fs");
|
|
9
8
|
const path_1 = require("path");
|
|
10
9
|
/**
|
|
@@ -189,12 +188,14 @@ function withSchemaDefaults(options) {
|
|
|
189
188
|
* this file should get cleaned up via the cypress executor
|
|
190
189
|
*/
|
|
191
190
|
function getTempStylesForTailwind(ctExecutorContext) {
|
|
192
|
-
const mappedGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)(ctExecutorContext.projectGraph);
|
|
193
191
|
const ctProjectConfig = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName].data;
|
|
194
192
|
// angular only supports `tailwind.config.{js,cjs}`
|
|
195
|
-
const ctProjectTailwindConfig = (0, path_1.join)(ctProjectConfig.root, 'tailwind.config');
|
|
196
|
-
const isTailWindInCtProject =
|
|
197
|
-
|
|
193
|
+
const ctProjectTailwindConfig = (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tailwind.config');
|
|
194
|
+
const isTailWindInCtProject = (0, fs_1.existsSync)(ctProjectTailwindConfig + '.js') ||
|
|
195
|
+
(0, fs_1.existsSync)(ctProjectTailwindConfig + '.cjs');
|
|
196
|
+
const rootTailwindPath = (0, path_1.join)(ctExecutorContext.root, 'tailwind.config');
|
|
197
|
+
const isTailWindInRoot = (0, fs_1.existsSync)(rootTailwindPath + '.js') ||
|
|
198
|
+
(0, fs_1.existsSync)(rootTailwindPath + '.cjs');
|
|
198
199
|
if (isTailWindInRoot || isTailWindInCtProject) {
|
|
199
200
|
const pathToStyle = (0, ct_helpers_1.getTempTailwindPath)(ctExecutorContext);
|
|
200
201
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":";;;AAAA,yEAK8C;AAC9C,mEAG4C;AAC5C,yCAYsB;AACtB,
|
|
1
|
+
{"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BuilderContext } from '@angular-devkit/architect';
|
|
2
2
|
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
3
|
-
export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: BuilderContext): {
|
|
3
|
+
export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: BuilderContext, target?: string): {
|
|
4
4
|
tsConfigPath: string;
|
|
5
5
|
dependencies: DependentBuildableProjectNode[];
|
|
6
6
|
};
|
|
@@ -4,9 +4,9 @@ exports.createTmpTsConfigForBuildableLibs = void 0;
|
|
|
4
4
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
function createTmpTsConfigForBuildableLibs(tsConfigPath, context) {
|
|
7
|
+
function createTmpTsConfigForBuildableLibs(tsConfigPath, context, target) {
|
|
8
8
|
let dependencies;
|
|
9
|
-
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
|
|
9
|
+
const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, target !== null && target !== void 0 ? target : context.target.target, context.target.configuration);
|
|
10
10
|
dependencies = result.dependencies;
|
|
11
11
|
const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, tsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
|
|
12
12
|
process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AACA,6FAI4D;AAC5D,yCAAsD;AACtD,+BAA4B;AAE5B,SAAgB,iCAAiC,CAC/C,YAAoB,EACpB,OAAuB;
|
|
1
|
+
{"version":3,"file":"buildable-libs.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/buildable-libs.ts"],"names":[],"mappings":";;;AACA,6FAI4D;AAC5D,yCAAsD;AACtD,+BAA4B;AAE5B,SAAgB,iCAAiC,CAC/C,YAAoB,EACpB,OAAuB,EACvB,MAAe;IAEf,IAAI,YAA6C,CAAC;IAClD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;IACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;IAEnC,MAAM,eAAe,GAAG,IAAA,wCAAiB,EACvC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,EACzC,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC;IAE/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AACzD,CAAC;AAxBD,8EAwBC"}
|
|
@@ -36,7 +36,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
36
36
|
let dependencies;
|
|
37
37
|
if (!buildLibsFromSource) {
|
|
38
38
|
const buildTargetTsConfigPath = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _e !== void 0 ? _e : buildTarget.options.tsConfig;
|
|
39
|
-
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context);
|
|
39
|
+
const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, parsedBrowserTarget.target);
|
|
40
40
|
dependencies = foundDependencies;
|
|
41
41
|
// We can't just pass the tsconfig path in memory to the angular builder
|
|
42
42
|
// function because we can't pass the build target options to it, the build
|
|
@@ -50,6 +50,11 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
|
|
|
50
50
|
options.tsConfig = tsConfigPath;
|
|
51
51
|
return options;
|
|
52
52
|
});
|
|
53
|
+
// The buildTargetConfiguration also needs to use the generated tsconfig path
|
|
54
|
+
// otherwise the build will fail if customWebpack function/file is referencing
|
|
55
|
+
// local libs. This synchronize the behavior with webpack-browser and
|
|
56
|
+
// webpack-server implementation.
|
|
57
|
+
buildTargetConfiguration.tsConfig = tsConfigPath;
|
|
53
58
|
}
|
|
54
59
|
return (0, build_angular_1.executeDevServerBuilder)(options, context, {
|
|
55
60
|
webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -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,yDAA0E;AAC1E,iEAGuC;AAEvC,yCAAoE;AACpE,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAAgE;AAChE,+BAAyC;AAEzC,gEAAgF;AAEhF,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,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,SAAS,CAAC;IAEd,MAAM,mBAAmB,GACvB,MAAA,MAAA,MAAA,OAAO,CAAC,mBAAmB,mCAC3B,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,mCACvC,IAAI,CAAC;IAEP,MAAM,mBAAmB,GACvB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAA2B,CAAC;IAChC,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,mBAAmB,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,CAAC,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,IAAI,YAA6C,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,uBAAuB,GAC3B,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,mCAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,EAAE,GACrD,IAAA,kDAAiC,
|
|
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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"}
|
|
@@ -25,7 +25,24 @@ function buildServerApp(options, context) {
|
|
|
25
25
|
}
|
|
26
26
|
function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
|
|
27
27
|
return (0, build_angular_1.executeServerBuilder)(options, context, {
|
|
28
|
-
webpackConfiguration: (baseWebpackConfig) =>
|
|
28
|
+
webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
// Angular 15 auto includes code from @angular/platform-server
|
|
30
|
+
// This includes the code outside the shared scope created by ModuleFederation
|
|
31
|
+
// This code will be included in the generated code from our generators,
|
|
32
|
+
// maintaining it within the shared scope.
|
|
33
|
+
// Therefore, if the build is an MF Server build, remove the auto-includes from
|
|
34
|
+
// the base webpack config from Angular
|
|
35
|
+
let mergedConfig = yield (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
|
|
36
|
+
if (mergedConfig.plugins
|
|
37
|
+
.map((p) => p.constructor.name)
|
|
38
|
+
.includes('UniversalFederationPlugin')) {
|
|
39
|
+
mergedConfig.entry.main = mergedConfig.entry.main.filter((m) => !m.startsWith('@angular/platform-server/init'));
|
|
40
|
+
mergedConfig.module.rules = mergedConfig.module.rules.filter((m) => !m.loader
|
|
41
|
+
? true
|
|
42
|
+
: !m.loader.endsWith('@angular-devkit/build-angular/src/builders/server/platform-server-exports-loader.js'));
|
|
43
|
+
}
|
|
44
|
+
return mergedConfig;
|
|
45
|
+
}),
|
|
29
46
|
});
|
|
30
47
|
}
|
|
31
48
|
function executeWebpackServerBuilder(options, context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAE1E,yCAAiD;AACjD,2BAAgC;AAEhC,kDAAgE;AAChE,iEAGuC;AAEvC,gEAAgF;AAEhF,SAAS,cAAc,CACrB,OAAe,EACf,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,KAC9C,OAAO,EAD4C,eAAe,kBAClE,OAAO,EADH,8CAAgE,CAC7D,CAAC;IACV,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,4CAA4C,CACjD,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,oCAAoB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,4CAA4C,CACnD,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,IAAA,oCAAoB,EAAC,OAAO,EAAE,OAAc,EAAE;QACnD,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAE1E,yCAAiD;AACjD,2BAAgC;AAEhC,kDAAgE;AAChE,iEAGuC;AAEvC,gEAAgF;AAEhF,SAAS,cAAc,CACrB,OAAe,EACf,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,KAC9C,OAAO,EAD4C,eAAe,kBAClE,OAAO,EADH,8CAAgE,CAC7D,CAAC;IACV,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,4CAA4C,CACjD,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,oCAAoB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,4CAA4C,CACnD,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,IAAA,oCAAoB,EAAC,OAAO,EAAE,OAAc,EAAE;QACnD,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,8DAA8D;YAC9D,8EAA8E;YAC9E,wEAAwE;YACxE,0CAA0C;YAC1C,+EAA+E;YAC/E,uCAAuC;YACvC,IAAI,YAAY,GAAG,MAAM,IAAA,kCAAwB,EAC/C,iBAAiB,EACjB,mBAAmB,EACnB,OAAO,EACP,OAAO,CAAC,MAAM,CACf,CAAC;YAEF,IACE,YAAY,CAAC,OAAO;iBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;iBAC9B,QAAQ,CAAC,2BAA2B,CAAC,EACxC;gBACA,YAAY,CAAC,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,+BAA+B,CAAC,CACtD,CAAC;gBACF,YAAY,CAAC,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACjE,CAAC,CAAC,CAAC,MAAM;oBACP,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAChB,qFAAqF,CACtF,CACN,CAAC;aACH;YAED,OAAO,YAAY,CAAC;QACtB,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAAe,EACf,OAAuB;;IAEvB,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IAErC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;QAChC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,kDAAiC,EACxD,OAAO,CAAC,QAAQ,EAChB,OAAO,CACR,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC;KACjC;IAED,OAAO,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AAfD,kEAeC;AAED,kBAAe,IAAA,yBAAa,EAC1B,2BAA2B,CACrB,CAAC"}
|
|
@@ -28,6 +28,7 @@ function addE2e(tree, options) {
|
|
|
28
28
|
skipFormat: options.skipFormat,
|
|
29
29
|
standaloneConfig: options.standaloneConfig,
|
|
30
30
|
skipPackageJson: options.skipPackageJson,
|
|
31
|
+
rootProject: options.rootProject,
|
|
31
32
|
});
|
|
32
33
|
}
|
|
33
34
|
if (options.e2eTestRunner === test_runners_1.E2eTestRunner.Protractor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAExD,8DAA4D;AAE5D,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,2DAAyE;AACzE,yCAA4D;AAC5D,yCAAqE;AAErE,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;;QAChE,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,UAAU,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,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;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;
|
|
1
|
+
{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAExD,8DAA4D;AAE5D,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,2DAAyE;AACzE,yCAA4D;AAC5D,yCAAqE;AAErE,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;;QAChE,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,UAAU,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;SACnE;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,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;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,UAAU,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;gBACA,MAAM,IAAA,wCAA2B,EAAC,IAAI,EAAE;oBACtC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;oBACxD,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;aACJ;SACF;;CACF;AA5CD,wBA4CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AACA,yCAA0E;AAC1E,8DAAwE;AAGxE,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IAAA,gCAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;IACJ,CAAC;CAAA;AAhBD,sCAgBC"}
|
|
@@ -8,15 +8,18 @@ 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 { appsDir, npmScope, standaloneAsDefault } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
12
11
|
const appDirectory = (0, project_1.normalizeDirectory)(options.name, options.directory);
|
|
13
|
-
let e2eProjectName = `${(0, devkit_2.names)(options.name).fileName}-e2e`;
|
|
14
12
|
const appProjectName = (0, project_1.normalizeProjectName)(options.name, options.directory);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
const
|
|
13
|
+
const e2eProjectName = options.rootProject
|
|
14
|
+
? 'e2e'
|
|
15
|
+
: `${(0, devkit_2.names)(options.name).fileName}-e2e`;
|
|
16
|
+
const { appsDir, npmScope, standaloneAsDefault } = (0, devkit_2.getWorkspaceLayout)(host);
|
|
17
|
+
const appProjectRoot = options.rootProject
|
|
18
|
+
? '.'
|
|
19
|
+
: (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
|
|
20
|
+
const e2eProjectRoot = options.rootProject
|
|
21
|
+
? 'e2e'
|
|
22
|
+
: (0, devkit_1.joinPathFragments)(appsDir, `${appDirectory}-e2e`);
|
|
20
23
|
const parsedTags = options.tags
|
|
21
24
|
? options.tags.split(',').map((s) => s.trim())
|
|
22
25
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AACzD,8DAA4E;AAC5E,yCAAsC;AACtC,iDAI6B;AAE7B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAItB,yCAAyD;AACzD,8DAA4E;AAC5E,yCAAsC;AACtC,iDAI6B;AAE7B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,YAAY,GAAG,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAE1C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAC5E,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW;QACxC,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,cAAc,CAAC;IACnB,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,cAAc,EAAE;QACvC,CAAC,CAAC,GAAG,cAAc,MAAM,CAAC;IAE5B,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,aAAa,EAAE,4BAAa,CAAC,OAAO,EACpC,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EACN,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,qBAAqB,IACrB;AACJ,CAAC;AA9DD,4CA8DC"}
|
|
@@ -569,7 +569,7 @@ exports.nrwlHomeTemplate = {
|
|
|
569
569
|
/>
|
|
570
570
|
</svg>
|
|
571
571
|
</a>
|
|
572
|
-
<a href="https://nx.dev/angular-tutorial/
|
|
572
|
+
<a href="https://nx.dev/angular-tutorial/1-code-generation?utm_source=nx-project" target="_blank" rel="noreferrer" class="list-item-link">
|
|
573
573
|
<svg
|
|
574
574
|
fill="none"
|
|
575
575
|
stroke="currentColor"
|
|
@@ -36,7 +36,7 @@ function updateAppAndE2EProjectConfigurations(host, options) {
|
|
|
36
36
|
// Ensure the outputs property comes after the executor for
|
|
37
37
|
// better readability.
|
|
38
38
|
const _a = project.targets.build, { executor } = _a, rest = tslib_1.__rest(_a, ["executor"]);
|
|
39
|
-
project.targets.build = Object.assign({ executor, outputs: ['{options.outputPath}'] }, rest);
|
|
39
|
+
project.targets.build = Object.assign(Object.assign({ executor, outputs: ['{options.outputPath}'] }, rest), { options: Object.assign(Object.assign({}, rest.options), { outputPath: (0, devkit_1.joinPathFragments)('dist', !options.rootProject ? options.appProjectRoot : options.name) }) });
|
|
40
40
|
if (project.generators) {
|
|
41
41
|
delete project.generators;
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,iFAAoF;AACpF,8DAA4E;AAG5E,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,8CAGC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,oBAAoB;IACpB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,cAAc,KAEjE,OAAO,EAAE;YACP,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,IACD,CAAC,CAAC;IAEJ,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACjE,IAAI,KACP,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,QAAQ,EAChB,uBAAuB,EAAE,KAAK,OAEhC,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D,IAAI,OAAO,CAAC,qBAAqB,KAAK,OAAO,CAAC,cAAc,EAAE;QAC5D,OAAO,GAAG,IAAA,yCAAsB,EAC9B,OAAO,EACP,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,kFAAkF;QAClF,oBAAoB;QACpB,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC;KACvC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;IAE5B,2DAA2D;IAC3D,sBAAsB;IACtB,MAAM,KAAwB,OAAO,CAAC,OAAO,CAAC,KAAK,EAA7C,EAAE,QAAQ,OAAmC,EAA9B,IAAI,sBAAnB,YAAqB,CAAwB,CAAC;IACpD,OAAO,CAAC,OAAO,CAAC,KAAK,iCACnB,QAAQ,EACR,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC9B,IAAI,KACP,OAAO,kCACF,IAAI,CAAC,OAAO,KACf,UAAU,EAAE,IAAA,0BAAiB,EAC3B,MAAM,EACN,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAC7D,MAEJ,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,OAAO,OAAO,CAAC,UAAU,CAAC;KAC3B;IAED,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO,CAAC,OAAO,CAAC,KAAK,mCAChB,OAAO,CAAC,OAAO,CAAC,KAAK,KACxB,OAAO,kCACF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAChC,IAAI,EAAE,OAAO,CAAC,IAAI,MAErB,CAAC;KACH;IAED,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAElC;;;;;;;;;OASG;IACH,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,6BAAc,CAAC,IAAI,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC,CAAC;KAC7D;IAED,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,EAAE;QAChD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SAC1D;KACF;AACH,CAAC"}
|
|
@@ -151,6 +151,12 @@
|
|
|
151
151
|
"description": "Generate an application that is setup to use standalone components.",
|
|
152
152
|
"type": "boolean",
|
|
153
153
|
"default": false
|
|
154
|
+
},
|
|
155
|
+
"rootProject": {
|
|
156
|
+
"description": "Create an application at the root of the workspace.",
|
|
157
|
+
"type": "boolean",
|
|
158
|
+
"default": false,
|
|
159
|
+
"hidden": true
|
|
154
160
|
}
|
|
155
161
|
},
|
|
156
162
|
"additionalProperties": false,
|
|
@@ -2,18 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalizeOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
6
|
-
function getProjectFromPath(path) {
|
|
7
|
-
try {
|
|
8
|
-
return (0, project_graph_utils_1.getProjectNameFromDirPath)(path);
|
|
9
|
-
}
|
|
10
|
-
catch (_a) {
|
|
11
|
-
return null;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
5
|
+
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
|
14
6
|
function normalizeOptions(tree, options) {
|
|
15
7
|
var _a, _b, _c;
|
|
16
|
-
const
|
|
8
|
+
const projectGraph = (0, devkit_1.readCachedProjectGraph)();
|
|
9
|
+
const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
|
|
10
|
+
const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (0, find_project_for_path_1.findProjectForPath)(options.path, projectRootMappings)) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
|
|
17
11
|
const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
|
|
18
12
|
const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
|
|
19
13
|
const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,4FAG0D;AAE1D,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,YAAY,GAAG,IAAA,+BAAsB,GAAE,CAAC;IAC9C,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC1E,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,mCACrD,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IAClD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,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;IAEJ,uCACK,OAAO,KACV,IAAI;QACJ,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA5BD,4CA4BC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getComponentSelector = void 0;
|
|
4
|
-
const typescript_1 = require("
|
|
4
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
5
|
const typescript_2 = require("typescript");
|
|
6
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
function getComponentSelector(tree, path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,wDAAoD;AAEpD,2CAAwC;AACxC,kEAG4C;AAE5C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,IAAY;IAC3D,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzC,MAAM,mBAAmB,GAAG,IAAA,gCAAoB,EAC9C,IAAI,EACJ,WAAW,EACX,eAAe,CAChB,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAC;KACxD;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAuB,CACvC,IAAA,sBAAS,EAAC,kBAAkB,EAAE,uBAAU,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,UAAU,CACjE,CACF,CAAC;IACF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,GAAG,CAAC,CAAC;KACtE;IAED,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAtBD,oDAsBC"}
|
|
@@ -6,8 +6,6 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const application_1 = require("../application/application");
|
|
7
7
|
const remote_1 = require("../remote/remote");
|
|
8
8
|
const project_1 = require("../utils/project");
|
|
9
|
-
const ts = require("typescript");
|
|
10
|
-
const route_utils_1 = require("../../utils/nx-devkit/route-utils");
|
|
11
9
|
const setup_mf_1 = require("../setup-mf/setup-mf");
|
|
12
10
|
const test_runners_1 = require("../../utils/test-runners");
|
|
13
11
|
function host(tree, options) {
|
|
@@ -43,7 +41,6 @@ function host(tree, options) {
|
|
|
43
41
|
for (const remote of remotesToGenerate) {
|
|
44
42
|
yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: appName, skipFormat: true, standalone: options.standalone }));
|
|
45
43
|
}
|
|
46
|
-
routeToNxWelcome(tree, options);
|
|
47
44
|
if (!options.skipFormat) {
|
|
48
45
|
yield (0, devkit_1.formatFiles)(tree);
|
|
49
46
|
}
|
|
@@ -51,30 +48,5 @@ function host(tree, options) {
|
|
|
51
48
|
});
|
|
52
49
|
}
|
|
53
50
|
exports.host = host;
|
|
54
|
-
function routeToNxWelcome(tree, options) {
|
|
55
|
-
const { sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, (0, project_1.normalizeProjectName)(options.name, options.directory));
|
|
56
|
-
const remoteRoutes = options.remotes && Array.isArray(options.remotes)
|
|
57
|
-
? options.remotes.reduce((routes, remote) => `${routes}\n<li><a routerLink='${(0, project_1.normalizeProjectName)(remote, options.directory)}'>${(0, devkit_1.names)(remote).className}</a></li>`, '')
|
|
58
|
-
: '';
|
|
59
|
-
tree.write((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.component.html'), `<ul class="remote-menu">
|
|
60
|
-
<li><a routerLink='/'>Home</a></li>
|
|
61
|
-
${remoteRoutes}
|
|
62
|
-
</ul>
|
|
63
|
-
<router-outlet></router-outlet>
|
|
64
|
-
`);
|
|
65
|
-
const pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
|
|
66
|
-
const hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
|
|
67
|
-
let sourceFile = ts.createSourceFile(pathToHostRootRoutingFile, hostRootRoutingFile, ts.ScriptTarget.Latest, true);
|
|
68
|
-
(0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
|
|
69
|
-
path: '',
|
|
70
|
-
component: NxWelcomeComponent
|
|
71
|
-
}`);
|
|
72
|
-
tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './nx-welcome.component';
|
|
73
|
-
${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
|
|
74
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
|
|
75
|
-
appName: (0, project_1.normalizeProjectName)(options.name, options.directory),
|
|
76
|
-
tmpl: '',
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
51
|
exports.default = host;
|
|
80
52
|
//# sourceMappingURL=host.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":";;;;AAAA,
|
|
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;AAEzD,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,WAAW,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCAC9C,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,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,WAAW,CAAC;IACrB,CAAC;CAAA;AAvDD,oBAuDC;AAED,kBAAe,IAAI,CAAC"}
|
package/src/generators/karma-project/files/{karma.conf.js__tmpl__ → common/karma.conf.js__tmpl__}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Karma configuration file, see link for more information
|
|
2
|
-
// https://karma-runner.github.io/
|
|
2
|
+
// https://karma-runner.github.io/6.4/config/configuration-file.html
|
|
3
3
|
|
|
4
4
|
const { join } = require('path');
|
|
5
5
|
const getBaseKarmaConfig = require('<%= offsetFromRoot %>karma.conf');
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
// Karma configuration file, see link for more information
|
|
2
|
+
// https://karma-runner.github.io/6.4/config/configuration-file.html
|
|
3
|
+
|
|
4
|
+
const { constants } = require('karma');
|
|
5
|
+
const { join } = require('path');
|
|
6
|
+
|
|
7
|
+
module.exports = (config) => {
|
|
8
|
+
config.set({
|
|
9
|
+
basePath: '',
|
|
10
|
+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
|
11
|
+
plugins: [
|
|
12
|
+
require('karma-jasmine'),
|
|
13
|
+
require('karma-chrome-launcher'),
|
|
14
|
+
require('karma-jasmine-html-reporter'),
|
|
15
|
+
require('karma-coverage'),
|
|
16
|
+
require('@angular-devkit/build-angular/plugins/karma'),
|
|
17
|
+
],
|
|
18
|
+
client: {
|
|
19
|
+
jasmine: {
|
|
20
|
+
// you can add configuration options for Jasmine here
|
|
21
|
+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
|
|
22
|
+
// for example, you can disable the random execution with `random: false`
|
|
23
|
+
// or set a specific seed with `seed: 4321`
|
|
24
|
+
},
|
|
25
|
+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
|
|
26
|
+
},
|
|
27
|
+
jasmineHtmlReporter: {
|
|
28
|
+
suppressAll: true, // removes the duplicated traces
|
|
29
|
+
},
|
|
30
|
+
coverageReporter: {
|
|
31
|
+
dir: join(__dirname, 'coverage/<%= projectName %>'),
|
|
32
|
+
subdir: '.',
|
|
33
|
+
reporters: [{ type: 'html' }, { type: 'text-summary' }],
|
|
34
|
+
},
|
|
35
|
+
reporters: ['progress', 'kjhtml'],
|
|
36
|
+
port: 9876,
|
|
37
|
+
colors: true,
|
|
38
|
+
logLevel: constants.LOG_INFO,
|
|
39
|
+
autoWatch: true,
|
|
40
|
+
browsers: ['Chrome'],
|
|
41
|
+
singleRun: true,
|
|
42
|
+
restartOnFileChange: true,
|
|
43
|
+
});
|
|
44
|
+
};
|