@nrwl/storybook 13.0.0-beta.2 → 13.0.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/package.json +6 -6
- package/src/executors/utils.js +5 -8
- package/src/executors/utils.js.map +1 -1
- package/src/generators/configuration/configuration.js +1 -1
- package/src/generators/configuration/configuration.js.map +1 -1
- package/src/generators/init/init.js +7 -9
- package/src/generators/init/init.js.map +1 -1
- package/src/utils/utilities.d.ts +0 -1
- package/src/utils/utilities.js +1 -44
- package/src/utils/utilities.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/storybook",
|
|
3
|
-
"version": "13.0.0-beta.
|
|
3
|
+
"version": "13.0.0-beta.3",
|
|
4
4
|
"description": "Storybook plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
"migrations": "./migrations.json"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@nrwl/cypress": "13.0.0-beta.
|
|
33
|
-
"@nrwl/devkit": "13.0.0-beta.
|
|
34
|
-
"@nrwl/linter": "13.0.0-beta.
|
|
35
|
-
"@nrwl/workspace": "13.0.0-beta.
|
|
32
|
+
"@nrwl/cypress": "13.0.0-beta.3",
|
|
33
|
+
"@nrwl/devkit": "13.0.0-beta.3",
|
|
34
|
+
"@nrwl/linter": "13.0.0-beta.3",
|
|
35
|
+
"@nrwl/workspace": "13.0.0-beta.3",
|
|
36
36
|
"core-js": "^3.6.5",
|
|
37
37
|
"semver": "7.3.4",
|
|
38
|
-
"ts-loader": "
|
|
38
|
+
"ts-loader": "^9.2.6",
|
|
39
39
|
"tsconfig-paths-webpack-plugin": "3.4.1"
|
|
40
40
|
}
|
|
41
41
|
}
|
package/src/executors/utils.js
CHANGED
|
@@ -5,7 +5,6 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const fs_1 = require("fs");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const semver_1 = require("semver");
|
|
8
|
-
const utilities_1 = require("../utils/utilities");
|
|
9
8
|
function getStorybookFrameworkPath(uiFramework) {
|
|
10
9
|
const serverOptionsPaths = {
|
|
11
10
|
'@storybook/angular': '@storybook/angular/dist/ts3.9/server/options',
|
|
@@ -58,12 +57,11 @@ function runStorybookSetupCheck(options) {
|
|
|
58
57
|
exports.runStorybookSetupCheck = runStorybookSetupCheck;
|
|
59
58
|
function reactWebpack5Check(options) {
|
|
60
59
|
if (options.uiFramework === '@storybook/react') {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
devkit_1.logger.warn(`
|
|
60
|
+
// check whether the current Storybook configuration has the webpack 5 builder enabled
|
|
61
|
+
const storybookConfig = fs_1.readFileSync(devkit_1.joinPathFragments(options.config.configFolder, 'main.js'), { encoding: 'utf8' });
|
|
62
|
+
if (!storybookConfig.includes(`builder: 'webpack5'`)) {
|
|
63
|
+
// storybook needs to be upgraded to webpack 5
|
|
64
|
+
devkit_1.logger.warn(`
|
|
67
65
|
It looks like you use Webpack 5 but your Storybook setup is not configured to leverage that
|
|
68
66
|
and thus falls back to Webpack 4.
|
|
69
67
|
Make sure you upgrade your Storybook config to use Webpack 5.
|
|
@@ -71,7 +69,6 @@ Make sure you upgrade your Storybook config to use Webpack 5.
|
|
|
71
69
|
- https://gist.github.com/shilman/8856ea1786dcd247139b47b270912324#upgrade
|
|
72
70
|
|
|
73
71
|
`);
|
|
74
|
-
}
|
|
75
72
|
}
|
|
76
73
|
}
|
|
77
74
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/executors/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,7 +91,7 @@ function createProjectStorybookDir(tree, projectName, uiFramework, js, workspace
|
|
|
91
91
|
offsetFromRoot: 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) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,15 +49,13 @@ function checkDependenciesInstalled(host, schema) {
|
|
|
49
49
|
!packageJson.devDependencies['@storybook/react']) {
|
|
50
50
|
devDependencies['@storybook/react'] = versions_1.storybookVersion;
|
|
51
51
|
}
|
|
52
|
-
if (
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
devDependencies['@storybook/manager-webpack5'] = versions_1.storybookVersion;
|
|
60
|
-
}
|
|
52
|
+
if (!packageJson.dependencies['@storybook/builder-webpack5'] &&
|
|
53
|
+
!packageJson.devDependencies['@storybook/builder-webpack5']) {
|
|
54
|
+
devDependencies['@storybook/builder-webpack5'] = versions_1.storybookVersion;
|
|
55
|
+
}
|
|
56
|
+
if (!packageJson.dependencies['@storybook/manager-webpack5'] &&
|
|
57
|
+
!packageJson.devDependencies['@storybook/manager-webpack5']) {
|
|
58
|
+
devDependencies['@storybook/manager-webpack5'] = versions_1.storybookVersion;
|
|
61
59
|
}
|
|
62
60
|
}
|
|
63
61
|
if (utilities_1.isFramework('html', schema)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/storybook/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
package/src/utils/utilities.d.ts
CHANGED
package/src/utils/utilities.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const path_1 = require("path");
|
|
5
|
-
const path = require("path");
|
|
6
|
-
const fs_1 = require("fs");
|
|
3
|
+
exports.safeFileDelete = exports.isFramework = exports.Constants = void 0;
|
|
7
4
|
exports.Constants = {
|
|
8
5
|
addonDependencies: ['@storybook/addons'],
|
|
9
6
|
tsConfigExclusions: ['stories', '**/*.stories.ts'],
|
|
@@ -54,44 +51,4 @@ function safeFileDelete(tree, path) {
|
|
|
54
51
|
}
|
|
55
52
|
}
|
|
56
53
|
exports.safeFileDelete = safeFileDelete;
|
|
57
|
-
// taken from packages/web/src/webpack/entry.ts
|
|
58
|
-
function isWebpack5() {
|
|
59
|
-
const result = requireShim('webpack/package.json');
|
|
60
|
-
const version = result === null || result === void 0 ? void 0 : result.version;
|
|
61
|
-
const forceWebpack4 = process.env.NX_FORCE_WEBPACK_4;
|
|
62
|
-
return !forceWebpack4 && /^5\./.test(version);
|
|
63
|
-
}
|
|
64
|
-
exports.isWebpack5 = isWebpack5;
|
|
65
|
-
// taken from packages/web/src/webpack/require-shim.ts
|
|
66
|
-
function requireShim(path) {
|
|
67
|
-
try {
|
|
68
|
-
return require(path_1.join(pathInner(__dirname), 'node_modules', path));
|
|
69
|
-
}
|
|
70
|
-
catch (_a) {
|
|
71
|
-
return require(path);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
// taken from packages/tao/src/utils/app-root.ts
|
|
75
|
-
function pathInner(dir) {
|
|
76
|
-
if (process.env.NX_WORKSPACE_ROOT_PATH)
|
|
77
|
-
return process.env.NX_WORKSPACE_ROOT_PATH;
|
|
78
|
-
if (path.dirname(dir) === dir)
|
|
79
|
-
return process.cwd();
|
|
80
|
-
if (fileExists(path.join(dir, 'workspace.json')) ||
|
|
81
|
-
fileExists(path.join(dir, 'angular.json'))) {
|
|
82
|
-
return dir;
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
return pathInner(path.dirname(dir));
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
// taken from packages/tao/src/utils/app-root.ts
|
|
89
|
-
function fileExists(filePath) {
|
|
90
|
-
try {
|
|
91
|
-
return fs_1.statSync(filePath).isFile();
|
|
92
|
-
}
|
|
93
|
-
catch (err) {
|
|
94
|
-
return false;
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
54
|
//# sourceMappingURL=utilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../../../packages/storybook/src/utils/utilities.ts"],"names":[],"mappings":";;;AAMa,QAAA,SAAS,GAAG;IACvB,iBAAiB,EAAE,CAAC,mBAAmB,CAAC;IACxC,kBAAkB,EAAE,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAClD,cAAc,EAAE;QACd,SAAS,EAAE,uCAAuC;KACnD;IACD,eAAe,EAAE,CAAC;IAClB,eAAe,EAAE,mBAAmB;IACpC,YAAY,EAAE;QACZ,OAAO,EAAE,oBAAoB;QAC7B,KAAK,EAAE,kBAAkB;QACzB,IAAI,EAAE,iBAAiB;QACvB,gBAAgB,EAAE,2BAA2B;QAC7C,GAAG,EAAE,gBAAgB;QACrB,IAAI,EAAE,iBAAiB;KACf;CACX,CAAC;AAOF,SAAgB,WAAW,CACzB,IAAuB,EACvB,MAAsC;IAEtC,IAAI,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,oBAAoB,EAAE;QACrE,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW,KAAK,kBAAkB,EAAE;QACjE,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,WAAW,KAAK,iBAAiB,EAAE;QAC/D,OAAO,IAAI,CAAC;KACb;IAED,IACE,IAAI,KAAK,gBAAgB;QACzB,MAAM,CAAC,WAAW,KAAK,2BAA2B,EAClD;QACA,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,WAAW,KAAK,gBAAgB,EAAE;QAC7D,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,CAAC,WAAW,KAAK,iBAAiB,EAAE;QAC/D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AA9BD,kCA8BC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,IAAY;IACrD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAPD,wCAOC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.urlLoaderVersion = exports.svgrVersion = exports.babelPresetTypescriptVersion = exports.babelLoaderVersion = exports.babelCoreVersion = exports.storybookVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.0.0-beta.
|
|
4
|
+
exports.nxVersion = '13.0.0-beta.3';
|
|
5
5
|
exports.storybookVersion = '~6.3.0';
|
|
6
6
|
exports.babelCoreVersion = '7.12.13';
|
|
7
7
|
exports.babelLoaderVersion = '8.1.0';
|