@nrwl/storybook 13.1.2 → 13.2.0-beta.3
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/README.md +1 -1
- package/package.json +5 -5
- package/src/executors/build-storybook/build-storybook.impl.js +15 -15
- package/src/executors/build-storybook/build-storybook.impl.js.map +1 -1
- package/src/executors/build-storybook/compat.js +1 -1
- package/src/executors/build-storybook/compat.js.map +1 -1
- package/src/executors/storybook/compat.js +1 -1
- package/src/executors/storybook/compat.js.map +1 -1
- package/src/executors/storybook/storybook.impl.js +20 -20
- package/src/executors/storybook/storybook.impl.js.map +1 -1
- package/src/executors/utils.js +16 -6
- package/src/executors/utils.js.map +1 -1
- package/src/generators/configuration/configuration.js +37 -37
- package/src/generators/configuration/configuration.js.map +1 -1
- package/src/generators/cypress-project/cypress-project.d.ts +2 -2
- package/src/generators/cypress-project/cypress-project.js +29 -15
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/init/init.js +13 -13
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/migrate-defaults-5-to-6/migrate-defaults-5-to-6.js +15 -15
- package/src/generators/migrate-defaults-5-to-6/migrate-defaults-5-to-6.js.map +1 -1
- package/src/generators/migrate-stories-to-6-2/migrate-stories-to-6-2.js +17 -17
- package/src/generators/migrate-stories-to-6-2/migrate-stories-to-6-2.js.map +1 -1
- package/src/migrations/update-10-2-1/update-10-2-1.js +4 -4
- package/src/migrations/update-10-2-1/update-10-2-1.js.map +1 -1
- package/src/migrations/update-10-3-0/update-10-3-0.js +11 -11
- package/src/migrations/update-10-3-0/update-10-3-0.js.map +1 -1
- package/src/migrations/update-11-0-12/update-storybook.js +8 -8
- package/src/migrations/update-11-0-12/update-storybook.js.map +1 -1
- package/src/migrations/update-11-5-3/update-lint-ignores.js +6 -6
- package/src/migrations/update-11-5-3/update-lint-ignores.js.map +1 -1
- package/src/migrations/update-11-6-0/update-storybook.js +8 -8
- package/src/migrations/update-11-6-0/update-storybook.js.map +1 -1
- package/src/migrations/update-12-1-0/fix-storybook-tsconfig.js +7 -7
- package/src/migrations/update-12-1-0/fix-storybook-tsconfig.js.map +1 -1
- package/src/migrations/update-12-5-0/install-addon-essentials.js +7 -7
- package/src/migrations/update-12-5-0/install-addon-essentials.js.map +1 -1
- package/src/migrations/update-12-5-0/migrate-storybook-6-3.js +12 -12
- package/src/migrations/update-12-5-0/migrate-storybook-6-3.js.map +1 -1
- package/src/migrations/update-12-5-9/update-storybook-react-typings.js +9 -9
- package/src/migrations/update-12-5-9/update-storybook-react-typings.js.map +1 -1
- package/src/migrations/update-12-8-0/update-storybook-styled-jsx-typings.js +8 -8
- package/src/migrations/update-12-8-0/update-storybook-styled-jsx-typings.js.map +1 -1
- package/src/migrations/update-8-8-2/update-builder-8-8-2.js +6 -6
- package/src/migrations/update-8-8-2/update-builder-8-8-2.js.map +1 -1
- package/src/migrations/update-9-0-0/update-9-0-0.js +2 -2
- package/src/migrations/update-9-0-0/update-9-0-0.js.map +1 -1
- package/src/migrations/update-9-2-0/update-9-2-0.js +3 -3
- package/src/migrations/update-9-2-0/update-9-2-0.js.map +1 -1
- package/src/utils/testing.js +8 -8
- package/src/utils/testing.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/README.md
CHANGED
|
@@ -116,6 +116,6 @@ Even though Nx isn't technology specific, we provide 3 separate flavours of the
|
|
|
116
116
|
|
|
117
117
|
# Engage with the Core Team and the Community
|
|
118
118
|
|
|
119
|
-
- [Nx
|
|
119
|
+
- [The Nx Show Playlist on YouTube](https://www.youtube.com/playlist?list=PLakNactNC1dE8KLQ5zd3fQwu_yQHjTmR5). It's a regular YouTube stream where we talk all things Nx. Join the stream, ask questions, etc.
|
|
120
120
|
- [Follow Nx on Twitter](https://twitter.com/NxDevTools)
|
|
121
121
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/storybook",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0-beta.3",
|
|
4
4
|
"description": "Storybook plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"migrations": "./migrations.json"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@nrwl/cypress": "13.
|
|
33
|
-
"@nrwl/devkit": "13.
|
|
34
|
-
"@nrwl/linter": "13.
|
|
35
|
-
"@nrwl/workspace": "13.
|
|
32
|
+
"@nrwl/cypress": "13.2.0-beta.3",
|
|
33
|
+
"@nrwl/devkit": "13.2.0-beta.3",
|
|
34
|
+
"@nrwl/linter": "13.2.0-beta.3",
|
|
35
|
+
"@nrwl/workspace": "13.2.0-beta.3",
|
|
36
36
|
"core-js": "^3.6.5",
|
|
37
37
|
"semver": "7.3.4",
|
|
38
38
|
"ts-loader": "^9.2.6",
|
|
@@ -9,13 +9,13 @@ const build = require("@storybook/core/standalone");
|
|
|
9
9
|
const utils_1 = require("../utils");
|
|
10
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
11
|
function buildStorybookExecutor(options, context) {
|
|
12
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
13
|
devkit_1.logger.info(`NX ui framework: ${options.uiFramework}`);
|
|
14
|
-
const frameworkPath = utils_1.getStorybookFrameworkPath(options.uiFramework);
|
|
14
|
+
const frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
|
|
15
15
|
const { default: frameworkOptions } = yield Promise.resolve().then(() => require(frameworkPath));
|
|
16
16
|
const option = storybookOptionMapper(options, frameworkOptions, context);
|
|
17
17
|
// print warnings
|
|
18
|
-
utils_1.runStorybookSetupCheck(options);
|
|
18
|
+
(0, utils_1.runStorybookSetupCheck)(options);
|
|
19
19
|
devkit_1.logger.info(`NX Storybook builder starting ...`);
|
|
20
20
|
yield runInstance(option);
|
|
21
21
|
devkit_1.logger.info(`NX Storybook builder finished ...`);
|
|
@@ -28,35 +28,35 @@ function runInstance(options) {
|
|
|
28
28
|
return build(Object.assign(Object.assign({}, options), { ci: true }));
|
|
29
29
|
}
|
|
30
30
|
function storybookOptionMapper(builderOptions, frameworkOptions, context) {
|
|
31
|
-
utils_1.setStorybookAppProject(context, builderOptions.projectBuildConfig);
|
|
31
|
+
(0, utils_1.setStorybookAppProject)(context, builderOptions.projectBuildConfig);
|
|
32
32
|
const storybookConfig = findOrCreateConfig(builderOptions.config, context);
|
|
33
33
|
const optionsWithFramework = Object.assign(Object.assign(Object.assign(Object.assign({}, builderOptions), { mode: 'static', outputDir: builderOptions.outputPath, workspaceRoot: context.root, configDir: storybookConfig }), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])], watch: false });
|
|
34
34
|
optionsWithFramework.config;
|
|
35
35
|
return optionsWithFramework;
|
|
36
36
|
}
|
|
37
37
|
function findOrCreateConfig(config, context) {
|
|
38
|
-
if (config.configFolder && fs_1.statSync(config.configFolder).isDirectory()) {
|
|
38
|
+
if (config.configFolder && (0, fs_1.statSync)(config.configFolder).isDirectory()) {
|
|
39
39
|
return config.configFolder;
|
|
40
40
|
}
|
|
41
|
-
else if (fs_1.statSync(config.configPath).isFile() &&
|
|
42
|
-
fs_1.statSync(config.pluginPath).isFile() &&
|
|
43
|
-
fs_1.statSync(config.srcRoot).isFile()) {
|
|
41
|
+
else if ((0, fs_1.statSync)(config.configPath).isFile() &&
|
|
42
|
+
(0, fs_1.statSync)(config.pluginPath).isFile() &&
|
|
43
|
+
(0, fs_1.statSync)(config.srcRoot).isFile()) {
|
|
44
44
|
return createStorybookConfig(config.configPath, config.pluginPath, config.srcRoot);
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
47
|
const sourceRoot = context.workspace.projects[context.projectName].root;
|
|
48
|
-
if (fs_1.statSync(path_1.join(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
49
|
-
return path_1.join(context.root, sourceRoot, '.storybook');
|
|
48
|
+
if ((0, fs_1.statSync)((0, path_1.join)(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
49
|
+
return (0, path_1.join)(context.root, sourceRoot, '.storybook');
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
throw new Error('No configuration settings');
|
|
53
53
|
}
|
|
54
54
|
function createStorybookConfig(configPath, pluginPath, srcRoot) {
|
|
55
|
-
const tmpDir = os_1.tmpdir();
|
|
56
|
-
const tmpFolder = fs_1.mkdtempSync(`${tmpDir}${path_1.sep}`);
|
|
57
|
-
fs_1.copyFileSync(configPath, `${tmpFolder}${path_1.basename(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
58
|
-
fs_1.copyFileSync(pluginPath, `${tmpFolder}${path_1.basename(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
59
|
-
fs_1.copyFileSync(srcRoot, `${tmpFolder}${path_1.basename(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
55
|
+
const tmpDir = (0, os_1.tmpdir)();
|
|
56
|
+
const tmpFolder = (0, fs_1.mkdtempSync)(`${tmpDir}${path_1.sep}`);
|
|
57
|
+
(0, fs_1.copyFileSync)(configPath, `${tmpFolder}${(0, path_1.basename)(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
58
|
+
(0, fs_1.copyFileSync)(pluginPath, `${tmpFolder}${(0, path_1.basename)(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
59
|
+
(0, fs_1.copyFileSync)(srcRoot, `${tmpFolder}${(0, path_1.basename)(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
60
60
|
return tmpFolder;
|
|
61
61
|
}
|
|
62
62
|
//# sourceMappingURL=build-storybook.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,+BAA2C;AAC3C,2BAA4B;AAC5B,2BAAoE;AAEpE,oDAAoD;AAEpD,oCAIkB;AAClB,yCAAuD;AASvD,SAA8B,sBAAsB,CAClD,OAAgC,EAChC,OAAwB;;QAExB,eAAM,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;QAEvD,MAAM,aAAa,GAAG,iCAAyB,
|
|
1
|
+
{"version":3,"file":"build-storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/build-storybook.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nrwl/devkit");
|
|
4
4
|
const build_storybook_impl_1 = require("./build-storybook.impl");
|
|
5
|
-
exports.default = devkit_1.convertNxExecutor(build_storybook_impl_1.default);
|
|
5
|
+
exports.default = (0, devkit_1.convertNxExecutor)(build_storybook_impl_1.default);
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,iEAA4D;AAE5D,kBAAe,0BAAiB,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/build-storybook/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,iEAA4D;AAE5D,kBAAe,IAAA,0BAAiB,EAAC,8BAAsB,CAAC,CAAC"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const devkit_1 = require("@nrwl/devkit");
|
|
4
4
|
const storybook_impl_1 = require("./storybook.impl");
|
|
5
|
-
exports.default = devkit_1.convertNxExecutor(storybook_impl_1.default);
|
|
5
|
+
exports.default = (0, devkit_1.convertNxExecutor)(storybook_impl_1.default);
|
|
6
6
|
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,qDAAiD;AAEjD,kBAAe,0BAAiB,
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,qDAAiD;AAEjD,kBAAe,IAAA,0BAAiB,EAAC,wBAAiB,CAAC,CAAC"}
|
|
@@ -9,16 +9,16 @@ const server_1 = require("@storybook/core/server");
|
|
|
9
9
|
const utils_1 = require("../utils");
|
|
10
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
11
|
function storybookExecutor(options, context) {
|
|
12
|
-
return tslib_1.__asyncGenerator(this, arguments, function* storybookExecutor_1() {
|
|
13
|
-
let frameworkPath = utils_1.getStorybookFrameworkPath(options.uiFramework);
|
|
14
|
-
const frameworkOptions = (yield tslib_1.__await(Promise.resolve().then(() => require(frameworkPath)))).default;
|
|
12
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* storybookExecutor_1() {
|
|
13
|
+
let frameworkPath = (0, utils_1.getStorybookFrameworkPath)(options.uiFramework);
|
|
14
|
+
const frameworkOptions = (yield (0, tslib_1.__await)(Promise.resolve().then(() => require(frameworkPath)))).default;
|
|
15
15
|
const option = storybookOptionMapper(options, frameworkOptions, context);
|
|
16
16
|
// print warnings
|
|
17
|
-
utils_1.runStorybookSetupCheck(options);
|
|
18
|
-
yield tslib_1.__await(runInstance(option));
|
|
19
|
-
yield yield tslib_1.__await({ success: true });
|
|
17
|
+
(0, utils_1.runStorybookSetupCheck)(options);
|
|
18
|
+
yield (0, tslib_1.__await)(runInstance(option));
|
|
19
|
+
yield yield (0, tslib_1.__await)({ success: true });
|
|
20
20
|
// This Promise intentionally never resolves, leaving the process running
|
|
21
|
-
yield tslib_1.__await(new Promise(() => { }));
|
|
21
|
+
yield (0, tslib_1.__await)(new Promise(() => { }));
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
exports.default = storybookExecutor;
|
|
@@ -26,7 +26,7 @@ function runInstance(options) {
|
|
|
26
26
|
var _a;
|
|
27
27
|
const env = (_a = process.env.NODE_ENV) !== null && _a !== void 0 ? _a : 'development';
|
|
28
28
|
process.env.NODE_ENV = env;
|
|
29
|
-
return server_1.buildDevStandalone(Object.assign(Object.assign({}, options), { ci: true, configType: env.toUpperCase() })).catch((error) => {
|
|
29
|
+
return (0, server_1.buildDevStandalone)(Object.assign(Object.assign({}, options), { ci: true, configType: env.toUpperCase() })).catch((error) => {
|
|
30
30
|
var _a;
|
|
31
31
|
// TODO(juri): find a better cleaner way to handle these. Taken from:
|
|
32
32
|
// https://github.com/storybookjs/storybook/blob/dea23e5e9a3e7f5bb25cb6520d3011cc710796c8/lib/core-server/src/build-dev.ts#L138-L166
|
|
@@ -59,32 +59,32 @@ function runInstance(options) {
|
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
function storybookOptionMapper(builderOptions, frameworkOptions, context) {
|
|
62
|
-
utils_1.setStorybookAppProject(context, builderOptions.projectBuildConfig);
|
|
62
|
+
(0, utils_1.setStorybookAppProject)(context, builderOptions.projectBuildConfig);
|
|
63
63
|
const storybookConfig = findOrCreateConfig(builderOptions.config, context);
|
|
64
64
|
return Object.assign(Object.assign(Object.assign(Object.assign({}, builderOptions), { mode: 'dev', workspaceRoot: context.root, configDir: storybookConfig }), frameworkOptions), { frameworkPresets: [...(frameworkOptions.frameworkPresets || [])] });
|
|
65
65
|
}
|
|
66
66
|
function findOrCreateConfig(config, context) {
|
|
67
67
|
const sourceRoot = context.workspace.projects[context.projectName].root;
|
|
68
|
-
if (config.configFolder && fs_1.statSync(config.configFolder).isDirectory()) {
|
|
68
|
+
if (config.configFolder && (0, fs_1.statSync)(config.configFolder).isDirectory()) {
|
|
69
69
|
return config.configFolder;
|
|
70
70
|
}
|
|
71
|
-
else if (fs_1.statSync(config.configPath).isFile() &&
|
|
72
|
-
fs_1.statSync(config.pluginPath).isFile() &&
|
|
73
|
-
fs_1.statSync(config.srcRoot).isFile()) {
|
|
71
|
+
else if ((0, fs_1.statSync)(config.configPath).isFile() &&
|
|
72
|
+
(0, fs_1.statSync)(config.pluginPath).isFile() &&
|
|
73
|
+
(0, fs_1.statSync)(config.srcRoot).isFile()) {
|
|
74
74
|
return createStorybookConfig(config.configPath, config.pluginPath, config.srcRoot);
|
|
75
75
|
}
|
|
76
|
-
else if (fs_1.statSync(path_1.join(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
77
|
-
return path_1.join(context.root, sourceRoot, '.storybook');
|
|
76
|
+
else if ((0, fs_1.statSync)((0, path_1.join)(context.root, sourceRoot, '.storybook')).isDirectory()) {
|
|
77
|
+
return (0, path_1.join)(context.root, sourceRoot, '.storybook');
|
|
78
78
|
}
|
|
79
79
|
throw new Error('No configuration settings');
|
|
80
80
|
}
|
|
81
81
|
function createStorybookConfig(configPath, pluginPath, srcRoot) {
|
|
82
|
-
const tmpDir = os_1.tmpdir();
|
|
82
|
+
const tmpDir = (0, os_1.tmpdir)();
|
|
83
83
|
const tmpFolder = `${tmpDir}${path_1.sep}`;
|
|
84
|
-
fs_1.mkdtempSync(tmpFolder);
|
|
85
|
-
fs_1.copyFileSync(configPath, `${tmpFolder}/${path_1.basename(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
86
|
-
fs_1.copyFileSync(pluginPath, `${tmpFolder}/${path_1.basename(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
87
|
-
fs_1.copyFileSync(srcRoot, `${tmpFolder}/${path_1.basename(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
84
|
+
(0, fs_1.mkdtempSync)(tmpFolder);
|
|
85
|
+
(0, fs_1.copyFileSync)(configPath, `${tmpFolder}/${(0, path_1.basename)(configPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
86
|
+
(0, fs_1.copyFileSync)(pluginPath, `${tmpFolder}/${(0, path_1.basename)(pluginPath)}`, fs_1.constants.COPYFILE_EXCL);
|
|
87
|
+
(0, fs_1.copyFileSync)(srcRoot, `${tmpFolder}/${(0, path_1.basename)(srcRoot)}`, fs_1.constants.COPYFILE_EXCL);
|
|
88
88
|
return tmpFolder;
|
|
89
89
|
}
|
|
90
90
|
//# sourceMappingURL=storybook.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,+BAA2C;AAC3C,2BAA4B;AAC5B,2BAOY;AAEZ,mDAA4D;AAE5D,oCAIkB;AAClB,yCAA0E;AAc1E,SAA+B,iBAAiB,CAC9C,OAAiC,EACjC,OAAwB;;QAExB,IAAI,aAAa,GAAG,iCAAyB,
|
|
1
|
+
{"version":3,"file":"storybook.impl.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/executors/storybook/storybook.impl.ts"],"names":[],"mappings":"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"}
|
package/src/executors/utils.js
CHANGED
|
@@ -24,8 +24,8 @@ function getStorybookFrameworkPath(uiFramework) {
|
|
|
24
24
|
}
|
|
25
25
|
exports.getStorybookFrameworkPath = getStorybookFrameworkPath;
|
|
26
26
|
function isStorybookV62onwards(uiFramework) {
|
|
27
|
-
const storybookPackageVersion = require(path_1.join(uiFramework, 'package.json')).version;
|
|
28
|
-
return semver_1.gte(storybookPackageVersion, '6.2.0-rc.4');
|
|
27
|
+
const storybookPackageVersion = require((0, path_1.join)(uiFramework, 'package.json')).version;
|
|
28
|
+
return (0, semver_1.gte)(storybookPackageVersion, '6.2.0-rc.4');
|
|
29
29
|
}
|
|
30
30
|
// see: https://github.com/storybookjs/storybook/pull/12565
|
|
31
31
|
// TODO: this should really be passed as a param to the CLI rather than env
|
|
@@ -58,8 +58,18 @@ function runStorybookSetupCheck(options) {
|
|
|
58
58
|
exports.runStorybookSetupCheck = runStorybookSetupCheck;
|
|
59
59
|
function reactWebpack5Check(options) {
|
|
60
60
|
if (options.uiFramework === '@storybook/react') {
|
|
61
|
+
let storybookConfigFilePath = (0, devkit_1.joinPathFragments)(options.config.configFolder, 'main.js');
|
|
62
|
+
if (!(0, fs_1.existsSync)(storybookConfigFilePath)) {
|
|
63
|
+
storybookConfigFilePath = (0, devkit_1.joinPathFragments)(options.config.configFolder, 'main.ts');
|
|
64
|
+
}
|
|
65
|
+
if (!(0, fs_1.existsSync)(storybookConfigFilePath)) {
|
|
66
|
+
// looks like there's no main config file, so skip
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
61
69
|
// check whether the current Storybook configuration has the webpack 5 builder enabled
|
|
62
|
-
const storybookConfig =
|
|
70
|
+
const storybookConfig = (0, fs_1.readFileSync)(storybookConfigFilePath, {
|
|
71
|
+
encoding: 'utf8',
|
|
72
|
+
});
|
|
63
73
|
if (!storybookConfig.includes(`builder: 'webpack5'`)) {
|
|
64
74
|
// storybook needs to be upgraded to webpack 5
|
|
65
75
|
devkit_1.logger.warn(`
|
|
@@ -76,17 +86,17 @@ Make sure you upgrade your Storybook config to use Webpack 5.
|
|
|
76
86
|
function webpackFinalPropertyCheck(options) {
|
|
77
87
|
let placesToCheck = [
|
|
78
88
|
{
|
|
79
|
-
path: devkit_1.joinPathFragments('.storybook', 'webpack.config.js'),
|
|
89
|
+
path: (0, devkit_1.joinPathFragments)('.storybook', 'webpack.config.js'),
|
|
80
90
|
result: false,
|
|
81
91
|
},
|
|
82
92
|
{
|
|
83
|
-
path: devkit_1.joinPathFragments(options.config.configFolder, 'webpack.config.js'),
|
|
93
|
+
path: (0, devkit_1.joinPathFragments)(options.config.configFolder, 'webpack.config.js'),
|
|
84
94
|
result: false,
|
|
85
95
|
},
|
|
86
96
|
];
|
|
87
97
|
placesToCheck = placesToCheck
|
|
88
98
|
.map((entry) => {
|
|
89
|
-
return Object.assign(Object.assign({}, entry), { result: fs_1.existsSync(entry.path) });
|
|
99
|
+
return Object.assign(Object.assign({}, entry), { result: (0, fs_1.existsSync)(entry.path) });
|
|
90
100
|
})
|
|
91
101
|
.filter((x) => x.result === true);
|
|
92
102
|
if (placesToCheck.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/executors/utils.ts"],"names":[],"mappings":";;;AAAA,yCAA0E;AAC1E,2BAA8C;AAC9C,+BAA4B;AAC5B,mCAA6B;AAQ7B,SAAgB,yBAAyB,CAAC,WAAW;IACnD,MAAM,kBAAkB,GAAG;QACzB,oBAAoB,EAAE,8CAA8C;QACpE,kBAAkB,EAAE,0CAA0C;QAC9D,iBAAiB,EAAE,yCAAyC;QAC5D,gBAAgB,EAAE,wCAAwC;QAC1D,iBAAiB,EAAE,yCAAyC;QAC5D,2BAA2B,EACzB,mDAAmD;QACrD,mBAAmB,EAAE,2CAA2C;KACjE,CAAC;IAEF,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE;QACtC,OAAO,kBAAkB,CAAC,WAAW,CAAC,CAAC;KACxC;SAAM;QACL,OAAO,GAAG,WAAW,sBAAsB,CAAC;KAC7C;AACH,CAAC;AAjBD,8DAiBC;AAED,SAAS,qBAAqB,CAAC,WAAW;IACxC,MAAM,uBAAuB,GAAG,OAAO,CAAC,WAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/executors/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,12 +13,12 @@ const init_1 = require("../init/init");
|
|
|
13
13
|
const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
|
|
14
14
|
const semver_1 = require("semver");
|
|
15
15
|
function configurationGenerator(tree, rawSchema) {
|
|
16
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
17
17
|
const schema = normalizeSchema(rawSchema);
|
|
18
18
|
const tasks = [];
|
|
19
19
|
const workspaceStorybookVersion = readCurrentWorkspaceStorybookVersion(tree);
|
|
20
|
-
const { projectType } = devkit_1.readProjectConfiguration(tree, schema.name);
|
|
21
|
-
const initTask = yield init_1.initGenerator(tree, {
|
|
20
|
+
const { projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.name);
|
|
21
|
+
const initTask = yield (0, init_1.initGenerator)(tree, {
|
|
22
22
|
uiFramework: schema.uiFramework,
|
|
23
23
|
});
|
|
24
24
|
tasks.push(initTask);
|
|
@@ -30,7 +30,7 @@ function configurationGenerator(tree, rawSchema) {
|
|
|
30
30
|
addStorybookTask(tree, schema.name, schema.uiFramework);
|
|
31
31
|
if (schema.configureCypress) {
|
|
32
32
|
if (projectType !== 'application') {
|
|
33
|
-
const cypressTask = yield cypress_project_1.cypressProjectGenerator(tree, {
|
|
33
|
+
const cypressTask = yield (0, cypress_project_1.cypressProjectGenerator)(tree, {
|
|
34
34
|
name: schema.name,
|
|
35
35
|
js: schema.js,
|
|
36
36
|
linter: schema.linter,
|
|
@@ -43,8 +43,8 @@ function configurationGenerator(tree, rawSchema) {
|
|
|
43
43
|
devkit_1.logger.warn('There is already an e2e project setup');
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
yield devkit_1.formatFiles(tree);
|
|
47
|
-
return run_tasks_in_serial_1.runTasksInSerial(...tasks);
|
|
46
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
47
|
+
return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
exports.configurationGenerator = configurationGenerator;
|
|
@@ -63,10 +63,10 @@ function createRootStorybookDir(tree, js, workspaceStorybookVersion) {
|
|
|
63
63
|
}
|
|
64
64
|
devkit_1.logger.debug(`adding .storybook folder to the root directory -
|
|
65
65
|
based on the Storybook version installed (v${workspaceStorybookVersion}), we'll bootstrap a scaffold for that particular version.`);
|
|
66
|
-
const templatePath = path_1.join(__dirname, workspaceStorybookVersion === '6' ? './root-files' : './root-files-5');
|
|
67
|
-
devkit_1.generateFiles(tree, templatePath, '', {});
|
|
66
|
+
const templatePath = (0, path_1.join)(__dirname, workspaceStorybookVersion === '6' ? './root-files' : './root-files-5');
|
|
67
|
+
(0, devkit_1.generateFiles)(tree, templatePath, '', {});
|
|
68
68
|
if (js) {
|
|
69
|
-
devkit_1.toJS(tree);
|
|
69
|
+
(0, devkit_1.toJS)(tree);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
function createProjectStorybookDir(tree, projectName, uiFramework, js, workspaceStorybookVersion) {
|
|
@@ -76,31 +76,31 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, workspace
|
|
|
76
76
|
* and use the correct folder
|
|
77
77
|
* lib-files-5 or lib-files-6
|
|
78
78
|
*/
|
|
79
|
-
const { root, projectType } = devkit_1.readProjectConfiguration(tree, projectName);
|
|
79
|
+
const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
80
80
|
const projectDirectory = projectType === 'application' ? 'app' : 'lib';
|
|
81
|
-
const storybookRoot = path_1.join(root, '.storybook');
|
|
81
|
+
const storybookRoot = (0, path_1.join)(root, '.storybook');
|
|
82
82
|
if (tree.exists(storybookRoot)) {
|
|
83
83
|
devkit_1.logger.warn(`.storybook folder already exists for ${projectName}! Skipping generating files in it.`);
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
devkit_1.logger.debug(`adding .storybook folder to ${projectDirectory} - using Storybook version ${workspaceStorybookVersion}`);
|
|
87
|
-
const templatePath = path_1.join(__dirname, workspaceStorybookVersion === '6' ? './project-files' : './project-files-5');
|
|
88
|
-
devkit_1.generateFiles(tree, templatePath, root, {
|
|
87
|
+
const templatePath = (0, path_1.join)(__dirname, workspaceStorybookVersion === '6' ? './project-files' : './project-files-5');
|
|
88
|
+
(0, devkit_1.generateFiles)(tree, templatePath, root, {
|
|
89
89
|
tmpl: '',
|
|
90
90
|
uiFramework,
|
|
91
|
-
offsetFromRoot: devkit_1.offsetFromRoot(root),
|
|
91
|
+
offsetFromRoot: (0, devkit_1.offsetFromRoot)(root),
|
|
92
92
|
projectType: projectDirectory,
|
|
93
93
|
useWebpack5: uiFramework === '@storybook/angular' ||
|
|
94
94
|
uiFramework === '@storybook/react',
|
|
95
95
|
existsRootWebpackConfig: tree.exists('.storybook/webpack.config.js'),
|
|
96
96
|
});
|
|
97
97
|
if (js) {
|
|
98
|
-
devkit_1.toJS(tree);
|
|
98
|
+
(0, devkit_1.toJS)(tree);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
function getTsConfigPath(tree, projectName, path) {
|
|
102
|
-
const { root, projectType } = devkit_1.readProjectConfiguration(tree, projectName);
|
|
103
|
-
return path_1.join(root, path && path.length > 0
|
|
102
|
+
const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
103
|
+
return (0, path_1.join)(root, path && path.length > 0
|
|
104
104
|
? path
|
|
105
105
|
: projectType === 'application'
|
|
106
106
|
? 'tsconfig.app.json'
|
|
@@ -112,7 +112,7 @@ function configureTsProjectConfig(tree, schema) {
|
|
|
112
112
|
let tsConfigContent;
|
|
113
113
|
try {
|
|
114
114
|
tsConfigPath = getTsConfigPath(tree, projectName);
|
|
115
|
-
tsConfigContent = devkit_1.readJson(tree, tsConfigPath);
|
|
115
|
+
tsConfigContent = (0, devkit_1.readJson)(tree, tsConfigPath);
|
|
116
116
|
}
|
|
117
117
|
catch (_a) {
|
|
118
118
|
/**
|
|
@@ -121,30 +121,30 @@ function configureTsProjectConfig(tree, schema) {
|
|
|
121
121
|
* instead of a tsconfig.app.json.
|
|
122
122
|
*/
|
|
123
123
|
tsConfigPath = getTsConfigPath(tree, projectName, 'tsconfig.json');
|
|
124
|
-
tsConfigContent = devkit_1.readJson(tree, tsConfigPath);
|
|
124
|
+
tsConfigContent = (0, devkit_1.readJson)(tree, tsConfigPath);
|
|
125
125
|
}
|
|
126
126
|
tsConfigContent.exclude = [
|
|
127
127
|
...(tsConfigContent.exclude || []),
|
|
128
128
|
'**/*.stories.ts',
|
|
129
129
|
'**/*.stories.js',
|
|
130
|
-
...(utilities_1.isFramework('react', schema)
|
|
130
|
+
...((0, utilities_1.isFramework)('react', schema)
|
|
131
131
|
? ['**/*.stories.jsx', '**/*.stories.tsx']
|
|
132
132
|
: []),
|
|
133
133
|
];
|
|
134
|
-
devkit_1.writeJson(tree, tsConfigPath, tsConfigContent);
|
|
134
|
+
(0, devkit_1.writeJson)(tree, tsConfigPath, tsConfigContent);
|
|
135
135
|
}
|
|
136
136
|
function configureTsSolutionConfig(tree, schema) {
|
|
137
137
|
const { name: projectName } = schema;
|
|
138
|
-
const { root } = devkit_1.readProjectConfiguration(tree, projectName);
|
|
139
|
-
const tsConfigPath = path_1.join(root, 'tsconfig.json');
|
|
140
|
-
const tsConfigContent = devkit_1.readJson(tree, tsConfigPath);
|
|
138
|
+
const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
139
|
+
const tsConfigPath = (0, path_1.join)(root, 'tsconfig.json');
|
|
140
|
+
const tsConfigContent = (0, devkit_1.readJson)(tree, tsConfigPath);
|
|
141
141
|
tsConfigContent.references = [
|
|
142
142
|
...(tsConfigContent.references || []),
|
|
143
143
|
{
|
|
144
144
|
path: './.storybook/tsconfig.json',
|
|
145
145
|
},
|
|
146
146
|
];
|
|
147
|
-
devkit_1.writeJson(tree, tsConfigPath, tsConfigContent);
|
|
147
|
+
(0, devkit_1.writeJson)(tree, tsConfigPath, tsConfigContent);
|
|
148
148
|
}
|
|
149
149
|
/**
|
|
150
150
|
* When adding storybook we need to inform TSLint or ESLint
|
|
@@ -156,16 +156,16 @@ function configureTsSolutionConfig(tree, schema) {
|
|
|
156
156
|
*/
|
|
157
157
|
function updateLintConfig(tree, schema) {
|
|
158
158
|
const { name: projectName } = schema;
|
|
159
|
-
const { targets, root } = devkit_1.readProjectConfiguration(tree, projectName);
|
|
159
|
+
const { targets, root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
160
160
|
const tslintTargets = Object.values(targets).filter((target) => target.executor === '@angular-devkit/build-angular:tslint');
|
|
161
161
|
tslintTargets.forEach((target) => {
|
|
162
162
|
target.options.tsConfig = dedupe([
|
|
163
163
|
...target.options.tsConfig,
|
|
164
|
-
devkit_1.joinPathFragments(root, './.storybook/tsconfig.json'),
|
|
164
|
+
(0, devkit_1.joinPathFragments)(root, './.storybook/tsconfig.json'),
|
|
165
165
|
]);
|
|
166
166
|
});
|
|
167
|
-
if (tree.exists(path_1.join(root, '.eslintrc.json'))) {
|
|
168
|
-
devkit_1.updateJson(tree, path_1.join(root, '.eslintrc.json'), (json) => {
|
|
167
|
+
if (tree.exists((0, path_1.join)(root, '.eslintrc.json'))) {
|
|
168
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(root, '.eslintrc.json'), (json) => {
|
|
169
169
|
var _a, _b, _c, _d;
|
|
170
170
|
if (typeof ((_a = json.parserOptions) === null || _a === void 0 ? void 0 : _a.project) === 'string') {
|
|
171
171
|
json.parserOptions.project = [json.parserOptions.project];
|
|
@@ -173,7 +173,7 @@ function updateLintConfig(tree, schema) {
|
|
|
173
173
|
if (Array.isArray((_b = json.parserOptions) === null || _b === void 0 ? void 0 : _b.project)) {
|
|
174
174
|
json.parserOptions.project = dedupe([
|
|
175
175
|
...json.parserOptions.project,
|
|
176
|
-
path_1.join(root, '.storybook/tsconfig.json'),
|
|
176
|
+
(0, path_1.join)(root, '.storybook/tsconfig.json'),
|
|
177
177
|
]);
|
|
178
178
|
}
|
|
179
179
|
const overrides = json.overrides || [];
|
|
@@ -184,7 +184,7 @@ function updateLintConfig(tree, schema) {
|
|
|
184
184
|
if (Array.isArray((_d = o.parserOptions) === null || _d === void 0 ? void 0 : _d.project)) {
|
|
185
185
|
o.parserOptions.project = dedupe([
|
|
186
186
|
...o.parserOptions.project,
|
|
187
|
-
path_1.join(root, '.storybook/tsconfig.json'),
|
|
187
|
+
(0, path_1.join)(root, '.storybook/tsconfig.json'),
|
|
188
188
|
]);
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -196,7 +196,7 @@ function dedupe(arr) {
|
|
|
196
196
|
return Array.from(new Set(arr));
|
|
197
197
|
}
|
|
198
198
|
function addStorybookTask(tree, projectName, uiFramework) {
|
|
199
|
-
const projectConfig = devkit_1.readProjectConfiguration(tree, projectName);
|
|
199
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
200
200
|
projectConfig.targets['storybook'] = {
|
|
201
201
|
executor: '@nrwl/storybook:storybook',
|
|
202
202
|
options: {
|
|
@@ -217,7 +217,7 @@ function addStorybookTask(tree, projectName, uiFramework) {
|
|
|
217
217
|
outputs: ['{options.outputPath}'],
|
|
218
218
|
options: {
|
|
219
219
|
uiFramework,
|
|
220
|
-
outputPath: devkit_1.joinPathFragments('dist/storybook', projectName),
|
|
220
|
+
outputPath: (0, devkit_1.joinPathFragments)('dist/storybook', projectName),
|
|
221
221
|
config: {
|
|
222
222
|
configFolder: `${projectConfig.root}/.storybook`,
|
|
223
223
|
},
|
|
@@ -228,10 +228,10 @@ function addStorybookTask(tree, projectName, uiFramework) {
|
|
|
228
228
|
},
|
|
229
229
|
},
|
|
230
230
|
};
|
|
231
|
-
devkit_1.updateProjectConfiguration(tree, projectName, projectConfig);
|
|
231
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
232
232
|
}
|
|
233
233
|
function readCurrentWorkspaceStorybookVersion(tree) {
|
|
234
|
-
const packageJsonContents = devkit_1.readJson(tree, 'package.json');
|
|
234
|
+
const packageJsonContents = (0, devkit_1.readJson)(tree, 'package.json');
|
|
235
235
|
let workspaceStorybookVersion = versions_1.storybookVersion;
|
|
236
236
|
if (packageJsonContents && packageJsonContents['devDependencies']) {
|
|
237
237
|
if (packageJsonContents['devDependencies']['@storybook/angular']) {
|
|
@@ -261,11 +261,11 @@ function readCurrentWorkspaceStorybookVersion(tree) {
|
|
|
261
261
|
packageJsonContents['dependencies']['@storybook/core'];
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
|
-
if (semver_1.gte(version_utils_1.checkAndCleanWithSemver('@storybook/core', workspaceStorybookVersion), '6.0.0')) {
|
|
264
|
+
if ((0, semver_1.gte)((0, version_utils_1.checkAndCleanWithSemver)('@storybook/core', workspaceStorybookVersion), '6.0.0')) {
|
|
265
265
|
workspaceStorybookVersion = '6';
|
|
266
266
|
}
|
|
267
267
|
return workspaceStorybookVersion;
|
|
268
268
|
}
|
|
269
269
|
exports.default = configurationGenerator;
|
|
270
|
-
exports.configurationSchematic = devkit_1.convertNxGenerator(configurationGenerator);
|
|
270
|
+
exports.configurationSchematic = (0, devkit_1.convertNxGenerator)(configurationGenerator);
|
|
271
271
|
//# sourceMappingURL=configuration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAesB;AACtB,2FAAqF;AAErF,yCAAsC;AACtC,+BAA4B;AAE5B,qDAA8D;AAC9D,wEAA6E;AAE7E,mDAAwD;AACxD,uCAA6C;AAC7C,+EAAsF;AACtF,mCAA6B;AAE7B,SAAsB,sBAAsB,CAC1C,IAAU,EACV,SAAmC;;QAEnC,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1C,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,yBAAyB,GAAG,oCAAoC,CAAC,IAAI,CAAC,CAAC;QAE7E,MAAM,EAAE,WAAW,EAAE,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Linter } from '@nrwl/linter';
|
|
3
3
|
export interface CypressConfigureSchema {
|
|
4
4
|
name: string;
|
|
@@ -7,6 +7,6 @@ export interface CypressConfigureSchema {
|
|
|
7
7
|
linter: Linter;
|
|
8
8
|
standaloneConfig?: boolean;
|
|
9
9
|
}
|
|
10
|
-
export declare function cypressProjectGenerator(tree: Tree, schema: CypressConfigureSchema): Promise<
|
|
10
|
+
export declare function cypressProjectGenerator(tree: Tree, schema: CypressConfigureSchema): Promise<GeneratorCallback>;
|
|
11
11
|
export default cypressProjectGenerator;
|
|
12
12
|
export declare const cypressProjectSchematic: (options: CypressConfigureSchema) => (tree: any, context: any) => Promise<any>;
|