@nx/angular 16.1.0-rc.0 → 16.1.0-rc.1
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 +4 -4
- package/package.json +10 -10
- package/src/generators/component/lib/module.js +1 -1
- package/src/generators/component/lib/module.js.map +1 -1
- package/src/generators/ngrx/schema.json +11 -3
- package/src/generators/setup-ssr/files/ngmodule/base/__serverFileName__ +2 -2
- package/src/generators/setup-ssr/files/standalone/__serverFileName__ +1 -1
- package/src/generators/setup-ssr/lib/generate-files.js +7 -5
- package/src/generators/setup-ssr/lib/generate-files.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-project-config.js +3 -2
- package/src/generators/setup-ssr/lib/update-project-config.js.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +1 -1
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +0 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +0 -1
- package/src/generators/storybook-configuration/schema.json +0 -7
package/migrations.json
CHANGED
|
@@ -194,7 +194,7 @@
|
|
|
194
194
|
},
|
|
195
195
|
"remove-render-module-platform-server-exports": {
|
|
196
196
|
"cli": "nx",
|
|
197
|
-
"version": "16.1.0-beta.
|
|
197
|
+
"version": "16.1.0-beta.1",
|
|
198
198
|
"requires": {
|
|
199
199
|
"@angular/core": ">=15.0.0"
|
|
200
200
|
},
|
|
@@ -203,7 +203,7 @@
|
|
|
203
203
|
},
|
|
204
204
|
"remove-ngcc-invocation": {
|
|
205
205
|
"cli": "nx",
|
|
206
|
-
"version": "16.1.0-beta.
|
|
206
|
+
"version": "16.1.0-beta.1",
|
|
207
207
|
"requires": {
|
|
208
208
|
"@angular/core": ">=16.0.0-rc.4"
|
|
209
209
|
},
|
|
@@ -212,7 +212,7 @@
|
|
|
212
212
|
},
|
|
213
213
|
"extract-app-config-for-standalone": {
|
|
214
214
|
"cli": "nx",
|
|
215
|
-
"version": "16.1.0-beta.
|
|
215
|
+
"version": "16.1.0-beta.1",
|
|
216
216
|
"requires": {
|
|
217
217
|
"@angular/core": ">=16.0.0-rc.4"
|
|
218
218
|
},
|
|
@@ -221,7 +221,7 @@
|
|
|
221
221
|
},
|
|
222
222
|
"update-server-executor-config": {
|
|
223
223
|
"cli": "nx",
|
|
224
|
-
"version": "16.1.0-beta.
|
|
224
|
+
"version": "16.1.0-beta.1",
|
|
225
225
|
"requires": {
|
|
226
226
|
"@angular/core": ">=16.0.0-rc.4"
|
|
227
227
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/angular",
|
|
3
|
-
"version": "16.1.0-rc.
|
|
3
|
+
"version": "16.1.0-rc.1",
|
|
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, and Cypress. \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": {
|
|
@@ -66,14 +66,14 @@
|
|
|
66
66
|
"migrations": "./migrations.json"
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@nrwl/angular": "16.1.0-rc.
|
|
70
|
-
"@nx/cypress": "16.1.0-rc.
|
|
71
|
-
"@nx/devkit": "16.1.0-rc.
|
|
72
|
-
"@nx/jest": "16.1.0-rc.
|
|
73
|
-
"@nx/js": "16.1.0-rc.
|
|
74
|
-
"@nx/linter": "16.1.0-rc.
|
|
75
|
-
"@nx/webpack": "16.1.0-rc.
|
|
76
|
-
"@nx/workspace": "16.1.0-rc.
|
|
69
|
+
"@nrwl/angular": "16.1.0-rc.1",
|
|
70
|
+
"@nx/cypress": "16.1.0-rc.1",
|
|
71
|
+
"@nx/devkit": "16.1.0-rc.1",
|
|
72
|
+
"@nx/jest": "16.1.0-rc.1",
|
|
73
|
+
"@nx/js": "16.1.0-rc.1",
|
|
74
|
+
"@nx/linter": "16.1.0-rc.1",
|
|
75
|
+
"@nx/webpack": "16.1.0-rc.1",
|
|
76
|
+
"@nx/workspace": "16.1.0-rc.1",
|
|
77
77
|
"@phenomnomnominal/tsquery": "~5.0.1",
|
|
78
78
|
"@typescript-eslint/type-utils": "^5.36.1",
|
|
79
79
|
"chalk": "^4.1.0",
|
|
@@ -110,5 +110,5 @@
|
|
|
110
110
|
"module": "fesm2022/nx-angular.mjs",
|
|
111
111
|
"typings": "index.d.ts",
|
|
112
112
|
"sideEffects": false,
|
|
113
|
-
"gitHead": "
|
|
113
|
+
"gitHead": "b59a0a1760e3feb1424bd1de9ac6909f0108c373"
|
|
114
114
|
}
|
|
@@ -58,6 +58,6 @@ function findModule(tree, generateDir, projectRoot) {
|
|
|
58
58
|
}
|
|
59
59
|
dir = (0, path_1.dirname)(dir);
|
|
60
60
|
}
|
|
61
|
-
throw new Error("Could not find a candidate module to add the component to. Please specify which module the component should be added to by using the '--module' option.");
|
|
61
|
+
throw new Error("Could not find a candidate module to add the component to. Please specify which module the component should be added to by using the '--module' option, or pass '--standalone' to generate a standalone component.");
|
|
62
62
|
}
|
|
63
63
|
//# sourceMappingURL=module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,20 @@
|
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @nrwl/angular:ngrx --root --
|
|
10
|
+
"command": "nx g @nrwl/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
|
|
11
11
|
"description": "Add root ngrx configration to the `my-app` application"
|
|
12
12
|
},
|
|
13
13
|
{
|
|
14
|
-
"command": "nx g @nrwl/angular:ngrx --
|
|
14
|
+
"command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
|
|
15
15
|
"description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
"command": "nx g @nrwl/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
|
|
19
|
+
"description": "Add a root state configuration to `my-app` when `my-app` uses Standalone APIs"
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
"command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
|
|
23
|
+
"description": "Add a `users` feature state to the Route definition of a library using Standalone APIs"
|
|
16
24
|
}
|
|
17
25
|
],
|
|
18
26
|
"properties": {
|
|
@@ -33,7 +41,7 @@
|
|
|
33
41
|
},
|
|
34
42
|
"parent": {
|
|
35
43
|
"type": "string",
|
|
36
|
-
"description": "The path to the
|
|
44
|
+
"description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app.module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory. _Note: The Standalone API usage is only supported in Angular versions >= 14.1.0_.",
|
|
37
45
|
"x-prompt": "What is the path to the module or Routes definition where this NgRx state should be registered?",
|
|
38
46
|
"x-priority": "important"
|
|
39
47
|
},
|
|
@@ -11,7 +11,7 @@ import {<%= rootModuleClassName %>} from './src/<%= main.slice(0, -3) %>';
|
|
|
11
11
|
// The Express app is exported so that it can be used by serverless Functions.
|
|
12
12
|
export function app(): express.Express {
|
|
13
13
|
const server = express();
|
|
14
|
-
const distFolder = join(process.cwd(), '
|
|
14
|
+
const distFolder = join(process.cwd(), '<%= browserBundleOutputPath %>');
|
|
15
15
|
const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
|
|
16
16
|
|
|
17
17
|
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
|
|
@@ -57,4 +57,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
|
|
|
57
57
|
run();
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
export * from './src/<%= main.slice(0, -3) %>';
|
|
60
|
+
export * from './src/<%= main.slice(0, -3) %>';
|
|
@@ -11,7 +11,7 @@ import bootstrap from './src/<%= main.slice(0, -3) %>';
|
|
|
11
11
|
// The Express app is exported so that it can be used by serverless Functions.
|
|
12
12
|
export function app(): express.Express {
|
|
13
13
|
const server = express();
|
|
14
|
-
const distFolder = join(process.cwd(), '
|
|
14
|
+
const distFolder = join(process.cwd(), '<%= browserBundleOutputPath %>');
|
|
15
15
|
const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
|
|
16
16
|
|
|
17
17
|
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
|
|
@@ -5,20 +5,22 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const semver_1 = require("semver");
|
|
6
6
|
const version_utils_1 = require("../../utils/version-utils");
|
|
7
7
|
function generateSSRFiles(tree, schema) {
|
|
8
|
-
const
|
|
8
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
9
|
+
const projectRoot = projectConfig.root;
|
|
10
|
+
const browserBundleOutputPath = projectConfig.targets.build.options.outputPath;
|
|
9
11
|
const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
|
|
10
12
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
|
|
11
13
|
if (schema.standalone) {
|
|
12
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
|
|
14
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
|
|
13
15
|
}
|
|
14
16
|
else {
|
|
15
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
|
|
17
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
|
|
16
18
|
const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
|
|
17
19
|
if (angularMajorVersion < 15) {
|
|
18
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
|
|
20
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
|
|
19
21
|
}
|
|
20
22
|
if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
|
|
21
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
|
|
23
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AACpB,mCAA4B;AAC5B,6DAA2E;AAG3E,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;IACzD,MAAM,
|
|
1
|
+
{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AACpB,mCAA4B;AAC5B,6DAA2E;AAG3E,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;IACvC,MAAM,uBAAuB,GAC3B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;IAEjD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,kCAClE,MAAM,KACT,GAAG,EAAE,EAAE,IACP,CAAC;IAEH,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,YAAY,CAAC,EAC5C,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;KACH;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,EAClD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;QAEF,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,GAC3D,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,mBAAmB,GAAG,EAAE,EAAE;YAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,EACjD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;SACH;QACD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;YAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC,EACvD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;SACH;KACF;AACH,CAAC;AApDD,4CAoDC"}
|
|
@@ -6,7 +6,8 @@ function updateProjectConfig(tree, schema) {
|
|
|
6
6
|
var _a;
|
|
7
7
|
let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
|
|
8
8
|
const buildTarget = projectConfig.targets.build;
|
|
9
|
-
buildTarget.options.outputPath
|
|
9
|
+
const baseOutputPath = buildTarget.options.outputPath;
|
|
10
|
+
buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
|
|
10
11
|
const buildConfigurations = projectConfig.targets.build.configurations;
|
|
11
12
|
const configurations = {};
|
|
12
13
|
if (buildConfigurations) {
|
|
@@ -17,7 +18,7 @@ function updateProjectConfig(tree, schema) {
|
|
|
17
18
|
projectConfig.targets.server = {
|
|
18
19
|
dependsOn: ['build'],
|
|
19
20
|
executor: '@angular-devkit/build-angular:server',
|
|
20
|
-
options: Object.assign({ outputPath:
|
|
21
|
+
options: Object.assign({ outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'), main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName), tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json') }, (buildTarget.options ? getServerOptions(buildTarget.options) : {})),
|
|
21
22
|
configurations,
|
|
22
23
|
defaultConfiguration: 'production',
|
|
23
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AAKA,uCAMoB;AAGpB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,11 @@ function setupSsr(tree, schema) {
|
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
(0, lib_1.validateOptions)(tree, schema);
|
|
11
11
|
const options = (0, lib_1.normalizeOptions)(tree, schema);
|
|
12
|
+
(0, lib_1.updateProjectConfig)(tree, options);
|
|
12
13
|
(0, lib_1.generateSSRFiles)(tree, options);
|
|
13
14
|
if (!options.standalone) {
|
|
14
15
|
(0, lib_1.updateAppModule)(tree, options);
|
|
15
16
|
}
|
|
16
|
-
(0, lib_1.updateProjectConfig)(tree, options);
|
|
17
17
|
const pkgVersions = (0, version_utils_1.versions)(tree);
|
|
18
18
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
19
19
|
'@nguniversal/express-engine': pkgVersions.ngUniversalVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AACpB,0DAAkD;AAClD,+BAMe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AACpB,0DAAkD;AAClD,+BAMe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,6BAA6B,EAAE,WAAW,CAAC,kBAAkB;YAC7D,0BAA0B,EAAE,WAAW,CAAC,cAAc;SACvD,EACD;YACE,uBAAuB,EAAE,WAAW,CAAC,kBAAkB;SACxD,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,4BA+BC;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -15,7 +15,6 @@ function generateStorybookConfiguration(tree, options) {
|
|
|
15
15
|
cypressDirectory: options.cypressDirectory,
|
|
16
16
|
tsConfiguration: options.tsConfiguration,
|
|
17
17
|
configureTestRunner: options.configureTestRunner,
|
|
18
|
-
storybook7Configuration: options.storybook7Configuration,
|
|
19
18
|
configureStaticServe: options.configureStaticServe,
|
|
20
19
|
skipFormat: true,
|
|
21
20
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAAoE;AAEpE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC7E,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,
|
|
1
|
+
{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAAoE;AAEpE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC7E,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;YAClD,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,wEAgBC"}
|
|
@@ -86,13 +86,6 @@
|
|
|
86
86
|
"configureTestRunner": {
|
|
87
87
|
"type": "boolean",
|
|
88
88
|
"description": "Add a Storybook Test-Runner target."
|
|
89
|
-
},
|
|
90
|
-
"storybook7Configuration": {
|
|
91
|
-
"description": "Configure your workspace using Storybook version 7.",
|
|
92
|
-
"type": "boolean",
|
|
93
|
-
"default": true,
|
|
94
|
-
"hidden": true,
|
|
95
|
-
"aliases": ["storybook7betaConfiguration"]
|
|
96
89
|
}
|
|
97
90
|
},
|
|
98
91
|
"additionalProperties": false,
|