@storybook/core-common 6.5.0-alpha.7 → 6.5.0-beta.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.
Files changed (78) hide show
  1. package/dist/cjs/index.js +41 -1
  2. package/dist/cjs/presets.js +77 -62
  3. package/dist/cjs/types.js +5 -1
  4. package/dist/cjs/utils/babel.js +3 -1
  5. package/dist/cjs/utils/cache.js +2 -4
  6. package/dist/cjs/utils/envs.js +8 -4
  7. package/dist/cjs/utils/es6Transpiler.js +1 -1
  8. package/dist/cjs/utils/file-cache.js +71 -0
  9. package/dist/cjs/utils/interpret-files.js +3 -1
  10. package/dist/cjs/utils/load-custom-babel-config.js +2 -2
  11. package/dist/cjs/utils/merge-webpack-config.js +2 -2
  12. package/dist/cjs/utils/normalize-stories.js +20 -25
  13. package/dist/cjs/utils/paths.js +3 -7
  14. package/dist/cjs/utils/safeResolve.js +30 -0
  15. package/dist/cjs/utils/template.js +9 -7
  16. package/dist/cjs/utils/to-importFn.js +2 -2
  17. package/dist/cjs/utils/to-require-context.js +1 -1
  18. package/dist/esm/index.js +2 -1
  19. package/dist/esm/presets.js +74 -60
  20. package/dist/esm/types.js +1 -0
  21. package/dist/esm/utils/babel.js +3 -1
  22. package/dist/esm/utils/cache.js +2 -2
  23. package/dist/esm/utils/envs.js +8 -4
  24. package/dist/esm/utils/es6Transpiler.js +1 -1
  25. package/dist/esm/utils/file-cache.js +57 -0
  26. package/dist/esm/utils/interpret-files.js +1 -0
  27. package/dist/esm/utils/load-custom-babel-config.js +2 -2
  28. package/dist/esm/utils/merge-webpack-config.js +2 -2
  29. package/dist/esm/utils/normalize-stories.js +19 -24
  30. package/dist/esm/utils/paths.js +2 -3
  31. package/dist/esm/utils/safeResolve.js +15 -0
  32. package/dist/esm/utils/template.js +6 -5
  33. package/dist/esm/utils/to-require-context.js +1 -1
  34. package/dist/modern/index.js +2 -1
  35. package/dist/modern/presets.js +74 -60
  36. package/dist/modern/types.js +1 -0
  37. package/dist/modern/utils/babel.js +3 -1
  38. package/dist/modern/utils/cache.js +2 -2
  39. package/dist/modern/utils/envs.js +8 -4
  40. package/dist/modern/utils/es6Transpiler.js +1 -1
  41. package/dist/modern/utils/file-cache.js +57 -0
  42. package/dist/modern/utils/interpret-files.js +1 -0
  43. package/dist/modern/utils/load-custom-babel-config.js +2 -2
  44. package/dist/modern/utils/merge-webpack-config.js +2 -2
  45. package/dist/modern/utils/normalize-stories.js +19 -24
  46. package/dist/modern/utils/paths.js +2 -3
  47. package/dist/modern/utils/safeResolve.js +15 -0
  48. package/dist/modern/utils/template.js +6 -5
  49. package/dist/modern/utils/to-require-context.js +1 -1
  50. package/dist/ts3.4/index.d.ts +1 -0
  51. package/dist/ts3.4/presets.d.ts +16 -5
  52. package/dist/ts3.4/types.d.ts +22 -3
  53. package/dist/ts3.4/utils/cache.d.ts +1 -2
  54. package/dist/ts3.4/utils/file-cache.d.ts +30 -0
  55. package/dist/ts3.4/utils/paths.d.ts +1 -2
  56. package/dist/ts3.4/utils/safeResolve.d.ts +2 -0
  57. package/dist/ts3.9/index.d.ts +1 -0
  58. package/dist/ts3.9/presets.d.ts +16 -5
  59. package/dist/ts3.9/types.d.ts +24 -5
  60. package/dist/ts3.9/utils/cache.d.ts +1 -2
  61. package/dist/ts3.9/utils/file-cache.d.ts +30 -0
  62. package/dist/ts3.9/utils/merge-webpack-config.d.ts +1 -1
  63. package/dist/ts3.9/utils/paths.d.ts +1 -2
  64. package/dist/ts3.9/utils/safeResolve.d.ts +2 -0
  65. package/package.json +7 -6
  66. package/{dist/cjs/templates → templates}/base-manager-head.html +0 -0
  67. package/{dist/cjs/templates → templates}/base-preview-body.html +0 -0
  68. package/{dist/esm/templates → templates}/base-preview-head.html +14 -0
  69. package/{dist/cjs/templates → templates}/index.ejs +0 -0
  70. package/dist/cjs/templates/base-preview-head.html +0 -335
  71. package/dist/esm/templates/base-manager-head.html +0 -46
  72. package/dist/esm/templates/base-preview-body.html +0 -87
  73. package/dist/esm/templates/index.ejs +0 -43
  74. package/dist/modern/templates/base-manager-head.html +0 -46
  75. package/dist/modern/templates/base-preview-body.html +0 -87
  76. package/dist/modern/templates/base-preview-head.html +0 -335
  77. package/dist/modern/templates/index.ejs +0 -43
  78. package/typings.d.ts +0 -38
package/dist/cjs/index.js CHANGED
@@ -3,11 +3,21 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ var _exportNames = {
7
+ createFileSystemCache: true
8
+ };
9
+ Object.defineProperty(exports, "createFileSystemCache", {
10
+ enumerable: true,
11
+ get: function () {
12
+ return _fileCache.createFileSystemCache;
13
+ }
14
+ });
6
15
 
7
16
  var _presets = require("./presets");
8
17
 
9
18
  Object.keys(_presets).forEach(function (key) {
10
19
  if (key === "default" || key === "__esModule") return;
20
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
11
21
  if (key in exports && exports[key] === _presets[key]) return;
12
22
  Object.defineProperty(exports, key, {
13
23
  enumerable: true,
@@ -21,6 +31,7 @@ var _babel = require("./utils/babel");
21
31
 
22
32
  Object.keys(_babel).forEach(function (key) {
23
33
  if (key === "default" || key === "__esModule") return;
34
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
24
35
  if (key in exports && exports[key] === _babel[key]) return;
25
36
  Object.defineProperty(exports, key, {
26
37
  enumerable: true,
@@ -34,6 +45,7 @@ var _checkWebpackVersion = require("./utils/check-webpack-version");
34
45
 
35
46
  Object.keys(_checkWebpackVersion).forEach(function (key) {
36
47
  if (key === "default" || key === "__esModule") return;
48
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
37
49
  if (key in exports && exports[key] === _checkWebpackVersion[key]) return;
38
50
  Object.defineProperty(exports, key, {
39
51
  enumerable: true,
@@ -47,6 +59,7 @@ var _checkAddonOrder = require("./utils/check-addon-order");
47
59
 
48
60
  Object.keys(_checkAddonOrder).forEach(function (key) {
49
61
  if (key === "default" || key === "__esModule") return;
62
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
50
63
  if (key in exports && exports[key] === _checkAddonOrder[key]) return;
51
64
  Object.defineProperty(exports, key, {
52
65
  enumerable: true,
@@ -60,6 +73,7 @@ var _envs = require("./utils/envs");
60
73
 
61
74
  Object.keys(_envs).forEach(function (key) {
62
75
  if (key === "default" || key === "__esModule") return;
76
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
63
77
  if (key in exports && exports[key] === _envs[key]) return;
64
78
  Object.defineProperty(exports, key, {
65
79
  enumerable: true,
@@ -73,6 +87,7 @@ var _es6Transpiler = require("./utils/es6Transpiler");
73
87
 
74
88
  Object.keys(_es6Transpiler).forEach(function (key) {
75
89
  if (key === "default" || key === "__esModule") return;
90
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
76
91
  if (key in exports && exports[key] === _es6Transpiler[key]) return;
77
92
  Object.defineProperty(exports, key, {
78
93
  enumerable: true,
@@ -86,6 +101,7 @@ var _handlebars = require("./utils/handlebars");
86
101
 
87
102
  Object.keys(_handlebars).forEach(function (key) {
88
103
  if (key === "default" || key === "__esModule") return;
104
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
89
105
  if (key in exports && exports[key] === _handlebars[key]) return;
90
106
  Object.defineProperty(exports, key, {
91
107
  enumerable: true,
@@ -99,6 +115,7 @@ var _interpretFiles = require("./utils/interpret-files");
99
115
 
100
116
  Object.keys(_interpretFiles).forEach(function (key) {
101
117
  if (key === "default" || key === "__esModule") return;
118
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
102
119
  if (key in exports && exports[key] === _interpretFiles[key]) return;
103
120
  Object.defineProperty(exports, key, {
104
121
  enumerable: true,
@@ -112,6 +129,7 @@ var _interpretRequire = require("./utils/interpret-require");
112
129
 
113
130
  Object.keys(_interpretRequire).forEach(function (key) {
114
131
  if (key === "default" || key === "__esModule") return;
132
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
115
133
  if (key in exports && exports[key] === _interpretRequire[key]) return;
116
134
  Object.defineProperty(exports, key, {
117
135
  enumerable: true,
@@ -125,6 +143,7 @@ var _loadCustomBabelConfig = require("./utils/load-custom-babel-config");
125
143
 
126
144
  Object.keys(_loadCustomBabelConfig).forEach(function (key) {
127
145
  if (key === "default" || key === "__esModule") return;
146
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
128
147
  if (key in exports && exports[key] === _loadCustomBabelConfig[key]) return;
129
148
  Object.defineProperty(exports, key, {
130
149
  enumerable: true,
@@ -138,6 +157,7 @@ var _loadCustomPresets = require("./utils/load-custom-presets");
138
157
 
139
158
  Object.keys(_loadCustomPresets).forEach(function (key) {
140
159
  if (key === "default" || key === "__esModule") return;
160
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
141
161
  if (key in exports && exports[key] === _loadCustomPresets[key]) return;
142
162
  Object.defineProperty(exports, key, {
143
163
  enumerable: true,
@@ -151,6 +171,7 @@ var _loadCustomWebpackConfig = require("./utils/load-custom-webpack-config");
151
171
 
152
172
  Object.keys(_loadCustomWebpackConfig).forEach(function (key) {
153
173
  if (key === "default" || key === "__esModule") return;
174
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
154
175
  if (key in exports && exports[key] === _loadCustomWebpackConfig[key]) return;
155
176
  Object.defineProperty(exports, key, {
156
177
  enumerable: true,
@@ -164,6 +185,7 @@ var _loadManagerOrAddonsFile = require("./utils/load-manager-or-addons-file");
164
185
 
165
186
  Object.keys(_loadManagerOrAddonsFile).forEach(function (key) {
166
187
  if (key === "default" || key === "__esModule") return;
188
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
167
189
  if (key in exports && exports[key] === _loadManagerOrAddonsFile[key]) return;
168
190
  Object.defineProperty(exports, key, {
169
191
  enumerable: true,
@@ -177,6 +199,7 @@ var _loadPreviewOrConfigFile = require("./utils/load-preview-or-config-file");
177
199
 
178
200
  Object.keys(_loadPreviewOrConfigFile).forEach(function (key) {
179
201
  if (key === "default" || key === "__esModule") return;
202
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
180
203
  if (key in exports && exports[key] === _loadPreviewOrConfigFile[key]) return;
181
204
  Object.defineProperty(exports, key, {
182
205
  enumerable: true,
@@ -190,6 +213,7 @@ var _logConfig = require("./utils/log-config");
190
213
 
191
214
  Object.keys(_logConfig).forEach(function (key) {
192
215
  if (key === "default" || key === "__esModule") return;
216
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
193
217
  if (key in exports && exports[key] === _logConfig[key]) return;
194
218
  Object.defineProperty(exports, key, {
195
219
  enumerable: true,
@@ -203,6 +227,7 @@ var _mergeWebpackConfig = require("./utils/merge-webpack-config");
203
227
 
204
228
  Object.keys(_mergeWebpackConfig).forEach(function (key) {
205
229
  if (key === "default" || key === "__esModule") return;
230
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
206
231
  if (key in exports && exports[key] === _mergeWebpackConfig[key]) return;
207
232
  Object.defineProperty(exports, key, {
208
233
  enumerable: true,
@@ -216,6 +241,7 @@ var _paths = require("./utils/paths");
216
241
 
217
242
  Object.keys(_paths).forEach(function (key) {
218
243
  if (key === "default" || key === "__esModule") return;
244
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
219
245
  if (key in exports && exports[key] === _paths[key]) return;
220
246
  Object.defineProperty(exports, key, {
221
247
  enumerable: true,
@@ -229,6 +255,7 @@ var _progressReporting = require("./utils/progress-reporting");
229
255
 
230
256
  Object.keys(_progressReporting).forEach(function (key) {
231
257
  if (key === "default" || key === "__esModule") return;
258
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
232
259
  if (key in exports && exports[key] === _progressReporting[key]) return;
233
260
  Object.defineProperty(exports, key, {
234
261
  enumerable: true,
@@ -242,6 +269,7 @@ var _resolvePathInSbCache = require("./utils/resolve-path-in-sb-cache");
242
269
 
243
270
  Object.keys(_resolvePathInSbCache).forEach(function (key) {
244
271
  if (key === "default" || key === "__esModule") return;
272
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
245
273
  if (key in exports && exports[key] === _resolvePathInSbCache[key]) return;
246
274
  Object.defineProperty(exports, key, {
247
275
  enumerable: true,
@@ -255,6 +283,7 @@ var _cache = require("./utils/cache");
255
283
 
256
284
  Object.keys(_cache).forEach(function (key) {
257
285
  if (key === "default" || key === "__esModule") return;
286
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
258
287
  if (key in exports && exports[key] === _cache[key]) return;
259
288
  Object.defineProperty(exports, key, {
260
289
  enumerable: true,
@@ -268,6 +297,7 @@ var _template = require("./utils/template");
268
297
 
269
298
  Object.keys(_template).forEach(function (key) {
270
299
  if (key === "default" || key === "__esModule") return;
300
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
271
301
  if (key in exports && exports[key] === _template[key]) return;
272
302
  Object.defineProperty(exports, key, {
273
303
  enumerable: true,
@@ -281,6 +311,7 @@ var _interpolate = require("./utils/interpolate");
281
311
 
282
312
  Object.keys(_interpolate).forEach(function (key) {
283
313
  if (key === "default" || key === "__esModule") return;
314
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
284
315
  if (key in exports && exports[key] === _interpolate[key]) return;
285
316
  Object.defineProperty(exports, key, {
286
317
  enumerable: true,
@@ -294,6 +325,7 @@ var _validateConfigurationFiles = require("./utils/validate-configuration-files"
294
325
 
295
326
  Object.keys(_validateConfigurationFiles).forEach(function (key) {
296
327
  if (key === "default" || key === "__esModule") return;
328
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
297
329
  if (key in exports && exports[key] === _validateConfigurationFiles[key]) return;
298
330
  Object.defineProperty(exports, key, {
299
331
  enumerable: true,
@@ -307,6 +339,7 @@ var _toRequireContext = require("./utils/to-require-context");
307
339
 
308
340
  Object.keys(_toRequireContext).forEach(function (key) {
309
341
  if (key === "default" || key === "__esModule") return;
342
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
310
343
  if (key in exports && exports[key] === _toRequireContext[key]) return;
311
344
  Object.defineProperty(exports, key, {
312
345
  enumerable: true,
@@ -320,6 +353,7 @@ var _normalizeStories = require("./utils/normalize-stories");
320
353
 
321
354
  Object.keys(_normalizeStories).forEach(function (key) {
322
355
  if (key === "default" || key === "__esModule") return;
356
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
323
357
  if (key in exports && exports[key] === _normalizeStories[key]) return;
324
358
  Object.defineProperty(exports, key, {
325
359
  enumerable: true,
@@ -333,6 +367,7 @@ var _toImportFn = require("./utils/to-importFn");
333
367
 
334
368
  Object.keys(_toImportFn).forEach(function (key) {
335
369
  if (key === "default" || key === "__esModule") return;
370
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
336
371
  if (key in exports && exports[key] === _toImportFn[key]) return;
337
372
  Object.defineProperty(exports, key, {
338
373
  enumerable: true,
@@ -346,6 +381,7 @@ var _readTemplate = require("./utils/readTemplate");
346
381
 
347
382
  Object.keys(_readTemplate).forEach(function (key) {
348
383
  if (key === "default" || key === "__esModule") return;
384
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
349
385
  if (key in exports && exports[key] === _readTemplate[key]) return;
350
386
  Object.defineProperty(exports, key, {
351
387
  enumerable: true,
@@ -359,6 +395,7 @@ var _findDistEsm = require("./utils/findDistEsm");
359
395
 
360
396
  Object.keys(_findDistEsm).forEach(function (key) {
361
397
  if (key === "default" || key === "__esModule") return;
398
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
362
399
  if (key in exports && exports[key] === _findDistEsm[key]) return;
363
400
  Object.defineProperty(exports, key, {
364
401
  enumerable: true,
@@ -372,6 +409,7 @@ var _types = require("./types");
372
409
 
373
410
  Object.keys(_types).forEach(function (key) {
374
411
  if (key === "default" || key === "__esModule") return;
412
+ if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
375
413
  if (key in exports && exports[key] === _types[key]) return;
376
414
  Object.defineProperty(exports, key, {
377
415
  enumerable: true,
@@ -379,4 +417,6 @@ Object.keys(_types).forEach(function (key) {
379
417
  return _types[key];
380
418
  }
381
419
  });
382
- });
420
+ });
421
+
422
+ var _fileCache = require("./utils/file-cache");
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.filterPresetsConfig = filterPresetsConfig;
7
- exports.loadPreset = loadPreset;
8
7
  exports.getPresets = getPresets;
9
8
  exports.loadAllPresets = loadAllPresets;
9
+ exports.loadPreset = loadPreset;
10
10
  exports.resolveAddonName = void 0;
11
11
 
12
12
  require("core-js/modules/es.promise.js");
@@ -17,21 +17,25 @@ var _path = require("path");
17
17
 
18
18
  var _nodeLogger = require("@storybook/node-logger");
19
19
 
20
- var _resolveFrom = _interopRequireDefault(require("resolve-from"));
21
-
22
20
  var _loadCustomPresets = require("./utils/load-custom-presets");
23
21
 
24
22
  var _interpretRequire = require("./utils/interpret-require");
25
23
 
24
+ var _safeResolve = require("./utils/safeResolve");
25
+
26
+ var _excluded = ["type", "name"],
27
+ _excluded2 = ["addons", "presets", "framework"],
28
+ _excluded3 = ["corePresets", "frameworkPresets", "overridePresets"];
29
+
26
30
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
27
31
 
28
32
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
29
33
 
30
34
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
31
35
 
32
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
36
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
33
37
 
34
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
38
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
35
39
 
36
40
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
37
41
 
@@ -67,8 +71,8 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
67
71
  * Parse an addon into either a managerEntries or a preset. Throw on invalid input.
68
72
  *
69
73
  * Valid inputs:
70
- * - '@storybook/addon-actions/register'
71
- * => { type: 'managerEntries', item }
74
+ * - '@storybook/addon-actions/manager'
75
+ * => { type: 'virtual', item }
72
76
  *
73
77
  * - '@storybook/addon-docs/preset'
74
78
  * => { type: 'presets', item }
@@ -81,43 +85,69 @@ function resolvePresetFunction(input, presetOptions, framework, storybookOptions
81
85
  */
82
86
 
83
87
 
84
- var resolveAddonName = function (configDir, name) {
85
- var path;
86
-
87
- if (name.startsWith('.')) {
88
- path = (0, _resolveFrom.default)(configDir, name);
89
- } else if (name.startsWith('/')) {
90
- path = name;
91
- } else if (name.match(/\/(preset|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
92
- path = name;
93
- } // when user provides full path, we don't need to do anything
88
+ var resolveAddonName = function (configDir, name, options) {
89
+ var r = name.startsWith('/') ? _safeResolve.safeResolve : _safeResolve.safeResolveFrom.bind(null, configDir);
90
+ var resolved = r(name);
94
91
 
95
-
96
- if (path) {
92
+ if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) {
97
93
  return {
98
- name: path,
99
- // Accept `register`, `register.js`, `require.resolve('foo/register'), `register-panel`
100
- type: path.match(/register(-panel)?(\.(js|ts|tsx|jsx))?$/) ? 'managerEntries' : 'presets'
94
+ type: 'virtual',
95
+ name: name,
96
+ managerEntries: [resolved]
101
97
  };
102
98
  }
103
99
 
104
- try {
100
+ if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) {
105
101
  return {
106
- name: (0, _resolveFrom.default)(configDir, `${name}/preset`),
107
- type: 'presets'
108
- }; // eslint-disable-next-line no-empty
109
- } catch (err) {}
102
+ type: 'presets',
103
+ name: resolved
104
+ };
105
+ }
110
106
 
111
- try {
107
+ var path = name; // when user provides full path, we don't need to do anything!
108
+
109
+ var managerFile = (0, _safeResolve.safeResolve)(`${path}/manager`);
110
+ var registerFile = (0, _safeResolve.safeResolve)(`${path}/register`) || (0, _safeResolve.safeResolve)(`${path}/register-panel`);
111
+ var previewFile = (0, _safeResolve.safeResolve)(`${path}/preview`);
112
+ var presetFile = (0, _safeResolve.safeResolve)(`${path}/preset`);
113
+
114
+ if (!(managerFile || previewFile) && presetFile) {
112
115
  return {
113
- name: (0, _resolveFrom.default)(configDir, `${name}/register`),
114
- type: 'managerEntries'
115
- }; // eslint-disable-next-line no-empty
116
- } catch (err) {}
116
+ type: 'presets',
117
+ name: presetFile
118
+ };
119
+ }
120
+
121
+ if (managerFile || registerFile || previewFile || presetFile) {
122
+ var managerEntries = [];
123
+
124
+ if (managerFile) {
125
+ managerEntries.push(managerFile);
126
+ } // register file is the old way of registering addons
127
+
128
+
129
+ if (!managerFile && registerFile && !presetFile) {
130
+ managerEntries.push(registerFile);
131
+ }
132
+
133
+ return _objectSpread(_objectSpread(_objectSpread({
134
+ type: 'virtual',
135
+ name: path
136
+ }, managerEntries.length ? {
137
+ managerEntries: managerEntries
138
+ } : {}), previewFile ? {
139
+ previewAnnotations: [previewFile]
140
+ } : {}), presetFile ? {
141
+ presets: [{
142
+ name: presetFile,
143
+ options: options
144
+ }]
145
+ } : {});
146
+ }
117
147
 
118
148
  return {
119
- name: (0, _resolveFrom.default)(configDir, name),
120
- type: 'presets'
149
+ type: 'presets',
150
+ name: resolved
121
151
  };
122
152
  };
123
153
 
@@ -127,31 +157,16 @@ var map = function ({
127
157
  configDir: configDir
128
158
  }) {
129
159
  return function (item) {
130
- try {
131
- if (isObject(item)) {
132
- var _resolveAddonName = resolveAddonName(configDir, item.name),
133
- _name = _resolveAddonName.name;
134
-
135
- return _objectSpread(_objectSpread({}, item), {}, {
136
- name: _name
137
- });
138
- }
139
-
140
- var _resolveAddonName2 = resolveAddonName(configDir, item),
141
- name = _resolveAddonName2.name,
142
- type = _resolveAddonName2.type;
160
+ var options = isObject(item) ? item.options || undefined : undefined;
161
+ var name = isObject(item) ? item.name : item;
143
162
 
144
- if (type === 'managerEntries') {
145
- return {
146
- name: `${name}_additionalManagerEntries`,
147
- type: type,
148
- managerEntries: [name]
149
- };
150
- }
151
-
152
- return resolveAddonName(configDir, name);
163
+ try {
164
+ var resolved = resolveAddonName(configDir, name, options);
165
+ return _objectSpread(_objectSpread({}, options ? {
166
+ options: options
167
+ } : {}), resolved);
153
168
  } catch (err) {
154
- _nodeLogger.logger.error(`Addon value should end in /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}`);
169
+ _nodeLogger.logger.error(`Addon value should end in /manager or /preview or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}`);
155
170
  }
156
171
 
157
172
  return undefined;
@@ -167,10 +182,10 @@ function interopRequireDefault(filePath) {
167
182
  }
168
183
 
169
184
  function getContent(input) {
170
- if (input.type === 'managerEntries') {
185
+ if (input.type === 'virtual') {
171
186
  var type = input.type,
172
- _name2 = input.name,
173
- rest = _objectWithoutProperties(input, ["type", "name"]);
187
+ _name = input.name,
188
+ rest = _objectWithoutProperties(input, _excluded);
174
189
 
175
190
  return rest;
176
191
  }
@@ -202,7 +217,7 @@ function loadPreset(input, level, storybookOptions) {
202
217
  addonsInput = _contents.addons,
203
218
  presetsInput = _contents.presets,
204
219
  framework = _contents.framework,
205
- rest = _objectWithoutProperties(_contents, ["addons", "presets", "framework"]);
220
+ rest = _objectWithoutProperties(_contents, _excluded2);
206
221
 
207
222
  var _subPresets = resolvePresetFunction(presetsInput, presetOptions, framework, storybookOptions);
208
223
 
@@ -336,7 +351,7 @@ function loadAllPresets(options) {
336
351
  frameworkPresets = _options$frameworkPre === void 0 ? [] : _options$frameworkPre,
337
352
  _options$overridePres = options.overridePresets,
338
353
  overridePresets = _options$overridePres === void 0 ? [] : _options$overridePres,
339
- restOptions = _objectWithoutProperties(options, ["corePresets", "frameworkPresets", "overridePresets"]);
354
+ restOptions = _objectWithoutProperties(options, _excluded3);
340
355
 
341
356
  var frameworkPackage = getFrameworkPackage(options.configDir);
342
357
  var presetsConfig = [...corePresets, ...(frameworkPackage ? [] : frameworkPresets), ...(0, _loadCustomPresets.loadCustomPresets)(options), ...overridePresets]; // Remove `@storybook/preset-typescript` and add a warning if in use.
package/dist/cjs/types.js CHANGED
@@ -1 +1,5 @@
1
- "use strict";
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
@@ -27,6 +27,8 @@ var getStorybookBabelConfig = function ({
27
27
  legacy: true
28
28
  }], [r('@babel/plugin-proposal-class-properties', local), {
29
29
  loose: true
30
+ }], [r('@babel/plugin-proposal-private-property-in-object', local), {
31
+ loose: true
30
32
  }], [r('@babel/plugin-proposal-private-methods', local), {
31
33
  loose: true
32
34
  }], r('@babel/plugin-proposal-export-default-from', local), r('@babel/plugin-syntax-dynamic-import', local), [r('@babel/plugin-proposal-object-rest-spread', local), {
@@ -51,7 +53,7 @@ var getStorybookBabelConfig = function ({
51
53
  exports.getStorybookBabelConfig = getStorybookBabelConfig;
52
54
 
53
55
  var getStorybookBabelDependencies = function () {
54
- return ['@babel/preset-env', '@babel/preset-typescript', '@babel/plugin-transform-shorthand-properties', '@babel/plugin-transform-block-scoping', '@babel/plugin-proposal-decorators', '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-private-methods', '@babel/plugin-proposal-export-default-from', '@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-transform-classes', '@babel/plugin-transform-arrow-functions', '@babel/plugin-transform-parameters', '@babel/plugin-transform-destructuring', '@babel/plugin-transform-spread', '@babel/plugin-transform-for-of', 'babel-plugin-macros', '@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator', 'babel-plugin-polyfill-corejs3', 'babel-loader', 'core-js'];
56
+ return ['@babel/preset-env', '@babel/preset-typescript', '@babel/plugin-transform-shorthand-properties', '@babel/plugin-proposal-private-property-in-object', '@babel/plugin-transform-block-scoping', '@babel/plugin-proposal-decorators', '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-private-methods', '@babel/plugin-proposal-export-default-from', '@babel/plugin-syntax-dynamic-import', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-transform-classes', '@babel/plugin-transform-arrow-functions', '@babel/plugin-transform-parameters', '@babel/plugin-transform-destructuring', '@babel/plugin-transform-spread', '@babel/plugin-transform-for-of', 'babel-plugin-macros', '@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator', 'babel-plugin-polyfill-corejs3', 'babel-loader', 'core-js'];
55
57
  };
56
58
 
57
59
  exports.getStorybookBabelDependencies = getStorybookBabelDependencies;
@@ -5,13 +5,11 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.cache = void 0;
7
7
 
8
- var _fileSystemCache = _interopRequireDefault(require("file-system-cache"));
8
+ var _fileCache = require("./file-cache");
9
9
 
10
10
  var _resolvePathInSbCache = require("./resolve-path-in-sb-cache");
11
11
 
12
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
-
14
- var cache = (0, _fileSystemCache.default)({
12
+ var cache = (0, _fileCache.createFileSystemCache)({
15
13
  basePath: (0, _resolvePathInSbCache.resolvePathInStorybookCache)('dev-server'),
16
14
  ns: 'storybook' // Optional. A grouping namespace for items.
17
15
 
@@ -10,9 +10,9 @@ var _lazyUniversalDotenv = require("lazy-universal-dotenv");
10
10
 
11
11
  var _paths = require("./paths");
12
12
 
13
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
13
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
14
14
 
15
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
15
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
16
16
 
17
17
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
18
18
 
@@ -71,10 +71,14 @@ var stringifyProcessEnvs = function (raw) {
71
71
  }, {
72
72
  // Default fallback
73
73
  'process.env.XSTORYBOOK_EXAMPLE_APP': '""'
74
- }); // support destructuring like
74
+ }); // FIXME: something like this is necessary to support destructuring like:
75
+ //
75
76
  // const { foo } = process.env;
77
+ //
78
+ // However, it also means that process.env.foo = 'bar' will fail, so removing this:
79
+ //
80
+ // envs['process.env'] = JSON.stringify(raw);
76
81
 
77
- envs['process.env'] = JSON.stringify(raw);
78
82
  return envs;
79
83
  };
80
84
 
@@ -10,7 +10,7 @@ var _babel = require("./babel");
10
10
  var _getStorybookBabelCon = (0, _babel.getStorybookBabelConfig)(),
11
11
  plugins = _getStorybookBabelCon.plugins;
12
12
 
13
- var nodeModulesThatNeedToBeParsedBecauseTheyExposeES6 = ['@storybook[\\\\/]node_logger', '@testing-library[\\\\/]dom', '@testing-library[\\\\/]user-event', 'acorn-jsx', 'ansi-align', 'ansi-colors', 'ansi-escapes', 'ansi-regex', 'ansi-styles', 'better-opn', 'boxen', 'chalk', 'color-convert', 'commander', 'find-cache-dir', 'find-up', 'fs-extra', 'highlight.js', 'json5', 'node-fetch', 'pkg-dir', 'prettier', 'pretty-format', 'resolve-from', 'semver', 'slash'].map(function (n) {
13
+ var nodeModulesThatNeedToBeParsedBecauseTheyExposeES6 = ['@storybook[\\\\/]expect', '@storybook[\\\\/]node_logger', '@testing-library[\\\\/]dom', '@testing-library[\\\\/]user-event', 'acorn-jsx', 'ansi-align', 'ansi-colors', 'ansi-escapes', 'ansi-regex', 'ansi-styles', 'better-opn', 'boxen', 'chalk', 'color-convert', 'commander', 'find-cache-dir', 'find-up', 'fs-extra', 'highlight.js', 'jest-mock', 'json5', 'node-fetch', 'pkg-dir', 'prettier', 'pretty-format', 'react-router', 'react-router-dom', 'resolve-from', 'semver', 'slash', 'strip-ansi'].map(function (n) {
14
14
  return new RegExp(`[\\\\/]node_modules[\\\\/]${n}`);
15
15
  });
16
16
 
@@ -0,0 +1,71 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.FileSystemCache = void 0;
7
+ exports.createFileSystemCache = createFileSystemCache;
8
+
9
+ var _fileSystemCache = _interopRequireDefault(require("file-system-cache"));
10
+
11
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
+
13
+ // @ts-ignore - this package has no typings, so we wrap it and add typings that way, because we expose it
14
+ class FileSystemCache {
15
+ constructor(options) {
16
+ this.internal = void 0;
17
+ this.internal = (0, _fileSystemCache.default)(options);
18
+ }
19
+
20
+ path(key) {
21
+ return this.internal.path(key);
22
+ }
23
+
24
+ fileExists(key) {
25
+ return this.internal.fileExists(key);
26
+ }
27
+
28
+ ensureBasePath() {
29
+ return this.internal.ensureBasePath();
30
+ }
31
+
32
+ get(key, defaultValue) {
33
+ return this.internal.get(key, defaultValue);
34
+ }
35
+
36
+ getSync(key, defaultValue) {
37
+ return this.internal.getSync(key, defaultValue);
38
+ }
39
+
40
+ set(key, value) {
41
+ return this.internal.set(key, value);
42
+ }
43
+
44
+ setSync(key, value) {
45
+ this.internal.setSync(key, value);
46
+ return this;
47
+ }
48
+
49
+ remove(key) {
50
+ return this.internal.remove(key);
51
+ }
52
+
53
+ clear() {
54
+ return this.internal.clear();
55
+ }
56
+
57
+ save() {
58
+ return this.internal.save();
59
+ }
60
+
61
+ load() {
62
+ return this.internal.load();
63
+ }
64
+
65
+ }
66
+
67
+ exports.FileSystemCache = FileSystemCache;
68
+
69
+ function createFileSystemCache(options) {
70
+ return new FileSystemCache(options);
71
+ }
@@ -3,9 +3,11 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ exports.boost = void 0;
6
7
  exports.getInterpretedFile = getInterpretedFile;
7
8
  exports.getInterpretedFileWithExt = getInterpretedFileWithExt;
8
- exports.boost = void 0;
9
+
10
+ require("core-js/modules/es.array.sort.js");
9
11
 
10
12
  var _fs = _interopRequireDefault(require("fs"));
11
13
 
@@ -17,9 +17,9 @@ var _nodeLogger = require("@storybook/node-logger");
17
17
 
18
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
19
 
20
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
20
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
21
21
 
22
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
22
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
23
23
 
24
24
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
25
25