@storybook/cli 6.5.0-alpha.51 → 6.5.0-alpha.54

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 (29) hide show
  1. package/dist/cjs/add.js +2 -2
  2. package/dist/cjs/automigrate/fixes/builder-vite.js +123 -0
  3. package/dist/cjs/automigrate/fixes/index.js +3 -1
  4. package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/addons.js +3 -3
  5. package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js +2 -2
  6. package/dist/cjs/generators/baseGenerator.js +20 -1
  7. package/dist/cjs/project_types.js +1 -0
  8. package/dist/cjs/versions.js +56 -56
  9. package/dist/esm/add.js +2 -2
  10. package/dist/esm/automigrate/fixes/builder-vite.js +123 -0
  11. package/dist/esm/automigrate/fixes/index.js +3 -1
  12. package/dist/esm/generators/REACT_NATIVE/template-csf/storybook/addons.js +3 -3
  13. package/dist/esm/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js +2 -2
  14. package/dist/esm/generators/baseGenerator.js +20 -1
  15. package/dist/esm/project_types.js +1 -0
  16. package/dist/esm/versions.js +56 -56
  17. package/dist/modern/add.js +2 -2
  18. package/dist/modern/automigrate/fixes/builder-vite.js +123 -0
  19. package/dist/modern/automigrate/fixes/index.js +3 -1
  20. package/dist/modern/generators/REACT_NATIVE/template-csf/storybook/addons.js +3 -3
  21. package/dist/modern/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js +2 -2
  22. package/dist/modern/generators/baseGenerator.js +20 -1
  23. package/dist/modern/project_types.js +1 -0
  24. package/dist/modern/versions.js +56 -56
  25. package/dist/ts3.4/automigrate/fixes/builder-vite.d.ts +19 -0
  26. package/dist/ts3.4/project_types.d.ts +2 -1
  27. package/dist/ts3.9/automigrate/fixes/builder-vite.d.ts +19 -0
  28. package/dist/ts3.9/project_types.d.ts +2 -1
  29. package/package.json +7 -7
package/dist/cjs/add.js CHANGED
@@ -77,14 +77,14 @@ const installAddon = (packageManager, addonName, isOfficialAddon) => {
77
77
 
78
78
  const addStorybookAddonToFile = (addonName, addonsFile, isOfficialAddon) => {
79
79
  const addonNameNoTag = addonName.split('@')[0];
80
- const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/register`));
80
+ const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/manager`));
81
81
 
82
82
  if (alreadyRegistered) {
83
83
  return addonsFile;
84
84
  }
85
85
 
86
86
  const latestImportIndex = addonsFile.reduce((prev, curr, currIndex) => curr.startsWith('import') && curr.includes('register') ? currIndex : prev, -1);
87
- return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/register';`, ...addonsFile.slice(latestImportIndex + 1)];
87
+ return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/manager';`, ...addonsFile.slice(latestImportIndex + 1)];
88
88
  };
89
89
 
90
90
  exports.addStorybookAddonToFile = addStorybookAddonToFile;
package/dist/cjs/automigrate/fixes/builder-vite.js ADDED
@@ -0,0 +1,123 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.builderVite = void 0;
7
+
8
+ require("core-js/modules/es.promise.js");
9
+
10
+ var _chalk = _interopRequireDefault(require("chalk"));
11
+
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
14
+ var _csfTools = require("@storybook/csf-tools");
15
+
16
+ var _getStorybookInfo = require("../helpers/getStorybookInfo");
17
+
18
+ var _jsPackageManager = require("../../js-package-manager");
19
+
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
+
22
+ const logger = console;
23
+
24
+ /**
25
+ * Is the user using 'storybook-builder-vite' in their project?
26
+ *
27
+ * If so, prompt them to upgrade to '@storybook/builder-vite'.
28
+ *
29
+ * - Add '@storybook/builder-vite' as dev dependency
30
+ * - Remove 'storybook-builder-vite' dependency
31
+ * - Add core.builder = '@storybook/builder-vite' to main.js
32
+ */
33
+ const builderVite = {
34
+ id: 'builder-vite',
35
+
36
+ async check({
37
+ packageManager
38
+ }) {
39
+ const packageJson = packageManager.retrievePackageJson();
40
+ const {
41
+ mainConfig
42
+ } = (0, _getStorybookInfo.getStorybookInfo)(packageJson);
43
+
44
+ if (!mainConfig) {
45
+ logger.warn('Unable to find storybook main.js config');
46
+ return null;
47
+ }
48
+
49
+ const main = await (0, _csfTools.readConfig)(mainConfig);
50
+ const builder = main.getFieldValue(['core', 'builder']);
51
+ const builderName = typeof builder === 'string' ? builder : builder === null || builder === void 0 ? void 0 : builder.name;
52
+
53
+ if (builderName !== 'storybook-builder-vite') {
54
+ logger.info(`Not using community vite builder, skipping`);
55
+ return null;
56
+ }
57
+
58
+ return {
59
+ builder,
60
+ main,
61
+ packageJson
62
+ };
63
+ },
64
+
65
+ prompt({
66
+ builder
67
+ }) {
68
+ const builderFormatted = _chalk.default.cyan(JSON.stringify(builder, null, 2));
69
+
70
+ return (0, _tsDedent.default)`
71
+ We've detected you're using the community vite builder: ${builderFormatted}
72
+
73
+ 'storybook-builder-vite' is deprecated and now located at ${_chalk.default.cyan('@storybook/builder-vite')}.
74
+
75
+ We can upgrade your project to use the new builder automatically.
76
+
77
+ More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#vite-builder-renamed')}
78
+ `;
79
+ },
80
+
81
+ async run({
82
+ result: {
83
+ builder,
84
+ main,
85
+ packageJson
86
+ },
87
+ packageManager,
88
+ dryRun
89
+ }) {
90
+ const {
91
+ dependencies = {},
92
+ devDependencies = {}
93
+ } = packageJson;
94
+ logger.info(`Removing existing 'storybook-builder-vite' dependency`);
95
+
96
+ if (!dryRun) {
97
+ delete dependencies['storybook-builder-vite'];
98
+ delete devDependencies['storybook-builder-vite'];
99
+ (0, _jsPackageManager.writePackageJson)(packageJson);
100
+ }
101
+
102
+ logger.info(`Adding '@storybook/builder-vite' as dev dependency`);
103
+
104
+ if (!dryRun) {
105
+ packageManager.addDependencies({
106
+ installAsDevDependencies: true
107
+ }, ['@storybook/builder-vite']);
108
+ }
109
+
110
+ logger.info(`Updating main.js to use vite builder`);
111
+
112
+ if (!dryRun) {
113
+ const updatedBuilder = typeof builder === 'string' ? '@storybook/builder-vite' : {
114
+ name: '@storybook/builder-vite',
115
+ options: builder.options
116
+ };
117
+ main.setFieldValue(['core', 'builder'], updatedBuilder);
118
+ await (0, _csfTools.writeConfig)(main);
119
+ }
120
+ }
121
+
122
+ };
123
+ exports.builderVite = builderVite;
package/dist/cjs/automigrate/fixes/index.js CHANGED
@@ -18,6 +18,8 @@ var _mainjsFramework = require("./mainjsFramework");
18
18
 
19
19
  var _eslintPlugin = require("./eslint-plugin");
20
20
 
21
+ var _builderVite = require("./builder-vite");
22
+
21
23
  var _types = require("../types");
22
24
 
23
25
  Object.keys(_types).forEach(function (key) {
@@ -31,5 +33,5 @@ Object.keys(_types).forEach(function (key) {
31
33
  }
32
34
  });
33
35
  });
34
- const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin];
36
+ const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
35
37
  exports.fixes = fixes;
package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/addons.js CHANGED
@@ -1,3 +1,3 @@
1
- import '@storybook/addon-actions/register';
2
- import '@storybook/addon-links/register';
3
- import '@storybook/addon-knobs/register';
1
+ import '@storybook/addon-actions/manager';
2
+ import '@storybook/addon-links/manager';
3
+ import '@storybook/addon-knobs/manager';
package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js CHANGED
@@ -1,2 +1,2 @@
1
- import '@storybook/addon-ondevice-actions/register';
2
- import '@storybook/addon-ondevice-knobs/register';
1
+ import '@storybook/addon-ondevice-actions/manager';
2
+ import '@storybook/addon-ondevice-knobs/manager';
package/dist/cjs/generators/baseGenerator.js CHANGED
@@ -9,6 +9,8 @@ require("core-js/modules/es.promise.js");
9
9
 
10
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
11
11
 
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
12
14
  var _coreCommon = require("@storybook/core-common");
13
15
 
14
16
  var _project_types = require("../project_types");
@@ -44,6 +46,9 @@ const builderDependencies = builder => {
44
46
  case _project_types.CoreBuilder.Webpack5:
45
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
46
48
 
49
+ case _project_types.CoreBuilder.Vite:
50
+ return ['@storybook/builder-vite'];
51
+
47
52
  default:
48
53
  return [builder];
49
54
  }
@@ -87,9 +92,11 @@ async function baseGenerator(packageManager, npmOptions, {
87
92
  const frameworkPackage = `@storybook/${framework}`;
88
93
  const packages = [frameworkPackage, ...addonPackages, ...extraPackages, ...extraAddons, ...yarn2Dependencies, ...builderDependencies(builder)].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
89
94
  const versionedPackages = await packageManager.getVersionedPackages(...packages);
95
+ const coreBuilders = [_project_types.CoreBuilder.Webpack4, _project_types.CoreBuilder.Webpack5, _project_types.CoreBuilder.Vite];
96
+ const expandedBuilder = coreBuilders.includes(builder) ? `@storybook/builder-${builder}` : builder;
90
97
  const mainOptions = builder !== _project_types.CoreBuilder.Webpack4 ? Object.assign({
91
98
  core: {
92
- builder
99
+ builder: expandedBuilder
93
100
  }
94
101
  }, extraMain) : extraMain;
95
102
  (0, _configure.configure)(framework, Object.assign({
@@ -101,6 +108,18 @@ async function baseGenerator(packageManager, npmOptions, {
101
108
 
102
109
  if (addComponents) {
103
110
  (0, _helpers.copyComponents)(framework, language);
111
+ } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
112
+
113
+
114
+ if (expandedBuilder === '@storybook/builder-vite') {
115
+ const previewHead = (0, _tsDedent.default)`
116
+ <script>
117
+ window.global = window;
118
+ </script>
119
+ `;
120
+ await _fsExtra.default.writeFile(`.storybook/preview-head.html`, previewHead, {
121
+ encoding: 'utf8'
122
+ });
104
123
  }
105
124
 
106
125
  const babelDependencies = addBabel ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
package/dist/cjs/project_types.js CHANGED
@@ -59,6 +59,7 @@ exports.CoreBuilder = CoreBuilder;
59
59
  (function (CoreBuilder) {
60
60
  CoreBuilder["Webpack4"] = "webpack4";
61
61
  CoreBuilder["Webpack5"] = "webpack5";
62
+ CoreBuilder["Vite"] = "vite";
62
63
  })(CoreBuilder || (exports.CoreBuilder = CoreBuilder = {}));
63
64
 
64
65
  let SupportedLanguage;
package/dist/cjs/versions.js CHANGED
@@ -6,61 +6,61 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.51",
10
- "@storybook/addon-actions": "6.5.0-alpha.51",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.51",
12
- "@storybook/addon-controls": "6.5.0-alpha.51",
13
- "@storybook/addon-docs": "6.5.0-alpha.51",
14
- "@storybook/addon-essentials": "6.5.0-alpha.51",
15
- "@storybook/addon-interactions": "6.5.0-alpha.51",
16
- "@storybook/addon-jest": "6.5.0-alpha.51",
17
- "@storybook/addon-links": "6.5.0-alpha.51",
18
- "@storybook/addon-measure": "6.5.0-alpha.51",
19
- "@storybook/addon-outline": "6.5.0-alpha.51",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.51",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.51",
22
- "@storybook/addon-storysource": "6.5.0-alpha.51",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.51",
24
- "@storybook/addon-viewport": "6.5.0-alpha.51",
25
- "@storybook/addons": "6.5.0-alpha.51",
26
- "@storybook/angular": "6.5.0-alpha.51",
27
- "@storybook/api": "6.5.0-alpha.51",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.51",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.51",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.51",
31
- "@storybook/channel-websocket": "6.5.0-alpha.51",
32
- "@storybook/channels": "6.5.0-alpha.51",
33
- "@storybook/cli": "6.5.0-alpha.51",
34
- "@storybook/client-api": "6.5.0-alpha.51",
35
- "@storybook/client-logger": "6.5.0-alpha.51",
36
- "@storybook/codemod": "6.5.0-alpha.51",
37
- "@storybook/components": "6.5.0-alpha.51",
38
- "@storybook/core": "6.5.0-alpha.51",
39
- "@storybook/core-client": "6.5.0-alpha.51",
40
- "@storybook/core-common": "6.5.0-alpha.51",
41
- "@storybook/core-events": "6.5.0-alpha.51",
42
- "@storybook/core-server": "6.5.0-alpha.51",
43
- "@storybook/csf-tools": "6.5.0-alpha.51",
44
- "@storybook/docs-tools": "6.5.0-alpha.51",
45
- "@storybook/ember": "6.5.0-alpha.51",
46
- "@storybook/html": "6.5.0-alpha.51",
47
- "@storybook/instrumenter": "6.5.0-alpha.51",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.51",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.51",
50
- "@storybook/node-logger": "6.5.0-alpha.51",
51
- "@storybook/postinstall": "6.5.0-alpha.51",
52
- "@storybook/preact": "6.5.0-alpha.51",
53
- "@storybook/preview-web": "6.5.0-alpha.51",
54
- "@storybook/react": "6.5.0-alpha.51",
55
- "@storybook/router": "6.5.0-alpha.51",
56
- "@storybook/server": "6.5.0-alpha.51",
57
- "@storybook/source-loader": "6.5.0-alpha.51",
58
- "@storybook/store": "6.5.0-alpha.51",
59
- "@storybook/svelte": "6.5.0-alpha.51",
60
- "@storybook/theming": "6.5.0-alpha.51",
61
- "@storybook/ui": "6.5.0-alpha.51",
62
- "@storybook/vue": "6.5.0-alpha.51",
63
- "@storybook/vue3": "6.5.0-alpha.51",
64
- "@storybook/web-components": "6.5.0-alpha.51"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.54",
10
+ "@storybook/addon-actions": "6.5.0-alpha.54",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.54",
12
+ "@storybook/addon-controls": "6.5.0-alpha.54",
13
+ "@storybook/addon-docs": "6.5.0-alpha.54",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.54",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.54",
16
+ "@storybook/addon-jest": "6.5.0-alpha.54",
17
+ "@storybook/addon-links": "6.5.0-alpha.54",
18
+ "@storybook/addon-measure": "6.5.0-alpha.54",
19
+ "@storybook/addon-outline": "6.5.0-alpha.54",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.54",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.54",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.54",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.54",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.54",
25
+ "@storybook/addons": "6.5.0-alpha.54",
26
+ "@storybook/angular": "6.5.0-alpha.54",
27
+ "@storybook/api": "6.5.0-alpha.54",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.54",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.54",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.54",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.54",
32
+ "@storybook/channels": "6.5.0-alpha.54",
33
+ "@storybook/cli": "6.5.0-alpha.54",
34
+ "@storybook/client-api": "6.5.0-alpha.54",
35
+ "@storybook/client-logger": "6.5.0-alpha.54",
36
+ "@storybook/codemod": "6.5.0-alpha.54",
37
+ "@storybook/components": "6.5.0-alpha.54",
38
+ "@storybook/core": "6.5.0-alpha.54",
39
+ "@storybook/core-client": "6.5.0-alpha.54",
40
+ "@storybook/core-common": "6.5.0-alpha.54",
41
+ "@storybook/core-events": "6.5.0-alpha.54",
42
+ "@storybook/core-server": "6.5.0-alpha.54",
43
+ "@storybook/csf-tools": "6.5.0-alpha.54",
44
+ "@storybook/docs-tools": "6.5.0-alpha.54",
45
+ "@storybook/ember": "6.5.0-alpha.54",
46
+ "@storybook/html": "6.5.0-alpha.54",
47
+ "@storybook/instrumenter": "6.5.0-alpha.54",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.54",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.54",
50
+ "@storybook/node-logger": "6.5.0-alpha.54",
51
+ "@storybook/postinstall": "6.5.0-alpha.54",
52
+ "@storybook/preact": "6.5.0-alpha.54",
53
+ "@storybook/preview-web": "6.5.0-alpha.54",
54
+ "@storybook/react": "6.5.0-alpha.54",
55
+ "@storybook/router": "6.5.0-alpha.54",
56
+ "@storybook/server": "6.5.0-alpha.54",
57
+ "@storybook/source-loader": "6.5.0-alpha.54",
58
+ "@storybook/store": "6.5.0-alpha.54",
59
+ "@storybook/svelte": "6.5.0-alpha.54",
60
+ "@storybook/theming": "6.5.0-alpha.54",
61
+ "@storybook/ui": "6.5.0-alpha.54",
62
+ "@storybook/vue": "6.5.0-alpha.54",
63
+ "@storybook/vue3": "6.5.0-alpha.54",
64
+ "@storybook/web-components": "6.5.0-alpha.54"
65
65
  };
66
66
  exports.default = _default;
package/dist/esm/add.js CHANGED
@@ -77,14 +77,14 @@ const installAddon = (packageManager, addonName, isOfficialAddon) => {
77
77
 
78
78
  const addStorybookAddonToFile = (addonName, addonsFile, isOfficialAddon) => {
79
79
  const addonNameNoTag = addonName.split('@')[0];
80
- const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/register`));
80
+ const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/manager`));
81
81
 
82
82
  if (alreadyRegistered) {
83
83
  return addonsFile;
84
84
  }
85
85
 
86
86
  const latestImportIndex = addonsFile.reduce((prev, curr, currIndex) => curr.startsWith('import') && curr.includes('register') ? currIndex : prev, -1);
87
- return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/register';`, ...addonsFile.slice(latestImportIndex + 1)];
87
+ return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/manager';`, ...addonsFile.slice(latestImportIndex + 1)];
88
88
  };
89
89
 
90
90
  exports.addStorybookAddonToFile = addStorybookAddonToFile;
package/dist/esm/automigrate/fixes/builder-vite.js ADDED
@@ -0,0 +1,123 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.builderVite = void 0;
7
+
8
+ require("core-js/modules/es.promise.js");
9
+
10
+ var _chalk = _interopRequireDefault(require("chalk"));
11
+
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
14
+ var _csfTools = require("@storybook/csf-tools");
15
+
16
+ var _getStorybookInfo = require("../helpers/getStorybookInfo");
17
+
18
+ var _jsPackageManager = require("../../js-package-manager");
19
+
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
+
22
+ const logger = console;
23
+
24
+ /**
25
+ * Is the user using 'storybook-builder-vite' in their project?
26
+ *
27
+ * If so, prompt them to upgrade to '@storybook/builder-vite'.
28
+ *
29
+ * - Add '@storybook/builder-vite' as dev dependency
30
+ * - Remove 'storybook-builder-vite' dependency
31
+ * - Add core.builder = '@storybook/builder-vite' to main.js
32
+ */
33
+ const builderVite = {
34
+ id: 'builder-vite',
35
+
36
+ async check({
37
+ packageManager
38
+ }) {
39
+ const packageJson = packageManager.retrievePackageJson();
40
+ const {
41
+ mainConfig
42
+ } = (0, _getStorybookInfo.getStorybookInfo)(packageJson);
43
+
44
+ if (!mainConfig) {
45
+ logger.warn('Unable to find storybook main.js config');
46
+ return null;
47
+ }
48
+
49
+ const main = await (0, _csfTools.readConfig)(mainConfig);
50
+ const builder = main.getFieldValue(['core', 'builder']);
51
+ const builderName = typeof builder === 'string' ? builder : builder === null || builder === void 0 ? void 0 : builder.name;
52
+
53
+ if (builderName !== 'storybook-builder-vite') {
54
+ logger.info(`Not using community vite builder, skipping`);
55
+ return null;
56
+ }
57
+
58
+ return {
59
+ builder,
60
+ main,
61
+ packageJson
62
+ };
63
+ },
64
+
65
+ prompt({
66
+ builder
67
+ }) {
68
+ const builderFormatted = _chalk.default.cyan(JSON.stringify(builder, null, 2));
69
+
70
+ return (0, _tsDedent.default)`
71
+ We've detected you're using the community vite builder: ${builderFormatted}
72
+
73
+ 'storybook-builder-vite' is deprecated and now located at ${_chalk.default.cyan('@storybook/builder-vite')}.
74
+
75
+ We can upgrade your project to use the new builder automatically.
76
+
77
+ More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#vite-builder-renamed')}
78
+ `;
79
+ },
80
+
81
+ async run({
82
+ result: {
83
+ builder,
84
+ main,
85
+ packageJson
86
+ },
87
+ packageManager,
88
+ dryRun
89
+ }) {
90
+ const {
91
+ dependencies = {},
92
+ devDependencies = {}
93
+ } = packageJson;
94
+ logger.info(`Removing existing 'storybook-builder-vite' dependency`);
95
+
96
+ if (!dryRun) {
97
+ delete dependencies['storybook-builder-vite'];
98
+ delete devDependencies['storybook-builder-vite'];
99
+ (0, _jsPackageManager.writePackageJson)(packageJson);
100
+ }
101
+
102
+ logger.info(`Adding '@storybook/builder-vite' as dev dependency`);
103
+
104
+ if (!dryRun) {
105
+ packageManager.addDependencies({
106
+ installAsDevDependencies: true
107
+ }, ['@storybook/builder-vite']);
108
+ }
109
+
110
+ logger.info(`Updating main.js to use vite builder`);
111
+
112
+ if (!dryRun) {
113
+ const updatedBuilder = typeof builder === 'string' ? '@storybook/builder-vite' : {
114
+ name: '@storybook/builder-vite',
115
+ options: builder.options
116
+ };
117
+ main.setFieldValue(['core', 'builder'], updatedBuilder);
118
+ await (0, _csfTools.writeConfig)(main);
119
+ }
120
+ }
121
+
122
+ };
123
+ exports.builderVite = builderVite;
package/dist/esm/automigrate/fixes/index.js CHANGED
@@ -18,6 +18,8 @@ var _mainjsFramework = require("./mainjsFramework");
18
18
 
19
19
  var _eslintPlugin = require("./eslint-plugin");
20
20
 
21
+ var _builderVite = require("./builder-vite");
22
+
21
23
  var _types = require("../types");
22
24
 
23
25
  Object.keys(_types).forEach(function (key) {
@@ -31,5 +33,5 @@ Object.keys(_types).forEach(function (key) {
31
33
  }
32
34
  });
33
35
  });
34
- const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin];
36
+ const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
35
37
  exports.fixes = fixes;
package/dist/esm/generators/REACT_NATIVE/template-csf/storybook/addons.js CHANGED
@@ -1,3 +1,3 @@
1
- import '@storybook/addon-actions/register';
2
- import '@storybook/addon-links/register';
3
- import '@storybook/addon-knobs/register';
1
+ import '@storybook/addon-actions/manager';
2
+ import '@storybook/addon-links/manager';
3
+ import '@storybook/addon-knobs/manager';
package/dist/esm/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js CHANGED
@@ -1,2 +1,2 @@
1
- import '@storybook/addon-ondevice-actions/register';
2
- import '@storybook/addon-ondevice-knobs/register';
1
+ import '@storybook/addon-ondevice-actions/manager';
2
+ import '@storybook/addon-ondevice-knobs/manager';
package/dist/esm/generators/baseGenerator.js CHANGED
@@ -9,6 +9,8 @@ require("core-js/modules/es.promise.js");
9
9
 
10
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
11
11
 
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
12
14
  var _coreCommon = require("@storybook/core-common");
13
15
 
14
16
  var _project_types = require("../project_types");
@@ -44,6 +46,9 @@ const builderDependencies = builder => {
44
46
  case _project_types.CoreBuilder.Webpack5:
45
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
46
48
 
49
+ case _project_types.CoreBuilder.Vite:
50
+ return ['@storybook/builder-vite'];
51
+
47
52
  default:
48
53
  return [builder];
49
54
  }
@@ -87,9 +92,11 @@ async function baseGenerator(packageManager, npmOptions, {
87
92
  const frameworkPackage = `@storybook/${framework}`;
88
93
  const packages = [frameworkPackage, ...addonPackages, ...extraPackages, ...extraAddons, ...yarn2Dependencies, ...builderDependencies(builder)].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
89
94
  const versionedPackages = await packageManager.getVersionedPackages(...packages);
95
+ const coreBuilders = [_project_types.CoreBuilder.Webpack4, _project_types.CoreBuilder.Webpack5, _project_types.CoreBuilder.Vite];
96
+ const expandedBuilder = coreBuilders.includes(builder) ? `@storybook/builder-${builder}` : builder;
90
97
  const mainOptions = builder !== _project_types.CoreBuilder.Webpack4 ? Object.assign({
91
98
  core: {
92
- builder
99
+ builder: expandedBuilder
93
100
  }
94
101
  }, extraMain) : extraMain;
95
102
  (0, _configure.configure)(framework, Object.assign({
@@ -101,6 +108,18 @@ async function baseGenerator(packageManager, npmOptions, {
101
108
 
102
109
  if (addComponents) {
103
110
  (0, _helpers.copyComponents)(framework, language);
111
+ } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
112
+
113
+
114
+ if (expandedBuilder === '@storybook/builder-vite') {
115
+ const previewHead = (0, _tsDedent.default)`
116
+ <script>
117
+ window.global = window;
118
+ </script>
119
+ `;
120
+ await _fsExtra.default.writeFile(`.storybook/preview-head.html`, previewHead, {
121
+ encoding: 'utf8'
122
+ });
104
123
  }
105
124
 
106
125
  const babelDependencies = addBabel ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
package/dist/esm/project_types.js CHANGED
@@ -59,6 +59,7 @@ exports.CoreBuilder = CoreBuilder;
59
59
  (function (CoreBuilder) {
60
60
  CoreBuilder["Webpack4"] = "webpack4";
61
61
  CoreBuilder["Webpack5"] = "webpack5";
62
+ CoreBuilder["Vite"] = "vite";
62
63
  })(CoreBuilder || (exports.CoreBuilder = CoreBuilder = {}));
63
64
 
64
65
  let SupportedLanguage;
package/dist/esm/versions.js CHANGED
@@ -6,61 +6,61 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.51",
10
- "@storybook/addon-actions": "6.5.0-alpha.51",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.51",
12
- "@storybook/addon-controls": "6.5.0-alpha.51",
13
- "@storybook/addon-docs": "6.5.0-alpha.51",
14
- "@storybook/addon-essentials": "6.5.0-alpha.51",
15
- "@storybook/addon-interactions": "6.5.0-alpha.51",
16
- "@storybook/addon-jest": "6.5.0-alpha.51",
17
- "@storybook/addon-links": "6.5.0-alpha.51",
18
- "@storybook/addon-measure": "6.5.0-alpha.51",
19
- "@storybook/addon-outline": "6.5.0-alpha.51",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.51",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.51",
22
- "@storybook/addon-storysource": "6.5.0-alpha.51",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.51",
24
- "@storybook/addon-viewport": "6.5.0-alpha.51",
25
- "@storybook/addons": "6.5.0-alpha.51",
26
- "@storybook/angular": "6.5.0-alpha.51",
27
- "@storybook/api": "6.5.0-alpha.51",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.51",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.51",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.51",
31
- "@storybook/channel-websocket": "6.5.0-alpha.51",
32
- "@storybook/channels": "6.5.0-alpha.51",
33
- "@storybook/cli": "6.5.0-alpha.51",
34
- "@storybook/client-api": "6.5.0-alpha.51",
35
- "@storybook/client-logger": "6.5.0-alpha.51",
36
- "@storybook/codemod": "6.5.0-alpha.51",
37
- "@storybook/components": "6.5.0-alpha.51",
38
- "@storybook/core": "6.5.0-alpha.51",
39
- "@storybook/core-client": "6.5.0-alpha.51",
40
- "@storybook/core-common": "6.5.0-alpha.51",
41
- "@storybook/core-events": "6.5.0-alpha.51",
42
- "@storybook/core-server": "6.5.0-alpha.51",
43
- "@storybook/csf-tools": "6.5.0-alpha.51",
44
- "@storybook/docs-tools": "6.5.0-alpha.51",
45
- "@storybook/ember": "6.5.0-alpha.51",
46
- "@storybook/html": "6.5.0-alpha.51",
47
- "@storybook/instrumenter": "6.5.0-alpha.51",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.51",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.51",
50
- "@storybook/node-logger": "6.5.0-alpha.51",
51
- "@storybook/postinstall": "6.5.0-alpha.51",
52
- "@storybook/preact": "6.5.0-alpha.51",
53
- "@storybook/preview-web": "6.5.0-alpha.51",
54
- "@storybook/react": "6.5.0-alpha.51",
55
- "@storybook/router": "6.5.0-alpha.51",
56
- "@storybook/server": "6.5.0-alpha.51",
57
- "@storybook/source-loader": "6.5.0-alpha.51",
58
- "@storybook/store": "6.5.0-alpha.51",
59
- "@storybook/svelte": "6.5.0-alpha.51",
60
- "@storybook/theming": "6.5.0-alpha.51",
61
- "@storybook/ui": "6.5.0-alpha.51",
62
- "@storybook/vue": "6.5.0-alpha.51",
63
- "@storybook/vue3": "6.5.0-alpha.51",
64
- "@storybook/web-components": "6.5.0-alpha.51"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.54",
10
+ "@storybook/addon-actions": "6.5.0-alpha.54",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.54",
12
+ "@storybook/addon-controls": "6.5.0-alpha.54",
13
+ "@storybook/addon-docs": "6.5.0-alpha.54",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.54",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.54",
16
+ "@storybook/addon-jest": "6.5.0-alpha.54",
17
+ "@storybook/addon-links": "6.5.0-alpha.54",
18
+ "@storybook/addon-measure": "6.5.0-alpha.54",
19
+ "@storybook/addon-outline": "6.5.0-alpha.54",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.54",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.54",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.54",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.54",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.54",
25
+ "@storybook/addons": "6.5.0-alpha.54",
26
+ "@storybook/angular": "6.5.0-alpha.54",
27
+ "@storybook/api": "6.5.0-alpha.54",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.54",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.54",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.54",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.54",
32
+ "@storybook/channels": "6.5.0-alpha.54",
33
+ "@storybook/cli": "6.5.0-alpha.54",
34
+ "@storybook/client-api": "6.5.0-alpha.54",
35
+ "@storybook/client-logger": "6.5.0-alpha.54",
36
+ "@storybook/codemod": "6.5.0-alpha.54",
37
+ "@storybook/components": "6.5.0-alpha.54",
38
+ "@storybook/core": "6.5.0-alpha.54",
39
+ "@storybook/core-client": "6.5.0-alpha.54",
40
+ "@storybook/core-common": "6.5.0-alpha.54",
41
+ "@storybook/core-events": "6.5.0-alpha.54",
42
+ "@storybook/core-server": "6.5.0-alpha.54",
43
+ "@storybook/csf-tools": "6.5.0-alpha.54",
44
+ "@storybook/docs-tools": "6.5.0-alpha.54",
45
+ "@storybook/ember": "6.5.0-alpha.54",
46
+ "@storybook/html": "6.5.0-alpha.54",
47
+ "@storybook/instrumenter": "6.5.0-alpha.54",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.54",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.54",
50
+ "@storybook/node-logger": "6.5.0-alpha.54",
51
+ "@storybook/postinstall": "6.5.0-alpha.54",
52
+ "@storybook/preact": "6.5.0-alpha.54",
53
+ "@storybook/preview-web": "6.5.0-alpha.54",
54
+ "@storybook/react": "6.5.0-alpha.54",
55
+ "@storybook/router": "6.5.0-alpha.54",
56
+ "@storybook/server": "6.5.0-alpha.54",
57
+ "@storybook/source-loader": "6.5.0-alpha.54",
58
+ "@storybook/store": "6.5.0-alpha.54",
59
+ "@storybook/svelte": "6.5.0-alpha.54",
60
+ "@storybook/theming": "6.5.0-alpha.54",
61
+ "@storybook/ui": "6.5.0-alpha.54",
62
+ "@storybook/vue": "6.5.0-alpha.54",
63
+ "@storybook/vue3": "6.5.0-alpha.54",
64
+ "@storybook/web-components": "6.5.0-alpha.54"
65
65
  };
66
66
  exports.default = _default;
package/dist/modern/add.js CHANGED
@@ -77,14 +77,14 @@ const installAddon = (packageManager, addonName, isOfficialAddon) => {
77
77
 
78
78
  const addStorybookAddonToFile = (addonName, addonsFile, isOfficialAddon) => {
79
79
  const addonNameNoTag = addonName.split('@')[0];
80
- const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/register`));
80
+ const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/manager`));
81
81
 
82
82
  if (alreadyRegistered) {
83
83
  return addonsFile;
84
84
  }
85
85
 
86
86
  const latestImportIndex = addonsFile.reduce((prev, curr, currIndex) => curr.startsWith('import') && curr.includes('register') ? currIndex : prev, -1);
87
- return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/register';`, ...addonsFile.slice(latestImportIndex + 1)];
87
+ return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/manager';`, ...addonsFile.slice(latestImportIndex + 1)];
88
88
  };
89
89
 
90
90
  exports.addStorybookAddonToFile = addStorybookAddonToFile;
package/dist/modern/automigrate/fixes/builder-vite.js ADDED
@@ -0,0 +1,123 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.builderVite = void 0;
7
+
8
+ require("core-js/modules/es.promise.js");
9
+
10
+ var _chalk = _interopRequireDefault(require("chalk"));
11
+
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
14
+ var _csfTools = require("@storybook/csf-tools");
15
+
16
+ var _getStorybookInfo = require("../helpers/getStorybookInfo");
17
+
18
+ var _jsPackageManager = require("../../js-package-manager");
19
+
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
+
22
+ const logger = console;
23
+
24
+ /**
25
+ * Is the user using 'storybook-builder-vite' in their project?
26
+ *
27
+ * If so, prompt them to upgrade to '@storybook/builder-vite'.
28
+ *
29
+ * - Add '@storybook/builder-vite' as dev dependency
30
+ * - Remove 'storybook-builder-vite' dependency
31
+ * - Add core.builder = '@storybook/builder-vite' to main.js
32
+ */
33
+ const builderVite = {
34
+ id: 'builder-vite',
35
+
36
+ async check({
37
+ packageManager
38
+ }) {
39
+ const packageJson = packageManager.retrievePackageJson();
40
+ const {
41
+ mainConfig
42
+ } = (0, _getStorybookInfo.getStorybookInfo)(packageJson);
43
+
44
+ if (!mainConfig) {
45
+ logger.warn('Unable to find storybook main.js config');
46
+ return null;
47
+ }
48
+
49
+ const main = await (0, _csfTools.readConfig)(mainConfig);
50
+ const builder = main.getFieldValue(['core', 'builder']);
51
+ const builderName = typeof builder === 'string' ? builder : builder === null || builder === void 0 ? void 0 : builder.name;
52
+
53
+ if (builderName !== 'storybook-builder-vite') {
54
+ logger.info(`Not using community vite builder, skipping`);
55
+ return null;
56
+ }
57
+
58
+ return {
59
+ builder,
60
+ main,
61
+ packageJson
62
+ };
63
+ },
64
+
65
+ prompt({
66
+ builder
67
+ }) {
68
+ const builderFormatted = _chalk.default.cyan(JSON.stringify(builder, null, 2));
69
+
70
+ return (0, _tsDedent.default)`
71
+ We've detected you're using the community vite builder: ${builderFormatted}
72
+
73
+ 'storybook-builder-vite' is deprecated and now located at ${_chalk.default.cyan('@storybook/builder-vite')}.
74
+
75
+ We can upgrade your project to use the new builder automatically.
76
+
77
+ More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#vite-builder-renamed')}
78
+ `;
79
+ },
80
+
81
+ async run({
82
+ result: {
83
+ builder,
84
+ main,
85
+ packageJson
86
+ },
87
+ packageManager,
88
+ dryRun
89
+ }) {
90
+ const {
91
+ dependencies = {},
92
+ devDependencies = {}
93
+ } = packageJson;
94
+ logger.info(`Removing existing 'storybook-builder-vite' dependency`);
95
+
96
+ if (!dryRun) {
97
+ delete dependencies['storybook-builder-vite'];
98
+ delete devDependencies['storybook-builder-vite'];
99
+ (0, _jsPackageManager.writePackageJson)(packageJson);
100
+ }
101
+
102
+ logger.info(`Adding '@storybook/builder-vite' as dev dependency`);
103
+
104
+ if (!dryRun) {
105
+ packageManager.addDependencies({
106
+ installAsDevDependencies: true
107
+ }, ['@storybook/builder-vite']);
108
+ }
109
+
110
+ logger.info(`Updating main.js to use vite builder`);
111
+
112
+ if (!dryRun) {
113
+ const updatedBuilder = typeof builder === 'string' ? '@storybook/builder-vite' : {
114
+ name: '@storybook/builder-vite',
115
+ options: builder.options
116
+ };
117
+ main.setFieldValue(['core', 'builder'], updatedBuilder);
118
+ await (0, _csfTools.writeConfig)(main);
119
+ }
120
+ }
121
+
122
+ };
123
+ exports.builderVite = builderVite;
package/dist/modern/automigrate/fixes/index.js CHANGED
@@ -18,6 +18,8 @@ var _mainjsFramework = require("./mainjsFramework");
18
18
 
19
19
  var _eslintPlugin = require("./eslint-plugin");
20
20
 
21
+ var _builderVite = require("./builder-vite");
22
+
21
23
  var _types = require("../types");
22
24
 
23
25
  Object.keys(_types).forEach(function (key) {
@@ -31,5 +33,5 @@ Object.keys(_types).forEach(function (key) {
31
33
  }
32
34
  });
33
35
  });
34
- const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin];
36
+ const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
35
37
  exports.fixes = fixes;
package/dist/modern/generators/REACT_NATIVE/template-csf/storybook/addons.js CHANGED
@@ -1,3 +1,3 @@
1
- import '@storybook/addon-actions/register';
2
- import '@storybook/addon-links/register';
3
- import '@storybook/addon-knobs/register';
1
+ import '@storybook/addon-actions/manager';
2
+ import '@storybook/addon-links/manager';
3
+ import '@storybook/addon-knobs/manager';
package/dist/modern/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js CHANGED
@@ -1,2 +1,2 @@
1
- import '@storybook/addon-ondevice-actions/register';
2
- import '@storybook/addon-ondevice-knobs/register';
1
+ import '@storybook/addon-ondevice-actions/manager';
2
+ import '@storybook/addon-ondevice-knobs/manager';
package/dist/modern/generators/baseGenerator.js CHANGED
@@ -9,6 +9,8 @@ require("core-js/modules/es.promise.js");
9
9
 
10
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
11
11
 
12
+ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
13
+
12
14
  var _coreCommon = require("@storybook/core-common");
13
15
 
14
16
  var _project_types = require("../project_types");
@@ -44,6 +46,9 @@ const builderDependencies = builder => {
44
46
  case _project_types.CoreBuilder.Webpack5:
45
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
46
48
 
49
+ case _project_types.CoreBuilder.Vite:
50
+ return ['@storybook/builder-vite'];
51
+
47
52
  default:
48
53
  return [builder];
49
54
  }
@@ -87,9 +92,11 @@ async function baseGenerator(packageManager, npmOptions, {
87
92
  const frameworkPackage = `@storybook/${framework}`;
88
93
  const packages = [frameworkPackage, ...addonPackages, ...extraPackages, ...extraAddons, ...yarn2Dependencies, ...builderDependencies(builder)].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
89
94
  const versionedPackages = await packageManager.getVersionedPackages(...packages);
95
+ const coreBuilders = [_project_types.CoreBuilder.Webpack4, _project_types.CoreBuilder.Webpack5, _project_types.CoreBuilder.Vite];
96
+ const expandedBuilder = coreBuilders.includes(builder) ? `@storybook/builder-${builder}` : builder;
90
97
  const mainOptions = builder !== _project_types.CoreBuilder.Webpack4 ? Object.assign({
91
98
  core: {
92
- builder
99
+ builder: expandedBuilder
93
100
  }
94
101
  }, extraMain) : extraMain;
95
102
  (0, _configure.configure)(framework, Object.assign({
@@ -101,6 +108,18 @@ async function baseGenerator(packageManager, npmOptions, {
101
108
 
102
109
  if (addComponents) {
103
110
  (0, _helpers.copyComponents)(framework, language);
111
+ } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
112
+
113
+
114
+ if (expandedBuilder === '@storybook/builder-vite') {
115
+ const previewHead = (0, _tsDedent.default)`
116
+ <script>
117
+ window.global = window;
118
+ </script>
119
+ `;
120
+ await _fsExtra.default.writeFile(`.storybook/preview-head.html`, previewHead, {
121
+ encoding: 'utf8'
122
+ });
104
123
  }
105
124
 
106
125
  const babelDependencies = addBabel ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
package/dist/modern/project_types.js CHANGED
@@ -59,6 +59,7 @@ exports.CoreBuilder = CoreBuilder;
59
59
  (function (CoreBuilder) {
60
60
  CoreBuilder["Webpack4"] = "webpack4";
61
61
  CoreBuilder["Webpack5"] = "webpack5";
62
+ CoreBuilder["Vite"] = "vite";
62
63
  })(CoreBuilder || (exports.CoreBuilder = CoreBuilder = {}));
63
64
 
64
65
  let SupportedLanguage;
package/dist/modern/versions.js CHANGED
@@ -6,61 +6,61 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.51",
10
- "@storybook/addon-actions": "6.5.0-alpha.51",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.51",
12
- "@storybook/addon-controls": "6.5.0-alpha.51",
13
- "@storybook/addon-docs": "6.5.0-alpha.51",
14
- "@storybook/addon-essentials": "6.5.0-alpha.51",
15
- "@storybook/addon-interactions": "6.5.0-alpha.51",
16
- "@storybook/addon-jest": "6.5.0-alpha.51",
17
- "@storybook/addon-links": "6.5.0-alpha.51",
18
- "@storybook/addon-measure": "6.5.0-alpha.51",
19
- "@storybook/addon-outline": "6.5.0-alpha.51",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.51",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.51",
22
- "@storybook/addon-storysource": "6.5.0-alpha.51",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.51",
24
- "@storybook/addon-viewport": "6.5.0-alpha.51",
25
- "@storybook/addons": "6.5.0-alpha.51",
26
- "@storybook/angular": "6.5.0-alpha.51",
27
- "@storybook/api": "6.5.0-alpha.51",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.51",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.51",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.51",
31
- "@storybook/channel-websocket": "6.5.0-alpha.51",
32
- "@storybook/channels": "6.5.0-alpha.51",
33
- "@storybook/cli": "6.5.0-alpha.51",
34
- "@storybook/client-api": "6.5.0-alpha.51",
35
- "@storybook/client-logger": "6.5.0-alpha.51",
36
- "@storybook/codemod": "6.5.0-alpha.51",
37
- "@storybook/components": "6.5.0-alpha.51",
38
- "@storybook/core": "6.5.0-alpha.51",
39
- "@storybook/core-client": "6.5.0-alpha.51",
40
- "@storybook/core-common": "6.5.0-alpha.51",
41
- "@storybook/core-events": "6.5.0-alpha.51",
42
- "@storybook/core-server": "6.5.0-alpha.51",
43
- "@storybook/csf-tools": "6.5.0-alpha.51",
44
- "@storybook/docs-tools": "6.5.0-alpha.51",
45
- "@storybook/ember": "6.5.0-alpha.51",
46
- "@storybook/html": "6.5.0-alpha.51",
47
- "@storybook/instrumenter": "6.5.0-alpha.51",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.51",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.51",
50
- "@storybook/node-logger": "6.5.0-alpha.51",
51
- "@storybook/postinstall": "6.5.0-alpha.51",
52
- "@storybook/preact": "6.5.0-alpha.51",
53
- "@storybook/preview-web": "6.5.0-alpha.51",
54
- "@storybook/react": "6.5.0-alpha.51",
55
- "@storybook/router": "6.5.0-alpha.51",
56
- "@storybook/server": "6.5.0-alpha.51",
57
- "@storybook/source-loader": "6.5.0-alpha.51",
58
- "@storybook/store": "6.5.0-alpha.51",
59
- "@storybook/svelte": "6.5.0-alpha.51",
60
- "@storybook/theming": "6.5.0-alpha.51",
61
- "@storybook/ui": "6.5.0-alpha.51",
62
- "@storybook/vue": "6.5.0-alpha.51",
63
- "@storybook/vue3": "6.5.0-alpha.51",
64
- "@storybook/web-components": "6.5.0-alpha.51"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.54",
10
+ "@storybook/addon-actions": "6.5.0-alpha.54",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.54",
12
+ "@storybook/addon-controls": "6.5.0-alpha.54",
13
+ "@storybook/addon-docs": "6.5.0-alpha.54",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.54",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.54",
16
+ "@storybook/addon-jest": "6.5.0-alpha.54",
17
+ "@storybook/addon-links": "6.5.0-alpha.54",
18
+ "@storybook/addon-measure": "6.5.0-alpha.54",
19
+ "@storybook/addon-outline": "6.5.0-alpha.54",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.54",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.54",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.54",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.54",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.54",
25
+ "@storybook/addons": "6.5.0-alpha.54",
26
+ "@storybook/angular": "6.5.0-alpha.54",
27
+ "@storybook/api": "6.5.0-alpha.54",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.54",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.54",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.54",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.54",
32
+ "@storybook/channels": "6.5.0-alpha.54",
33
+ "@storybook/cli": "6.5.0-alpha.54",
34
+ "@storybook/client-api": "6.5.0-alpha.54",
35
+ "@storybook/client-logger": "6.5.0-alpha.54",
36
+ "@storybook/codemod": "6.5.0-alpha.54",
37
+ "@storybook/components": "6.5.0-alpha.54",
38
+ "@storybook/core": "6.5.0-alpha.54",
39
+ "@storybook/core-client": "6.5.0-alpha.54",
40
+ "@storybook/core-common": "6.5.0-alpha.54",
41
+ "@storybook/core-events": "6.5.0-alpha.54",
42
+ "@storybook/core-server": "6.5.0-alpha.54",
43
+ "@storybook/csf-tools": "6.5.0-alpha.54",
44
+ "@storybook/docs-tools": "6.5.0-alpha.54",
45
+ "@storybook/ember": "6.5.0-alpha.54",
46
+ "@storybook/html": "6.5.0-alpha.54",
47
+ "@storybook/instrumenter": "6.5.0-alpha.54",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.54",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.54",
50
+ "@storybook/node-logger": "6.5.0-alpha.54",
51
+ "@storybook/postinstall": "6.5.0-alpha.54",
52
+ "@storybook/preact": "6.5.0-alpha.54",
53
+ "@storybook/preview-web": "6.5.0-alpha.54",
54
+ "@storybook/react": "6.5.0-alpha.54",
55
+ "@storybook/router": "6.5.0-alpha.54",
56
+ "@storybook/server": "6.5.0-alpha.54",
57
+ "@storybook/source-loader": "6.5.0-alpha.54",
58
+ "@storybook/store": "6.5.0-alpha.54",
59
+ "@storybook/svelte": "6.5.0-alpha.54",
60
+ "@storybook/theming": "6.5.0-alpha.54",
61
+ "@storybook/ui": "6.5.0-alpha.54",
62
+ "@storybook/vue": "6.5.0-alpha.54",
63
+ "@storybook/vue3": "6.5.0-alpha.54",
64
+ "@storybook/web-components": "6.5.0-alpha.54"
65
65
  };
66
66
  exports.default = _default;
package/dist/ts3.4/automigrate/fixes/builder-vite.d.ts ADDED
@@ -0,0 +1,19 @@
1
+ import { ConfigFile } from '@storybook/csf-tools';
2
+ import { Fix } from '../types';
3
+ import { PackageJson } from '../../js-package-manager';
4
+ interface BuilderViteOptions {
5
+ builder: any;
6
+ main: ConfigFile;
7
+ packageJson: PackageJson;
8
+ }
9
+ /**
10
+ * Is the user using 'storybook-builder-vite' in their project?
11
+ *
12
+ * If so, prompt them to upgrade to '@storybook/builder-vite'.
13
+ *
14
+ * - Add '@storybook/builder-vite' as dev dependency
15
+ * - Remove 'storybook-builder-vite' dependency
16
+ * - Add core.builder = '@storybook/builder-vite' to main.js
17
+ */
18
+ export declare const builderVite: Fix<BuilderViteOptions>;
19
+ export {};
package/dist/ts3.4/project_types.d.ts CHANGED
@@ -30,7 +30,8 @@ export declare enum ProjectType {
30
30
  export declare const SUPPORTED_FRAMEWORKS: SupportedFrameworks[];
31
31
  export declare enum CoreBuilder {
32
32
  Webpack4 = "webpack4",
33
- Webpack5 = "webpack5"
33
+ Webpack5 = "webpack5",
34
+ Vite = "vite"
34
35
  }
35
36
  export declare type Builder = CoreBuilder | (string & {});
36
37
  export declare enum SupportedLanguage {
package/dist/ts3.9/automigrate/fixes/builder-vite.d.ts ADDED
@@ -0,0 +1,19 @@
1
+ import { ConfigFile } from '@storybook/csf-tools';
2
+ import { Fix } from '../types';
3
+ import { PackageJson } from '../../js-package-manager';
4
+ interface BuilderViteOptions {
5
+ builder: any;
6
+ main: ConfigFile;
7
+ packageJson: PackageJson;
8
+ }
9
+ /**
10
+ * Is the user using 'storybook-builder-vite' in their project?
11
+ *
12
+ * If so, prompt them to upgrade to '@storybook/builder-vite'.
13
+ *
14
+ * - Add '@storybook/builder-vite' as dev dependency
15
+ * - Remove 'storybook-builder-vite' dependency
16
+ * - Add core.builder = '@storybook/builder-vite' to main.js
17
+ */
18
+ export declare const builderVite: Fix<BuilderViteOptions>;
19
+ export {};
package/dist/ts3.9/project_types.d.ts CHANGED
@@ -30,7 +30,8 @@ export declare enum ProjectType {
30
30
  export declare const SUPPORTED_FRAMEWORKS: SupportedFrameworks[];
31
31
  export declare enum CoreBuilder {
32
32
  Webpack4 = "webpack4",
33
- Webpack5 = "webpack5"
33
+ Webpack5 = "webpack5",
34
+ Vite = "vite"
34
35
  }
35
36
  export declare type Builder = CoreBuilder | (string & {});
36
37
  export declare enum SupportedLanguage {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "6.5.0-alpha.51",
3
+ "version": "6.5.0-alpha.54",
4
4
  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
5
5
  "keywords": [
6
6
  "cli",
@@ -47,10 +47,10 @@
47
47
  "dependencies": {
48
48
  "@babel/core": "^7.12.10",
49
49
  "@babel/preset-env": "^7.12.11",
50
- "@storybook/codemod": "6.5.0-alpha.51",
51
- "@storybook/core-common": "6.5.0-alpha.51",
52
- "@storybook/csf-tools": "6.5.0-alpha.51",
53
- "@storybook/node-logger": "6.5.0-alpha.51",
50
+ "@storybook/codemod": "6.5.0-alpha.54",
51
+ "@storybook/core-common": "6.5.0-alpha.54",
52
+ "@storybook/csf-tools": "6.5.0-alpha.54",
53
+ "@storybook/node-logger": "6.5.0-alpha.54",
54
54
  "@storybook/semver": "^7.3.2",
55
55
  "boxen": "^5.1.2",
56
56
  "chalk": "^4.1.0",
@@ -75,7 +75,7 @@
75
75
  "update-notifier": "^5.0.1"
76
76
  },
77
77
  "devDependencies": {
78
- "@storybook/client-api": "6.5.0-alpha.51",
78
+ "@storybook/client-api": "6.5.0-alpha.54",
79
79
  "@types/cross-spawn": "^6.0.2",
80
80
  "@types/prompts": "^2.0.9",
81
81
  "@types/puppeteer-core": "^2.1.0",
@@ -91,5 +91,5 @@
91
91
  "publishConfig": {
92
92
  "access": "public"
93
93
  },
94
- "gitHead": "cfcdc7fb74d3cf60eae8dd0b5a626d67ed180d42"
94
+ "gitHead": "2048f366e90e668c3f462d81f5b372a19902b67f"
95
95
  }