@storybook/preset-create-react-app 3.1.4 → 3.1.7
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 +13 -0
- package/README.md +2 -0
- package/dist/helpers/checkPresets.js +2 -1
- package/dist/helpers/checkPresets.js.map +1 -1
- package/dist/helpers/getModulePath.js +3 -2
- package/dist/helpers/getModulePath.js.map +1 -1
- package/dist/helpers/getReactScriptsPath.d.ts +0 -1
- package/dist/helpers/getReactScriptsPath.js +4 -24
- package/dist/helpers/getReactScriptsPath.js.map +1 -1
- package/dist/helpers/mergePlugins.js +18 -2
- package/dist/helpers/mergePlugins.js.map +1 -1
- package/dist/helpers/processCraConfig.js +5 -2
- package/dist/helpers/processCraConfig.js.map +1 -1
- package/dist/index.js +17 -14
- package/dist/index.js.map +1 -1
- package/package.json +5 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
## 3.1.7
|
|
2
|
+
|
|
3
|
+
- CRA: Fix fast refresh config [#193](https://github.com/storybookjs/presets/pull/193)
|
|
4
|
+
|
|
5
|
+
## 3.1.6
|
|
6
|
+
|
|
7
|
+
- Fix monorepos and PnP [#181](https://github.com/storybookjs/presets/pull/181)
|
|
8
|
+
|
|
9
|
+
## 3.1.5
|
|
10
|
+
|
|
11
|
+
- Fix duplicate ReactDocgenTypescriptPlugin [#173](https://github.com/storybookjs/presets/pull/173)
|
|
12
|
+
- Bump react-docgen-typescript-plugin to 0.6.2 [#174](https://github.com/storybookjs/presets/pull/174)
|
|
13
|
+
|
|
1
14
|
## 3.1.4
|
|
2
15
|
|
|
3
16
|
- Upgrade react-docgen-typescript-plugin to 0.5.x [#158](https://github.com/storybookjs/presets/pull/158)
|
package/README.md
CHANGED
|
@@ -6,6 +6,8 @@ This preset is designed to use alongside [`@storybook/react`](https://github.com
|
|
|
6
6
|
|
|
7
7
|
## Basic usage
|
|
8
8
|
|
|
9
|
+
**Note: you don't need to do this manually** if you used `npx -p @storybook/cli sb init` on a create-react-app, everything should properly setup already ✅.
|
|
10
|
+
|
|
9
11
|
First, install this preset to your project.
|
|
10
12
|
|
|
11
13
|
```sh
|
|
@@ -7,7 +7,7 @@ var incompatiblePresets = [
|
|
|
7
7
|
'@storybook/preset-scss',
|
|
8
8
|
'@storybook/preset-typescript',
|
|
9
9
|
];
|
|
10
|
-
|
|
10
|
+
var checkPresets = function (options) {
|
|
11
11
|
var presetsList = options.presetsList || [];
|
|
12
12
|
// Look for a legacy presets file if one exists.
|
|
13
13
|
if (!options.presetsList) {
|
|
@@ -27,4 +27,5 @@ exports.checkPresets = function (options) {
|
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
|
+
exports.checkPresets = checkPresets;
|
|
30
31
|
//# sourceMappingURL=checkPresets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkPresets.js","sourceRoot":"","sources":["../../src/helpers/checkPresets.ts"],"names":[],"mappings":";;;AAAA,6BAAqC;AACrC,sDAAgD;AAGhD,IAAM,mBAAmB,GAAG;IAC1B,wBAAwB;IACxB,8BAA8B;CAC/B,CAAC;
|
|
1
|
+
{"version":3,"file":"checkPresets.js","sourceRoot":"","sources":["../../src/helpers/checkPresets.ts"],"names":[],"mappings":";;;AAAA,6BAAqC;AACrC,sDAAgD;AAGhD,IAAM,mBAAmB,GAAG;IAC1B,wBAAwB;IACxB,8BAA8B;CAC/B,CAAC;AAEK,IAAM,YAAY,GAAG,UAAC,OAAwB;IACnD,IAAI,WAAW,GAAa,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;IAEtD,gDAAgD;IAChD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,IAAI;YACF,IAAM,SAAS,GAAG,cAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC7C,yGAAyG;YACzG,WAAW,GAAG,OAAO,CAAC,WAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SACtD;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;SACR;KACF;IAED,WAAW,CAAC,OAAO,CAAC,UAAC,MAAiC;QACpD,IAAM,UAAU,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;QACrE,IAAI,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC5C,oBAAM,CAAC,IAAI,CACT,MAAK,UAAU,sEAAsE,CACtF,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB"}
|
|
@@ -5,7 +5,7 @@ var fs_1 = require("fs");
|
|
|
5
5
|
var path_1 = require("path");
|
|
6
6
|
var JSCONFIG = 'jsconfig.json';
|
|
7
7
|
var TSCONFIG = 'tsconfig.json';
|
|
8
|
-
|
|
8
|
+
var getModulePath = function (appDirectory) {
|
|
9
9
|
// CRA only supports `jsconfig.json` if `tsconfig.json` doesn't exist.
|
|
10
10
|
var configName = '';
|
|
11
11
|
if (fs_1.existsSync(path_1.join(appDirectory, TSCONFIG))) {
|
|
@@ -17,10 +17,11 @@ exports.getModulePath = function (appDirectory) {
|
|
|
17
17
|
try {
|
|
18
18
|
// eslint-disable-next-line global-require, import/no-dynamic-require, @typescript-eslint/no-var-requires
|
|
19
19
|
var baseUrl = require(path_1.join(appDirectory, configName)).compilerOptions.baseUrl;
|
|
20
|
-
return baseUrl ? [baseUrl] : [];
|
|
20
|
+
return (baseUrl ? [baseUrl] : []);
|
|
21
21
|
}
|
|
22
22
|
catch (e) {
|
|
23
23
|
return [];
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
|
+
exports.getModulePath = getModulePath;
|
|
26
27
|
//# sourceMappingURL=getModulePath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getModulePath.js","sourceRoot":"","sources":["../../src/helpers/getModulePath.ts"],"names":[],"mappings":";;;AAAA,yBAAgC;AAChC,6BAA4B;AAE5B,IAAM,QAAQ,GAAG,eAAe,CAAC;AACjC,IAAM,QAAQ,GAAG,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getModulePath.js","sourceRoot":"","sources":["../../src/helpers/getModulePath.ts"],"names":[],"mappings":";;;AAAA,yBAAgC;AAChC,6BAA4B;AAE5B,IAAM,QAAQ,GAAG,eAAe,CAAC;AACjC,IAAM,QAAQ,GAAG,eAAe,CAAC;AAE1B,IAAM,aAAa,GAAG,UAAC,YAAoB;IAChD,sEAAsE;IACtE,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,eAAU,CAAC,WAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,EAAE;QAC5C,UAAU,GAAG,QAAQ,CAAC;KACvB;SAAM,IAAI,eAAU,CAAC,WAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,EAAE;QACnD,UAAU,GAAG,QAAQ,CAAC;KACvB;IAED,IAAI;QACF,yGAAyG;QACjG,IAAA,OAAO,GAAK,OAAO,CAAC,WAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,eAAe,QAA5D,CAA6D;QAC5E,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAa,CAAC;KAC/C;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAhBW,QAAA,aAAa,iBAgBxB"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getReactScriptsPath = void 0;
|
|
4
4
|
var fs_1 = require("fs");
|
|
5
5
|
var path_1 = require("path");
|
|
6
|
-
|
|
6
|
+
var getReactScriptsPath = function () {
|
|
7
7
|
var cwd = process.cwd();
|
|
8
8
|
var scriptsBinPath = path_1.join(cwd, '/node_modules/.bin/react-scripts');
|
|
9
9
|
if (process.platform === 'win32') {
|
|
@@ -42,7 +42,7 @@ exports.getReactScriptsPath = function () {
|
|
|
42
42
|
* Try to find the `react-scripts` package by name (won't catch forked scripts packages).
|
|
43
43
|
*/
|
|
44
44
|
try {
|
|
45
|
-
var scriptsPath = require.resolve('react-scripts');
|
|
45
|
+
var scriptsPath = path_1.dirname(require.resolve('react-scripts/package.json'));
|
|
46
46
|
return scriptsPath;
|
|
47
47
|
}
|
|
48
48
|
catch (e) {
|
|
@@ -50,25 +50,5 @@ exports.getReactScriptsPath = function () {
|
|
|
50
50
|
}
|
|
51
51
|
return '';
|
|
52
52
|
};
|
|
53
|
-
exports.
|
|
54
|
-
if (packageName === void 0) { packageName = 'react-scripts'; }
|
|
55
|
-
/*
|
|
56
|
-
* Use Plug'n'Play API to introspect the dependency tree at runtime.
|
|
57
|
-
* See https://yarnpkg.com/advanced/pnpapi for more.
|
|
58
|
-
*/
|
|
59
|
-
// eslint-disable-next-line import/no-unresolved, @typescript-eslint/no-var-requires, global-require
|
|
60
|
-
var pnpApi = require('pnpapi');
|
|
61
|
-
// Get list of all dependencies of the project
|
|
62
|
-
var packageDependencies = pnpApi.getPackageInformation({
|
|
63
|
-
name: null,
|
|
64
|
-
reference: null,
|
|
65
|
-
}).packageDependencies;
|
|
66
|
-
/*
|
|
67
|
-
* Get location of the package named `packageName`, this package must be
|
|
68
|
-
* listed as dependency to be able to find it's location (and no more just
|
|
69
|
-
* be present in node_modules folder)
|
|
70
|
-
*/
|
|
71
|
-
var packageLocation = pnpApi.getPackageInformation(pnpApi.getLocator(packageName, packageDependencies.get(packageName))).packageLocation;
|
|
72
|
-
return packageLocation;
|
|
73
|
-
};
|
|
53
|
+
exports.getReactScriptsPath = getReactScriptsPath;
|
|
74
54
|
//# sourceMappingURL=getReactScriptsPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getReactScriptsPath.js","sourceRoot":"","sources":["../../src/helpers/getReactScriptsPath.ts"],"names":[],"mappings":";;;AAAA,yBAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"getReactScriptsPath.js","sourceRoot":"","sources":["../../src/helpers/getReactScriptsPath.ts"],"names":[],"mappings":";;;AAAA,yBAAgD;AAChD,6BAAqC;AAE9B,IAAM,mBAAmB,GAAG;IACjC,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAM,cAAc,GAAG,WAAI,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;IAErE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QAChC;;;WAGG;QACH,IAAI;YACF,IAAM,OAAO,GAAG,iBAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YACrD,iEAAiE;YACjE,IAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CACpC,uDAAuD,CACxD,CAAC;YAEF,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnD,IAAM,WAAW,GAAG,WAAI,CACtB,GAAG,EACH,qBAAqB,EACrB,gBAAgB,CAAC,CAAC,CAAC,CACpB,CAAC;gBACF,OAAO,WAAW,CAAC;aACpB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;SACR;KACF;SAAM;QACL;;;WAGG;QACH,IAAI;YACF,IAAM,eAAe,GAAG,iBAAY,CAAC,cAAc,CAAC,CAAC;YACrD,IAAM,WAAW,GAAG,WAAI,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACtD,OAAO,WAAW,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;SACR;KACF;IAED;;OAEG;IACH,IAAI;QACF,IAAM,WAAW,GAAG,cAAO,CAAC,OAAO,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC3E,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AApDW,QAAA,mBAAmB,uBAoD9B"}
|
|
@@ -19,9 +19,13 @@ var __spread = (this && this.__spread) || function () {
|
|
|
19
19
|
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
|
|
20
20
|
return ar;
|
|
21
21
|
};
|
|
22
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
|
+
};
|
|
22
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
26
|
exports.mergePlugins = void 0;
|
|
24
|
-
|
|
27
|
+
var react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
|
|
28
|
+
var mergePlugins = function () {
|
|
25
29
|
var args = [];
|
|
26
30
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
27
31
|
args[_i] = arguments[_i];
|
|
@@ -32,7 +36,19 @@ exports.mergePlugins = function () {
|
|
|
32
36
|
})) {
|
|
33
37
|
return plugins;
|
|
34
38
|
}
|
|
35
|
-
|
|
39
|
+
var updatedPlugin = plugin;
|
|
40
|
+
if (plugin.constructor.name === 'ReactRefreshPlugin') {
|
|
41
|
+
// Storybook uses webpack-hot-middleware
|
|
42
|
+
// https://github.com/storybookjs/presets/issues/177
|
|
43
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
44
|
+
updatedPlugin = new react_refresh_webpack_plugin_1.default({
|
|
45
|
+
overlay: {
|
|
46
|
+
sockIntegration: 'whm',
|
|
47
|
+
},
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
return __spread(plugins, [updatedPlugin]);
|
|
36
51
|
}, []);
|
|
37
52
|
};
|
|
53
|
+
exports.mergePlugins = mergePlugins;
|
|
38
54
|
//# sourceMappingURL=mergePlugins.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergePlugins.js","sourceRoot":"","sources":["../../src/helpers/mergePlugins.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mergePlugins.js","sourceRoot":"","sources":["../../src/helpers/mergePlugins.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sGAA6E;AAEtE,IAAM,YAAY,GAAG;IAAC,cAAiB;SAAjB,UAAiB,EAAjB,qBAAiB,EAAjB,IAAiB;QAAjB,yBAAiB;;IAC5C,OAAA,IAAI,CAAC,MAAM,CAAC,UAAC,OAAO,EAAE,MAAM;QAC1B,IACE,OAAO,CAAC,IAAI,CACV,UAAC,cAAc;YACb,OAAA,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,IAAI;QAA3D,CAA2D,CAC9D,EACD;YACA,OAAO,OAAO,CAAC;SAChB;QACD,IAAI,aAAa,GAAG,MAAM,CAAC;QAC3B,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,oBAAoB,EAAE;YACpD,wCAAwC;YACxC,oDAAoD;YAEpD,mEAAmE;YACnE,aAAa,GAAG,IAAI,sCAAyB,CAAC;gBAC5C,OAAO,EAAE;oBACP,eAAe,EAAE,KAAK;iBACvB;aACF,CAAC,CAAC;SACJ;QACD,gBAAW,OAAO,GAAE,aAAa,GAAE;IACrC,CAAC,EAAE,EAAc,CAAC;AAtBlB,CAsBkB,CAAC;AAvBR,QAAA,YAAY,gBAuBJ"}
|
|
@@ -51,7 +51,7 @@ var testMatch = function (rule, string) {
|
|
|
51
51
|
? rule.test.some(function (test) { return isRegExp(test) && test.test(string); })
|
|
52
52
|
: isRegExp(rule.test) && rule.test.test(string);
|
|
53
53
|
};
|
|
54
|
-
|
|
54
|
+
var processCraConfig = function (craWebpackConfig, options) {
|
|
55
55
|
var configDir = path_1.resolve(options.configDir);
|
|
56
56
|
/*
|
|
57
57
|
* NOTE: As of version 5.3.0 of Storybook, Storybook's default loaders are no
|
|
@@ -93,7 +93,9 @@ exports.processCraConfig = function (craWebpackConfig, options) {
|
|
|
93
93
|
'mdx'
|
|
94
94
|
], (((_a = options.craOverrides) === null || _a === void 0 ? void 0 : _a.fileLoaderExcludes) || []));
|
|
95
95
|
var excludeRegex = new RegExp("\\.(" + excludes.join('|') + ")$");
|
|
96
|
-
return __assign(__assign({}, oneOfRule), {
|
|
96
|
+
return __assign(__assign({}, oneOfRule), {
|
|
97
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
98
|
+
exclude: __spread(oneOfRule.exclude, [excludeRegex]) });
|
|
97
99
|
}
|
|
98
100
|
return {};
|
|
99
101
|
}
|
|
@@ -144,4 +146,5 @@ exports.processCraConfig = function (craWebpackConfig, options) {
|
|
|
144
146
|
return __spread(rules, [rule]);
|
|
145
147
|
}, []);
|
|
146
148
|
};
|
|
149
|
+
exports.processCraConfig = processCraConfig;
|
|
147
150
|
//# sourceMappingURL=processCraConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processCraConfig.js","sourceRoot":"","sources":["../../src/helpers/processCraConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAE/B,kDAA4B;
|
|
1
|
+
{"version":3,"file":"processCraConfig.js","sourceRoot":"","sources":["../../src/helpers/processCraConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
37
|
exports.webpack = exports.managerWebpack = exports.babelDefault = void 0;
|
|
38
38
|
var path_1 = require("path");
|
|
39
|
+
var semver_1 = __importDefault(require("semver"));
|
|
39
40
|
var node_logger_1 = require("@storybook/node-logger");
|
|
40
41
|
var pnp_webpack_plugin_1 = __importDefault(require("pnp-webpack-plugin"));
|
|
41
42
|
var react_docgen_typescript_plugin_1 = __importDefault(require("react-docgen-typescript-plugin"));
|
|
@@ -45,12 +46,7 @@ var processCraConfig_1 = require("./helpers/processCraConfig");
|
|
|
45
46
|
var checkPresets_1 = require("./helpers/checkPresets");
|
|
46
47
|
var getModulePath_1 = require("./helpers/getModulePath");
|
|
47
48
|
var CWD = process.cwd();
|
|
48
|
-
|
|
49
|
-
// indicating the version of the PnP standard, see: https://yarnpkg.com/advanced/pnpapi#processversionspnp
|
|
50
|
-
var IS_USING_YARN_PNP = typeof process.versions.pnp !== 'undefined';
|
|
51
|
-
var REACT_SCRIPTS_PATH = IS_USING_YARN_PNP
|
|
52
|
-
? getReactScriptsPath_1.getReactScriptsPathWithYarnPnp()
|
|
53
|
-
: getReactScriptsPath_1.getReactScriptsPath();
|
|
49
|
+
var REACT_SCRIPTS_PATH = getReactScriptsPath_1.getReactScriptsPath();
|
|
54
50
|
var OPTION_SCRIPTS_PACKAGE = 'scriptsPackageName';
|
|
55
51
|
// Ensures that assets are served from the correct path when Storybook is built.
|
|
56
52
|
// Resolves: https://github.com/storybookjs/storybook/issues/4645
|
|
@@ -63,17 +59,19 @@ var resolveLoader = {
|
|
|
63
59
|
plugins: [pnp_webpack_plugin_1.default.moduleLoader(module)],
|
|
64
60
|
};
|
|
65
61
|
// Don't use Storybook's default Babel config.
|
|
66
|
-
|
|
62
|
+
var babelDefault = function () { return ({
|
|
67
63
|
presets: [],
|
|
68
64
|
plugins: [],
|
|
69
65
|
}); };
|
|
66
|
+
exports.babelDefault = babelDefault;
|
|
70
67
|
// Ensure that loaders are resolved from react-scripts.
|
|
71
|
-
|
|
68
|
+
var managerWebpack = function (webpackConfig) {
|
|
72
69
|
if (webpackConfig === void 0) { webpackConfig = {}; }
|
|
73
70
|
return (__assign(__assign({}, webpackConfig), { resolveLoader: resolveLoader }));
|
|
74
71
|
};
|
|
72
|
+
exports.managerWebpack = managerWebpack;
|
|
75
73
|
// Update the core Webpack config.
|
|
76
|
-
|
|
74
|
+
var webpack = function (webpackConfig, options) {
|
|
77
75
|
if (webpackConfig === void 0) { webpackConfig = {}; }
|
|
78
76
|
var scriptsPath = REACT_SCRIPTS_PATH;
|
|
79
77
|
// Flag any potentially conflicting presets.
|
|
@@ -82,9 +80,9 @@ exports.webpack = function (webpackConfig, options) {
|
|
|
82
80
|
var scriptsPackageName = options[OPTION_SCRIPTS_PACKAGE];
|
|
83
81
|
if (typeof scriptsPackageName === 'string') {
|
|
84
82
|
try {
|
|
85
|
-
scriptsPath =
|
|
86
|
-
|
|
87
|
-
|
|
83
|
+
scriptsPath = path_1.dirname(require.resolve(scriptsPackageName + "/package.json", {
|
|
84
|
+
paths: [options.configDir],
|
|
85
|
+
}));
|
|
88
86
|
}
|
|
89
87
|
catch (e) {
|
|
90
88
|
node_logger_1.logger.warn("A `" + OPTION_SCRIPTS_PACKAGE + "` was provided, but couldn't be resolved.");
|
|
@@ -122,18 +120,23 @@ exports.webpack = function (webpackConfig, options) {
|
|
|
122
120
|
return plugin;
|
|
123
121
|
});
|
|
124
122
|
// NOTE: These are set by default in Storybook 6.
|
|
123
|
+
var isStorybook6 = semver_1.default.gte(options.packageJson.version || '', '6.0.0');
|
|
125
124
|
var _a = options.typescriptOptions, typescriptOptions = _a === void 0 ? {
|
|
126
125
|
reactDocgen: 'react-docgen-typescript',
|
|
127
126
|
reactDocgenTypescriptOptions: {},
|
|
128
127
|
} : _a;
|
|
129
|
-
var tsDocgenPlugin = typescriptOptions.reactDocgen === 'react-docgen-typescript'
|
|
128
|
+
var tsDocgenPlugin = !isStorybook6 && typescriptOptions.reactDocgen === 'react-docgen-typescript'
|
|
130
129
|
? [
|
|
131
130
|
new react_docgen_typescript_plugin_1.default(typescriptOptions.reactDocgenTypescriptOptions),
|
|
132
131
|
]
|
|
133
132
|
: [];
|
|
134
133
|
// Return the new config.
|
|
135
|
-
return __assign(__assign({}, webpackConfig), { module: __assign(__assign({}, webpackConfig.module), { rules: __spread((filteredRules || []), craRules) }),
|
|
134
|
+
return __assign(__assign({}, webpackConfig), { module: __assign(__assign({}, webpackConfig.module), { rules: __spread((filteredRules || []), craRules) }),
|
|
135
|
+
// NOTE: this prioritizes the storybook version of a plugin
|
|
136
|
+
// when there are duplicates between SB and CRA
|
|
137
|
+
plugins: mergePlugins_1.mergePlugins.apply(void 0, __spread((webpackConfig.plugins || []), craWebpackConfig.plugins, tsDocgenPlugin)), resolve: __assign(__assign({}, webpackConfig.resolve), { extensions: craWebpackConfig.resolve.extensions, modules: __spread(((webpackConfig.resolve && webpackConfig.resolve.modules) || []), [
|
|
136
138
|
path_1.join(REACT_SCRIPTS_PATH, 'node_modules')
|
|
137
139
|
], getModulePath_1.getModulePath(CWD)), plugins: __spread(plugins, [pnp_webpack_plugin_1.default]) }), resolveLoader: resolveLoader });
|
|
138
140
|
};
|
|
141
|
+
exports.webpack = webpack;
|
|
139
142
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAwD;AAExD,sDAAgD;AAChD,0EAAkD;AAClD,kGAAyE;AACzE,uDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storybook/preset-create-react-app",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.7",
|
|
4
4
|
"description": "Create React App preset for Storybook",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist",
|
|
@@ -18,23 +18,24 @@
|
|
|
18
18
|
"dist"
|
|
19
19
|
],
|
|
20
20
|
"scripts": {
|
|
21
|
-
"build": "rm -rf dist
|
|
21
|
+
"build": "rm -rf dist && tsc",
|
|
22
22
|
"build-watch": "yarn build -w",
|
|
23
23
|
"build-storybook": "exit 0;",
|
|
24
24
|
"prepublishOnly": "yarn build"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
+
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
|
|
27
28
|
"@types/babel__core": "^7.1.7",
|
|
28
29
|
"@types/webpack": "^4.41.13",
|
|
29
30
|
"babel-plugin-react-docgen": "^4.1.0",
|
|
30
31
|
"pnp-webpack-plugin": "^1.6.4",
|
|
31
|
-
"react-docgen-typescript-plugin": "^0.
|
|
32
|
+
"react-docgen-typescript-plugin": "^0.6.2",
|
|
32
33
|
"semver": "^7.3.2"
|
|
33
34
|
},
|
|
34
35
|
"devDependencies": {
|
|
35
36
|
"@storybook/node-logger": "^5.3.19",
|
|
36
37
|
"@types/semver": "^7.2.0",
|
|
37
|
-
"typescript": "^
|
|
38
|
+
"typescript": "^4.1.3"
|
|
38
39
|
},
|
|
39
40
|
"peerDependencies": {
|
|
40
41
|
"@babel/core": "*",
|