@storybook/preset-create-react-app 3.1.6 → 4.0.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/CHANGELOG.md +16 -0
- package/dist/helpers/checkPresets.d.ts +2 -2
- package/dist/helpers/checkPresets.js.map +1 -1
- package/dist/helpers/getModulePath.js.map +1 -1
- package/dist/helpers/mergePlugins.js +21 -5
- package/dist/helpers/mergePlugins.js.map +1 -1
- package/dist/helpers/processCraConfig.d.ts +2 -2
- package/dist/helpers/processCraConfig.js +20 -16
- package/dist/helpers/processCraConfig.js.map +1 -1
- package/dist/index.d.ts +5 -2
- package/dist/index.js +21 -21
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +3 -3
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## 4.0.1
|
|
2
|
+
|
|
3
|
+
- Support CJS files using Storybook's config [#229](https://github.com/storybookjs/presets/pull/229)
|
|
4
|
+
|
|
5
|
+
## 4.0.0
|
|
6
|
+
|
|
7
|
+
- CRA: Add compatibility for CRA v5 [#214](https://github.com/storybookjs/presets/pull/214)
|
|
8
|
+
|
|
9
|
+
## 3.2.0
|
|
10
|
+
|
|
11
|
+
- Add disableWebpackDefaults for forward-compatibility with SB core
|
|
12
|
+
|
|
13
|
+
## 3.1.7
|
|
14
|
+
|
|
15
|
+
- CRA: Fix fast refresh config [#193](https://github.com/storybookjs/presets/pull/193)
|
|
16
|
+
|
|
1
17
|
## 3.1.6
|
|
2
18
|
|
|
3
19
|
- Fix monorepos and PnP [#181](https://github.com/storybookjs/presets/pull/181)
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const checkPresets: (options:
|
|
1
|
+
import { PluginOptions } from '../types';
|
|
2
|
+
export declare const checkPresets: (options: PluginOptions) => void;
|
|
@@ -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;AAEK,IAAM,YAAY,GAAG,UAAC,
|
|
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,OAAsB;IACjD,IAAI,WAAW,GAAa,OAAO,CAAC,WAAW,IAAK,EAAe,CAAC;IAEpE,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,CAAW,WAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;SAChE;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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getModulePath.js","sourceRoot":"","sources":["../../src/helpers/getModulePath.ts"],"names":[],"mappings":";;;AAAA,yBAAgC;AAChC,6BAA4B;
|
|
1
|
+
{"version":3,"file":"getModulePath.js","sourceRoot":"","sources":["../../src/helpers/getModulePath.ts"],"names":[],"mappings":";;;AAAA,yBAAgC;AAChC,6BAA4B;AAQ5B,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,CAAkB,WAAI,CAC/C,YAAY,EACZ,UAAU,CACX,CAAC,CAAC,eAAe,QAHH,CAGI;QACnB,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;AAnBW,QAAA,aAAa,iBAmBxB"}
|
|
@@ -15,12 +15,17 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
15
15
|
}
|
|
16
16
|
return ar;
|
|
17
17
|
};
|
|
18
|
-
var
|
|
19
|
-
for (var
|
|
20
|
-
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
19
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
20
|
+
to[j] = from[i];
|
|
21
|
+
return to;
|
|
22
|
+
};
|
|
23
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
21
25
|
};
|
|
22
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
27
|
exports.mergePlugins = void 0;
|
|
28
|
+
var react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
|
|
24
29
|
var mergePlugins = function () {
|
|
25
30
|
var args = [];
|
|
26
31
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
@@ -29,10 +34,21 @@ var mergePlugins = function () {
|
|
|
29
34
|
return args.reduce(function (plugins, plugin) {
|
|
30
35
|
if (plugins.some(function (includedPlugin) {
|
|
31
36
|
return includedPlugin.constructor.name === plugin.constructor.name;
|
|
32
|
-
})
|
|
37
|
+
}) ||
|
|
38
|
+
plugin.constructor.name === 'WebpackManifestPlugin') {
|
|
33
39
|
return plugins;
|
|
34
40
|
}
|
|
35
|
-
|
|
41
|
+
var updatedPlugin = plugin;
|
|
42
|
+
if (plugin.constructor.name === 'ReactRefreshPlugin') {
|
|
43
|
+
// Storybook uses webpack-hot-middleware
|
|
44
|
+
// https://github.com/storybookjs/presets/issues/177
|
|
45
|
+
updatedPlugin = new react_refresh_webpack_plugin_1.default({
|
|
46
|
+
overlay: {
|
|
47
|
+
sockIntegration: 'whm',
|
|
48
|
+
},
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return __spreadArray(__spreadArray([], __read(plugins)), [updatedPlugin]);
|
|
36
52
|
}, []);
|
|
37
53
|
};
|
|
38
54
|
exports.mergePlugins = mergePlugins;
|
|
@@ -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;YACD,MAAM,CAAC,WAAW,CAAC,IAAI,KAAK,uBAAuB,EACnD;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,aAAa,GAAG,IAAI,sCAAyB,CAAC;gBAC5C,OAAO,EAAE;oBACP,eAAe,EAAE,KAAK;iBACvB;aACF,CAAC,CAAC;SACJ;QACD,8CAAW,OAAO,KAAE,aAAa,GAAE;IACrC,CAAC,EAAE,EAAc,CAAC;AAtBlB,CAsBkB,CAAC;AAvBR,QAAA,YAAY,gBAuBJ"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Configuration, RuleSetRule } from 'webpack';
|
|
2
|
-
import {
|
|
3
|
-
export declare const processCraConfig: (craWebpackConfig: Configuration, options:
|
|
2
|
+
import { PluginOptions } from '../types';
|
|
3
|
+
export declare const processCraConfig: (craWebpackConfig: Configuration, options: PluginOptions) => RuleSetRule[];
|
|
@@ -26,9 +26,10 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
26
26
|
}
|
|
27
27
|
return ar;
|
|
28
28
|
};
|
|
29
|
-
var
|
|
30
|
-
for (var
|
|
31
|
-
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
30
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
31
|
+
to[j] = from[i];
|
|
32
|
+
return to;
|
|
32
33
|
};
|
|
33
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
34
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -70,8 +71,8 @@ var processCraConfig = function (craWebpackConfig, options) {
|
|
|
70
71
|
var oneOf = rule.oneOf, include = rule.include;
|
|
71
72
|
// Add our `configDir` to support JSX and TypeScript in that folder.
|
|
72
73
|
if (testMatch(rule, '.jsx')) {
|
|
73
|
-
var newRule = __assign(__assign({}, rule), { include: [include, configDir] });
|
|
74
|
-
return
|
|
74
|
+
var newRule = __assign(__assign({}, rule), { include: [include, configDir].filter(Boolean) });
|
|
75
|
+
return __spreadArray(__spreadArray([], __read(rules)), [newRule]);
|
|
75
76
|
}
|
|
76
77
|
/*
|
|
77
78
|
* CRA makes use of Webpack's `oneOf` feature.
|
|
@@ -80,22 +81,25 @@ var processCraConfig = function (craWebpackConfig, options) {
|
|
|
80
81
|
* Here, we map over those rules and add our `configDir` as above.
|
|
81
82
|
*/
|
|
82
83
|
if (oneOf) {
|
|
83
|
-
return
|
|
84
|
+
return __spreadArray(__spreadArray([], __read(rules)), [
|
|
84
85
|
{
|
|
85
86
|
oneOf: oneOf.map(function (oneOfRule) {
|
|
86
87
|
var _a, _b;
|
|
87
|
-
|
|
88
|
-
|
|
88
|
+
// @ts-expect-error - This is a conflict with types bundled in Storybook.
|
|
89
|
+
if (oneOfRule.type === 'asset/resource') {
|
|
89
90
|
if (isStorybook530) {
|
|
90
|
-
var excludes =
|
|
91
|
+
var excludes = __spreadArray([
|
|
91
92
|
'ejs',
|
|
92
93
|
'md',
|
|
93
|
-
'mdx'
|
|
94
|
-
|
|
94
|
+
'mdx',
|
|
95
|
+
'cjs'
|
|
96
|
+
], __read((((_a = options.craOverrides) === null || _a === void 0 ? void 0 : _a.fileLoaderExcludes) || [])));
|
|
95
97
|
var excludeRegex = new RegExp("\\.(" + excludes.join('|') + ")$");
|
|
96
98
|
return __assign(__assign({}, oneOfRule), {
|
|
97
99
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
98
|
-
exclude:
|
|
100
|
+
exclude: __spreadArray(__spreadArray([], __read(oneOfRule.exclude)), [
|
|
101
|
+
excludeRegex,
|
|
102
|
+
]) });
|
|
99
103
|
}
|
|
100
104
|
return {};
|
|
101
105
|
}
|
|
@@ -111,9 +115,9 @@ var processCraConfig = function (craWebpackConfig, options) {
|
|
|
111
115
|
isRegExp(oneOfRule.test) &&
|
|
112
116
|
oneOfRule.test.test('.jsx')) {
|
|
113
117
|
var _include = oneOfRule.include, ruleOptions = oneOfRule.options;
|
|
114
|
-
var _c = typeof ruleOptions === 'object' ? ruleOptions : {},
|
|
115
|
-
var
|
|
116
|
-
return __assign(__assign({}, oneOfRule), { include: [_include, configDir], options: __assign(__assign({}, ruleOptions), { extends: _extends, plugins:
|
|
118
|
+
var _c = (typeof ruleOptions === 'object' ? ruleOptions : {}), rulePlugins = _c.plugins, rulePresets = _c.presets;
|
|
119
|
+
var _d = options.babelOptions, _extends = _d.extends, plugins = _d.plugins, presets = _d.presets;
|
|
120
|
+
return __assign(__assign({}, oneOfRule), { include: [_include, configDir].filter(Boolean), options: __assign(__assign({}, ruleOptions), { extends: _extends, plugins: __spreadArray(__spreadArray([], __read((plugins !== null && plugins !== void 0 ? plugins : []))), __read((rulePlugins !== null && rulePlugins !== void 0 ? rulePlugins : []))), presets: __spreadArray(__spreadArray([], __read((presets !== null && presets !== void 0 ? presets : []))), __read((rulePresets !== null && rulePresets !== void 0 ? rulePresets : []))),
|
|
117
121
|
// A temporary fix to align with Storybook 6.
|
|
118
122
|
overrides: [
|
|
119
123
|
{
|
|
@@ -143,7 +147,7 @@ var processCraConfig = function (craWebpackConfig, options) {
|
|
|
143
147
|
},
|
|
144
148
|
]);
|
|
145
149
|
}
|
|
146
|
-
return
|
|
150
|
+
return __spreadArray(__spreadArray([], __read(rules)), [rule]);
|
|
147
151
|
}, []);
|
|
148
152
|
};
|
|
149
153
|
exports.processCraConfig = processCraConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processCraConfig.js","sourceRoot":"","sources":["../../src/helpers/processCraConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processCraConfig.js","sourceRoot":"","sources":["../../src/helpers/processCraConfig.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { Configuration } from 'webpack';
|
|
2
|
-
import {
|
|
2
|
+
import { PluginOptions } from './types';
|
|
3
|
+
export declare const core: () => {
|
|
4
|
+
disableWebpackDefaults: boolean;
|
|
5
|
+
};
|
|
3
6
|
export declare const babelDefault: () => Record<string, (string | [string, object])[]>;
|
|
4
7
|
export declare const managerWebpack: (webpackConfig?: Configuration) => Configuration;
|
|
5
|
-
export declare const webpack: (webpackConfig: Configuration | undefined, options:
|
|
8
|
+
export declare const webpack: (webpackConfig: Configuration | undefined, options: PluginOptions) => Configuration;
|
package/dist/index.js
CHANGED
|
@@ -26,20 +26,21 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
26
26
|
}
|
|
27
27
|
return ar;
|
|
28
28
|
};
|
|
29
|
-
var
|
|
30
|
-
for (var
|
|
31
|
-
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
30
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
31
|
+
to[j] = from[i];
|
|
32
|
+
return to;
|
|
32
33
|
};
|
|
33
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
34
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
35
36
|
};
|
|
36
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
|
-
exports.webpack = exports.managerWebpack = exports.babelDefault = void 0;
|
|
38
|
+
exports.webpack = exports.managerWebpack = exports.babelDefault = exports.core = void 0;
|
|
38
39
|
var path_1 = require("path");
|
|
39
40
|
var semver_1 = __importDefault(require("semver"));
|
|
40
41
|
var node_logger_1 = require("@storybook/node-logger");
|
|
41
42
|
var pnp_webpack_plugin_1 = __importDefault(require("pnp-webpack-plugin"));
|
|
42
|
-
var react_docgen_typescript_plugin_1 = __importDefault(require("react-docgen-typescript-plugin"));
|
|
43
|
+
var react_docgen_typescript_plugin_1 = __importDefault(require("@storybook/react-docgen-typescript-plugin"));
|
|
43
44
|
var mergePlugins_1 = require("./helpers/mergePlugins");
|
|
44
45
|
var getReactScriptsPath_1 = require("./helpers/getReactScriptsPath");
|
|
45
46
|
var processCraConfig_1 = require("./helpers/processCraConfig");
|
|
@@ -58,6 +59,11 @@ var resolveLoader = {
|
|
|
58
59
|
modules: ['node_modules', path_1.join(REACT_SCRIPTS_PATH, 'node_modules')],
|
|
59
60
|
plugins: [pnp_webpack_plugin_1.default.moduleLoader(module)],
|
|
60
61
|
};
|
|
62
|
+
// TODO: Replace with exported type from Storybook.
|
|
63
|
+
var core = function () { return ({
|
|
64
|
+
disableWebpackDefaults: true,
|
|
65
|
+
}); };
|
|
66
|
+
exports.core = core;
|
|
61
67
|
// Don't use Storybook's default Babel config.
|
|
62
68
|
var babelDefault = function () { return ({
|
|
63
69
|
presets: [],
|
|
@@ -72,6 +78,7 @@ var managerWebpack = function (webpackConfig) {
|
|
|
72
78
|
exports.managerWebpack = managerWebpack;
|
|
73
79
|
// Update the core Webpack config.
|
|
74
80
|
var webpack = function (webpackConfig, options) {
|
|
81
|
+
var _a, _b;
|
|
75
82
|
if (webpackConfig === void 0) { webpackConfig = {}; }
|
|
76
83
|
var scriptsPath = REACT_SCRIPTS_PATH;
|
|
77
84
|
// Flag any potentially conflicting presets.
|
|
@@ -104,36 +111,29 @@ var webpack = function (webpackConfig, options) {
|
|
|
104
111
|
});
|
|
105
112
|
// Require the CRA config and set the appropriate mode.
|
|
106
113
|
var craWebpackConfigPath = path_1.join(scriptsPath, 'config', 'webpack.config');
|
|
107
|
-
// eslint-disable-next-line global-require, import/no-dynamic-require, @typescript-eslint/no-var-requires
|
|
114
|
+
// eslint-disable-next-line global-require, import/no-dynamic-require, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-call
|
|
108
115
|
var craWebpackConfig = require(craWebpackConfigPath)(webpackConfig.mode);
|
|
109
|
-
// Select the
|
|
116
|
+
// Select the relevant CRA rules and add the Storybook config directory.
|
|
110
117
|
node_logger_1.logger.info("=> Modifying Create React App rules.");
|
|
111
118
|
var craRules = processCraConfig_1.processCraConfig(craWebpackConfig, options);
|
|
112
|
-
// CRA uses the `ModuleScopePlugin` to limit suppot to the `src` directory.
|
|
113
|
-
// Here, we select the plugin and modify its configuration to include Storybook config directory.
|
|
114
|
-
var plugins = craWebpackConfig.resolve.plugins.map(function (plugin) {
|
|
115
|
-
if (plugin.appSrcs) {
|
|
116
|
-
// Mutate the plugin directly as opposed to recreating it.
|
|
117
|
-
// eslint-disable-next-line no-param-reassign
|
|
118
|
-
plugin.appSrcs = __spread(plugin.appSrcs, [path_1.resolve(options.configDir)]);
|
|
119
|
-
}
|
|
120
|
-
return plugin;
|
|
121
|
-
});
|
|
122
119
|
// NOTE: These are set by default in Storybook 6.
|
|
123
120
|
var isStorybook6 = semver_1.default.gte(options.packageJson.version || '', '6.0.0');
|
|
124
|
-
var
|
|
121
|
+
var _c = options.typescriptOptions, typescriptOptions = _c === void 0 ? {
|
|
125
122
|
reactDocgen: 'react-docgen-typescript',
|
|
126
123
|
reactDocgenTypescriptOptions: {},
|
|
127
|
-
} :
|
|
124
|
+
} : _c;
|
|
128
125
|
var tsDocgenPlugin = !isStorybook6 && typescriptOptions.reactDocgen === 'react-docgen-typescript'
|
|
129
126
|
? [
|
|
130
127
|
new react_docgen_typescript_plugin_1.default(typescriptOptions.reactDocgenTypescriptOptions),
|
|
131
128
|
]
|
|
132
129
|
: [];
|
|
133
130
|
// Return the new config.
|
|
134
|
-
return __assign(__assign({}, webpackConfig), { module: __assign(__assign({}, webpackConfig.module), { rules:
|
|
131
|
+
return __assign(__assign({}, webpackConfig), { module: __assign(__assign({}, webpackConfig.module), { rules: __spreadArray(__spreadArray([], __read((filteredRules || []))), __read(craRules)) }),
|
|
132
|
+
// NOTE: this prioritizes the storybook version of a plugin
|
|
133
|
+
// when there are duplicates between SB and CRA
|
|
134
|
+
plugins: mergePlugins_1.mergePlugins.apply(void 0, __spreadArray(__spreadArray(__spreadArray([], __read((webpackConfig.plugins || []))), __read(((_a = craWebpackConfig.plugins) !== null && _a !== void 0 ? _a : []))), __read(tsDocgenPlugin))), resolve: __assign(__assign({}, webpackConfig.resolve), { extensions: (_b = craWebpackConfig.resolve) === null || _b === void 0 ? void 0 : _b.extensions, modules: __spreadArray(__spreadArray(__spreadArray([], __read(((webpackConfig.resolve && webpackConfig.resolve.modules) || []))), [
|
|
135
135
|
path_1.join(REACT_SCRIPTS_PATH, 'node_modules')
|
|
136
|
-
], getModulePath_1.getModulePath(CWD)), plugins:
|
|
136
|
+
]), __read(getModulePath_1.getModulePath(CWD))), plugins: [pnp_webpack_plugin_1.default] }), resolveLoader: resolveLoader });
|
|
137
137
|
};
|
|
138
138
|
exports.webpack = webpack;
|
|
139
139
|
//# 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":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { PluginItem } from '@babel/core';
|
|
2
|
-
import type { PluginOptions } from 'react-docgen-typescript-plugin';
|
|
2
|
+
import type { PluginOptions as RDTSPluginOptions } from '@storybook/react-docgen-typescript-plugin';
|
|
3
3
|
export declare type Preset = string | {
|
|
4
4
|
name: string;
|
|
5
5
|
};
|
|
6
|
-
export interface
|
|
6
|
+
export interface PluginOptions {
|
|
7
7
|
/**
|
|
8
8
|
* Optionally set the package name of a react-scripts fork.
|
|
9
9
|
* In most cases, the package is located automatically by this preset.
|
|
@@ -27,6 +27,6 @@ export interface StorybookConfig {
|
|
|
27
27
|
};
|
|
28
28
|
typescriptOptions?: {
|
|
29
29
|
reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false;
|
|
30
|
-
reactDocgenTypescriptOptions:
|
|
30
|
+
reactDocgenTypescriptOptions: RDTSPluginOptions;
|
|
31
31
|
};
|
|
32
32
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storybook/preset-create-react-app",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"description": "Create React App preset for Storybook",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist",
|
|
@@ -24,16 +24,16 @@
|
|
|
24
24
|
"prepublishOnly": "yarn build"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
+
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
|
|
27
28
|
"@types/babel__core": "^7.1.7",
|
|
28
|
-
"@types/webpack": "^4.41.13",
|
|
29
29
|
"babel-plugin-react-docgen": "^4.1.0",
|
|
30
|
-
"pnp-webpack-plugin": "^1.
|
|
31
|
-
"react-docgen-typescript-plugin": "
|
|
32
|
-
"semver": "^7.3.
|
|
30
|
+
"pnp-webpack-plugin": "^1.7.0",
|
|
31
|
+
"@storybook/react-docgen-typescript-plugin": "canary",
|
|
32
|
+
"semver": "^7.3.5"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@storybook/node-logger": "^
|
|
36
|
-
"@types/semver": "^7.
|
|
35
|
+
"@storybook/node-logger": "^6.3.2",
|
|
36
|
+
"@types/semver": "^7.3.6",
|
|
37
37
|
"typescript": "^4.1.3"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|