@nrwl/angular 14.5.3 → 14.5.5
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/migrations.json +13 -0
- package/ng-package.json +1 -0
- package/package.json +11 -10
- package/src/generators/application/lib/update-config-files.js +6 -1
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +6 -1
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/stories/schema.d.ts +1 -0
- package/src/generators/stories/schema.json +15 -0
- package/src/generators/stories/stories.d.ts +1 -1
- package/src/generators/stories/stories.js +11 -2
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-stories.js +1 -0
- package/src/generators/storybook-configuration/lib/generate-stories.js.map +1 -1
- package/src/generators/storybook-configuration/schema.d.ts +1 -0
- package/src/generators/storybook-configuration/schema.json +15 -0
- package/src/generators/utils/testing.js +1 -1
- package/src/generators/utils/testing.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/utils/versions.js.map +1 -1
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
|
-
## [14.5.
|
|
6
|
+
## [14.5.5](https://github.com/nrwl/nx/compare/14.5.4...14.5.5) (2022-08-12)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/migrations.json
CHANGED
|
@@ -1438,6 +1438,19 @@
|
|
|
1438
1438
|
"@angular/material": {
|
|
1439
1439
|
"version": "~14.1.1",
|
|
1440
1440
|
"alwaysAddToPackageJson": false
|
|
1441
|
+
},
|
|
1442
|
+
"@angular/cdk": {
|
|
1443
|
+
"version": "~14.1.1",
|
|
1444
|
+
"alwaysAddToPackageJson": false
|
|
1445
|
+
}
|
|
1446
|
+
}
|
|
1447
|
+
},
|
|
1448
|
+
"14.5.5": {
|
|
1449
|
+
"version": "14.5.5-beta.0",
|
|
1450
|
+
"packages": {
|
|
1451
|
+
"ts-node": {
|
|
1452
|
+
"version": "10.9.1",
|
|
1453
|
+
"alwaysAddToPackageJson": false
|
|
1441
1454
|
}
|
|
1442
1455
|
}
|
|
1443
1456
|
}
|
package/ng-package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.5.
|
|
3
|
+
"version": "14.5.5",
|
|
4
4
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,13 +65,13 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~14.1.1",
|
|
68
|
-
"@nrwl/cypress": "14.5.
|
|
69
|
-
"@nrwl/devkit": "14.5.
|
|
70
|
-
"@nrwl/jest": "14.5.
|
|
71
|
-
"@nrwl/linter": "14.5.
|
|
72
|
-
"@nrwl/storybook": "14.5.
|
|
73
|
-
"@nrwl/web": "14.5.
|
|
74
|
-
"@nrwl/workspace": "14.5.
|
|
68
|
+
"@nrwl/cypress": "14.5.5",
|
|
69
|
+
"@nrwl/devkit": "14.5.5",
|
|
70
|
+
"@nrwl/jest": "14.5.5",
|
|
71
|
+
"@nrwl/linter": "14.5.5",
|
|
72
|
+
"@nrwl/storybook": "14.5.5",
|
|
73
|
+
"@nrwl/web": "14.5.5",
|
|
74
|
+
"@nrwl/workspace": "14.5.5",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
76
|
"@schematics/angular": "~14.1.0",
|
|
77
77
|
"chalk": "4.1.0",
|
|
@@ -80,8 +80,9 @@
|
|
|
80
80
|
"ignore": "^5.0.4",
|
|
81
81
|
"jasmine-marbles": "~0.8.4",
|
|
82
82
|
"magic-string": "~0.26.2",
|
|
83
|
+
"minimatch": "3.0.5",
|
|
83
84
|
"semver": "7.3.4",
|
|
84
|
-
"ts-node": "
|
|
85
|
+
"ts-node": "10.9.1",
|
|
85
86
|
"tsconfig-paths": "^3.9.0",
|
|
86
87
|
"tslib": "^2.3.0",
|
|
87
88
|
"webpack": "^5.58.1",
|
|
@@ -94,5 +95,5 @@
|
|
|
94
95
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
95
96
|
"typings": "index.d.ts",
|
|
96
97
|
"sideEffects": false,
|
|
97
|
-
"gitHead": "
|
|
98
|
+
"gitHead": "d9ebe0870de2bd309af1d790d57a2f66583c5839"
|
|
98
99
|
}
|
|
@@ -12,7 +12,12 @@ exports.updateConfigFiles = updateConfigFiles;
|
|
|
12
12
|
function updateTsConfigOptions(host, options) {
|
|
13
13
|
// tsconfig.app.json
|
|
14
14
|
(0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.app.json`, (json) => (Object.assign(Object.assign({}, json), { extends: './tsconfig.json', compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.appProjectRoot)}dist/out-tsc` }), exclude: [
|
|
15
|
-
...new Set([
|
|
15
|
+
...new Set([
|
|
16
|
+
...(json.exclude || []),
|
|
17
|
+
'jest.config.ts',
|
|
18
|
+
'**/*.test.ts',
|
|
19
|
+
'**/*.spec.ts',
|
|
20
|
+
]),
|
|
16
21
|
] })));
|
|
17
22
|
// tsconfig.json
|
|
18
23
|
(0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.json`, (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'es2020' }) })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AAGA,yCAOsB;AACtB,iFAAoF;AAGpF,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,
|
|
1
|
+
{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,12 @@ function updateProjectConfig(host, options) {
|
|
|
21
21
|
(0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
|
|
22
22
|
json.include = ['**/*.ts'];
|
|
23
23
|
json.exclude = [
|
|
24
|
-
...new Set([
|
|
24
|
+
...new Set([
|
|
25
|
+
...(json.exclude || []),
|
|
26
|
+
'jest.config.ts',
|
|
27
|
+
'**/*.test.ts',
|
|
28
|
+
'**/*.spec.ts',
|
|
29
|
+
]),
|
|
25
30
|
];
|
|
26
31
|
return json;
|
|
27
32
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yEAAqF;AAGrF,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,IAAA,0BAAiB,EACf,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,EACxB,eAAe,CAChB;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC;gBACT,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;gBACvB,gBAAgB;gBAChB,cAAc;gBACd,cAAc;aACf,CAAC;SACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCAC9D,IAAI,KACP,eAAe,kCAAO,IAAI,CAAC,eAAe,KAAE,MAAM,EAAE,QAAQ,OAC5D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;QAC5C,OAAO,IAAA,mBAAU,EACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC;gBAC5C,OAAO,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAJD,wCAIC"}
|
|
@@ -30,6 +30,21 @@
|
|
|
30
30
|
"description": "Skip formatting files.",
|
|
31
31
|
"type": "boolean",
|
|
32
32
|
"default": false
|
|
33
|
+
},
|
|
34
|
+
"ignorePaths": {
|
|
35
|
+
"type": "array",
|
|
36
|
+
"description": "Paths to ignore when looking for components.",
|
|
37
|
+
"items": {
|
|
38
|
+
"type": "string",
|
|
39
|
+
"description": "Path to ignore."
|
|
40
|
+
},
|
|
41
|
+
"examples": [
|
|
42
|
+
"apps/my-app/src/not-stories/**",
|
|
43
|
+
"**/**/src/**/not-stories/**",
|
|
44
|
+
"libs/my-lib/**/*.something.ts",
|
|
45
|
+
"**/**/src/**/*.other.*",
|
|
46
|
+
"libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
|
|
47
|
+
]
|
|
33
48
|
}
|
|
34
49
|
},
|
|
35
50
|
"additionalProperties": false,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
2
2
|
import type { StoriesGeneratorOptions } from './schema';
|
|
3
3
|
export declare function angularStoriesGenerator(tree: Tree, options: StoriesGeneratorOptions): void;
|
|
4
4
|
export default angularStoriesGenerator;
|
|
@@ -8,11 +8,13 @@ const component_info_1 = require("./lib/component-info");
|
|
|
8
8
|
const entry_point_1 = require("./lib/entry-point");
|
|
9
9
|
const get_e2e_project_1 = require("./lib/get-e2e-project");
|
|
10
10
|
const module_info_1 = require("./lib/module-info");
|
|
11
|
+
const minimatch = require("minimatch");
|
|
11
12
|
function angularStoriesGenerator(tree, options) {
|
|
12
|
-
var _a;
|
|
13
|
+
var _a, _b;
|
|
13
14
|
const e2eProjectName = (_a = options.cypressProject) !== null && _a !== void 0 ? _a : `${options.name}-e2e`;
|
|
14
15
|
const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
|
|
15
16
|
const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
|
|
17
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.name);
|
|
16
18
|
const componentsInfo = [];
|
|
17
19
|
for (const entryPoint of entryPoints) {
|
|
18
20
|
const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
|
|
@@ -21,7 +23,14 @@ function angularStoriesGenerator(tree, options) {
|
|
|
21
23
|
if (options.generateCypressSpecs && !e2eProject) {
|
|
22
24
|
devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
|
|
23
25
|
}
|
|
24
|
-
|
|
26
|
+
(_b = componentsInfo
|
|
27
|
+
.filter((f) => {
|
|
28
|
+
var _a;
|
|
29
|
+
return !((_a = options.ignorePaths) === null || _a === void 0 ? void 0 : _a.some((pattern) => {
|
|
30
|
+
const shouldIgnorePath = minimatch((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
|
|
31
|
+
return shouldIgnorePath;
|
|
32
|
+
}));
|
|
33
|
+
})) === null || _b === void 0 ? void 0 : _b.forEach((info) => {
|
|
25
34
|
if (info === undefined) {
|
|
26
35
|
return;
|
|
27
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/stories/stories.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,6FAA6F;AAC7F,wEAAyE;AAEzE,yDAG8B;AAC9B,mDAA0D;AAC1D,2DAAsD;AACtD,mDAAuD;AAEvD,uCAAwC;AAExC,SAAgB,uBAAuB,CACrC,IAAU,EACV,OAAgC;;IAEhC,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IACvE,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,mCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,MAAM,eAAe,GAAG,IAAA,gCAAkB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7D,cAAc,CAAC,IAAI,CACjB,GAAG,IAAA,kCAAiB,EAAC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,EACrE,GAAG,IAAA,4CAA2B,EAAC,IAAI,EAAE,UAAU,CAAC,CACjD,CAAC;KACH;IAED,IAAI,OAAO,CAAC,oBAAoB,IAAI,CAAC,UAAU,EAAE;QAC/C,eAAM,CAAC,IAAI,CACT,6BAA6B,cAAc,mHAAmH,CAC/J,CAAC;KACH;IAED,MAAA,cAAc;SACX,MAAM,CACL,CAAC,CAAC,EAAE,EAAE;;QACJ,OAAA,CAAC,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,MAAM,gBAAgB,GAAG,SAAS,CAChC,IAAA,0BAAiB,EACf,CAAC,CAAC,gBAAgB,EAClB,CAAC,CAAC,IAAI,EACN,GAAG,CAAC,CAAC,iBAAiB,KAAK,CAC5B,EACD,OAAO,CACR,CAAC;YACF,OAAO,gBAAgB,CAAC;QAC1B,CAAC,CAAC,CAAA,CAAA;KAAA,CACL,0CACC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,OAAO;SACR;QAED,IAAA,yBAAuB,EAAC,IAAI,EAAE;YAC5B,WAAW,EAAE,IAAI,CAAC,gBAAgB;YAClC,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,oBAAoB,IAAI,UAAU,EAAE;YAC9C,IAAA,gCAA6B,EAAC,IAAI,EAAE;gBAClC,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,aAAa,EAAE,IAAA,0BAAiB,EAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC;gBAChE,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;KACnB;AACH,CAAC;AApED,0DAoEC;AAED,kBAAe,uBAAuB,CAAC"}
|
|
@@ -11,6 +11,7 @@ function generateStories(tree, options) {
|
|
|
11
11
|
name: options.name,
|
|
12
12
|
generateCypressSpecs: options.configureCypress && options.generateCypressSpecs,
|
|
13
13
|
cypressProject: e2eProjectName,
|
|
14
|
+
ignorePaths: options.ignorePaths,
|
|
14
15
|
});
|
|
15
16
|
}
|
|
16
17
|
exports.generateStories = generateStories;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-stories.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AAEzE,yCAAwD;AACxD,mDAAgE;AAGhE,SAAgB,eAAe,CAC7B,IAAU,EACV,OAAsC;IAEtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,iCAAuB,EAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,oBAAoB,EAClB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,oBAAoB;QAC1D,cAAc,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"generate-stories.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-stories.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AAEzE,yCAAwD;AACxD,mDAAgE;AAGhE,SAAgB,eAAe,CAC7B,IAAU,EACV,OAAsC;IAEtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,iCAAuB,EAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,oBAAoB,EAClB,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,oBAAoB;QAC1D,cAAc,EAAE,cAAc;QAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC,CAAC;AACL,CAAC;AAlBD,0CAkBC"}
|
|
@@ -54,6 +54,21 @@
|
|
|
54
54
|
"description": "Skip formatting files.",
|
|
55
55
|
"type": "boolean",
|
|
56
56
|
"default": false
|
|
57
|
+
},
|
|
58
|
+
"ignorePaths": {
|
|
59
|
+
"type": "array",
|
|
60
|
+
"description": "Paths to ignore when looking for components.",
|
|
61
|
+
"items": {
|
|
62
|
+
"type": "string",
|
|
63
|
+
"description": "Path to ignore."
|
|
64
|
+
},
|
|
65
|
+
"examples": [
|
|
66
|
+
"apps/my-app/src/not-stories/**",
|
|
67
|
+
"**/**/src/**/not-stories/**",
|
|
68
|
+
"libs/my-lib/**/*.something.ts",
|
|
69
|
+
"**/**/src/**/*.other.*",
|
|
70
|
+
"libs/my-lib/src/not-stories/**,**/**/src/**/*.other.*,apps/my-app/**/*.something.ts"
|
|
71
|
+
]
|
|
57
72
|
}
|
|
58
73
|
},
|
|
59
74
|
"additionalProperties": false,
|
|
@@ -8,7 +8,7 @@ const linter_1 = require("@nrwl/linter");
|
|
|
8
8
|
const library_1 = require("../library/library");
|
|
9
9
|
function createStorybookTestWorkspaceForLib(libName) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
let tree = (0, testing_1.
|
|
11
|
+
let tree = (0, testing_1.createTreeWithEmptyV1Workspace)();
|
|
12
12
|
const moduleGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'module');
|
|
13
13
|
const componentGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
|
|
14
14
|
yield (0, library_1.default)(tree, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":";;;;AACA,8DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export declare const postcssImportVersion = "~14.1.0";
|
|
|
14
14
|
export declare const postcssPresetEnvVersion = "~7.5.0";
|
|
15
15
|
export declare const postcssUrlVersion = "~10.1.3";
|
|
16
16
|
export declare const autoprefixerVersion = "^10.4.0";
|
|
17
|
-
export declare const tsNodeVersion = "
|
|
17
|
+
export declare const tsNodeVersion = "10.9.1";
|
|
18
18
|
export declare const jestPresetAngularVersion = "~11.1.2";
|
|
19
19
|
export declare const protractorVersion = "~7.0.0";
|
|
20
20
|
export declare const karmaVersion = "~6.4.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -17,7 +17,7 @@ exports.postcssImportVersion = '~14.1.0';
|
|
|
17
17
|
exports.postcssPresetEnvVersion = '~7.5.0';
|
|
18
18
|
exports.postcssUrlVersion = '~10.1.3';
|
|
19
19
|
exports.autoprefixerVersion = '^10.4.0';
|
|
20
|
-
exports.tsNodeVersion = '
|
|
20
|
+
exports.tsNodeVersion = '10.9.1';
|
|
21
21
|
exports.jestPresetAngularVersion = '~11.1.2';
|
|
22
22
|
exports.protractorVersion = '~7.0.0';
|
|
23
23
|
exports.karmaVersion = '~6.4.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC"}
|