@storybook/cli 6.5.0-alpha.55 → 6.5.0-alpha.58

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 (20) hide show
  1. package/dist/cjs/detect.js +28 -1
  2. package/dist/cjs/generators/baseGenerator.js +1 -1
  3. package/dist/cjs/initiate.js +1 -1
  4. package/dist/cjs/repro-generators/configs.js +21 -1
  5. package/dist/cjs/versions.js +56 -56
  6. package/dist/esm/detect.js +28 -1
  7. package/dist/esm/generators/baseGenerator.js +1 -1
  8. package/dist/esm/initiate.js +1 -1
  9. package/dist/esm/repro-generators/configs.js +21 -1
  10. package/dist/esm/versions.js +56 -56
  11. package/dist/modern/detect.js +28 -1
  12. package/dist/modern/generators/baseGenerator.js +1 -1
  13. package/dist/modern/initiate.js +1 -1
  14. package/dist/modern/repro-generators/configs.js +21 -1
  15. package/dist/modern/versions.js +56 -56
  16. package/dist/ts3.4/detect.d.ts +2 -2
  17. package/dist/ts3.4/repro-generators/configs.d.ts +2 -0
  18. package/dist/ts3.9/detect.d.ts +2 -2
  19. package/dist/ts3.9/repro-generators/configs.d.ts +2 -0
  20. package/package.json +7 -7
package/dist/cjs/detect.js CHANGED
@@ -109,12 +109,39 @@ function detectFrameworkPreset(packageJson = {}) {
109
109
  */
110
110
 
111
111
 
112
- function detectBuilder() {
112
+ function detectBuilder(packageManager) {
113
113
  const viteConfig = _findUp.default.sync(viteConfigFiles);
114
114
 
115
115
  if (viteConfig) {
116
116
  (0, _helpers.paddedLog)('Detected vite project, setting builder to @storybook/builder-vite');
117
117
  return _project_types.CoreBuilder.Vite;
118
+ }
119
+
120
+ try {
121
+ let out = '';
122
+
123
+ if (packageManager.type === 'npm') {
124
+ try {
125
+ // npm <= v7
126
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
127
+ } catch (e2) {
128
+ // npm >= v8
129
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
130
+ }
131
+ } else {
132
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
133
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
134
+
135
+
136
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
137
+ return _project_types.CoreBuilder.Webpack5;
138
+ } // the user has webpack 4 installed, but not 5
139
+
140
+
141
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
142
+ return _project_types.CoreBuilder.Webpack5;
143
+ }
144
+ } catch (err) {//
118
145
  } // Fallback to webpack4
119
146
 
120
147
 
package/dist/cjs/generators/baseGenerator.js CHANGED
@@ -41,7 +41,7 @@ const defaultOptions = {
41
41
  const builderDependencies = builder => {
42
42
  switch (builder) {
43
43
  case _project_types.CoreBuilder.Webpack4:
44
- return [];
44
+ return ['@storybook/builder-webpack4', '@storybook/manager-webpack4'];
45
45
 
46
46
  case _project_types.CoreBuilder.Webpack5:
47
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
package/dist/cjs/initiate.js CHANGED
@@ -83,7 +83,7 @@ const installStorybook = (projectType, options) => {
83
83
  const language = (0, _detect.detectLanguage)();
84
84
  const generatorOptions = {
85
85
  language,
86
- builder: options.builder || (0, _detect.detectBuilder)(),
86
+ builder: options.builder || (0, _detect.detectBuilder)(packageManager),
87
87
  linkable: !!options.linkable,
88
88
  commonJs: options.commonJs
89
89
  };
package/dist/cjs/repro-generators/configs.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
6
+ exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.vite_react = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_legacy_root_api = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -34,6 +34,19 @@ const react = {
34
34
  additionalDeps: ['prop-types']
35
35
  };
36
36
  exports.react = react;
37
+ const react_legacy_root_api = {
38
+ framework: 'react',
39
+ name: 'react_legacy_root_api',
40
+ version: 'latest',
41
+ generator: fromDeps('react', 'react-dom'),
42
+ additionalDeps: ['prop-types'],
43
+ mainOverrides: {
44
+ reactOptions: {
45
+ legacyRootApi: true
46
+ }
47
+ }
48
+ };
49
+ exports.react_legacy_root_api = react_legacy_root_api;
37
50
  const react_typescript = {
38
51
  framework: 'react',
39
52
  name: 'react_typescript',
@@ -49,6 +62,13 @@ const webpack_react = {
49
62
  generator: fromDeps('react', 'react-dom', 'webpack@webpack-4')
50
63
  };
51
64
  exports.webpack_react = webpack_react;
65
+ const vite_react = {
66
+ framework: 'react',
67
+ name: 'vite_react',
68
+ version: 'latest',
69
+ generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts'
70
+ };
71
+ exports.vite_react = vite_react;
52
72
  const react_in_yarn_workspace = {
53
73
  framework: 'react',
54
74
  name: 'react_in_yarn_workspace',
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.55",
10
- "@storybook/addon-actions": "6.5.0-alpha.55",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.55",
12
- "@storybook/addon-controls": "6.5.0-alpha.55",
13
- "@storybook/addon-docs": "6.5.0-alpha.55",
14
- "@storybook/addon-essentials": "6.5.0-alpha.55",
15
- "@storybook/addon-interactions": "6.5.0-alpha.55",
16
- "@storybook/addon-jest": "6.5.0-alpha.55",
17
- "@storybook/addon-links": "6.5.0-alpha.55",
18
- "@storybook/addon-measure": "6.5.0-alpha.55",
19
- "@storybook/addon-outline": "6.5.0-alpha.55",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.55",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.55",
22
- "@storybook/addon-storysource": "6.5.0-alpha.55",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.55",
24
- "@storybook/addon-viewport": "6.5.0-alpha.55",
25
- "@storybook/addons": "6.5.0-alpha.55",
26
- "@storybook/angular": "6.5.0-alpha.55",
27
- "@storybook/api": "6.5.0-alpha.55",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.55",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.55",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.55",
31
- "@storybook/channel-websocket": "6.5.0-alpha.55",
32
- "@storybook/channels": "6.5.0-alpha.55",
33
- "@storybook/cli": "6.5.0-alpha.55",
34
- "@storybook/client-api": "6.5.0-alpha.55",
35
- "@storybook/client-logger": "6.5.0-alpha.55",
36
- "@storybook/codemod": "6.5.0-alpha.55",
37
- "@storybook/components": "6.5.0-alpha.55",
38
- "@storybook/core": "6.5.0-alpha.55",
39
- "@storybook/core-client": "6.5.0-alpha.55",
40
- "@storybook/core-common": "6.5.0-alpha.55",
41
- "@storybook/core-events": "6.5.0-alpha.55",
42
- "@storybook/core-server": "6.5.0-alpha.55",
43
- "@storybook/csf-tools": "6.5.0-alpha.55",
44
- "@storybook/docs-tools": "6.5.0-alpha.55",
45
- "@storybook/ember": "6.5.0-alpha.55",
46
- "@storybook/html": "6.5.0-alpha.55",
47
- "@storybook/instrumenter": "6.5.0-alpha.55",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.55",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.55",
50
- "@storybook/node-logger": "6.5.0-alpha.55",
51
- "@storybook/postinstall": "6.5.0-alpha.55",
52
- "@storybook/preact": "6.5.0-alpha.55",
53
- "@storybook/preview-web": "6.5.0-alpha.55",
54
- "@storybook/react": "6.5.0-alpha.55",
55
- "@storybook/router": "6.5.0-alpha.55",
56
- "@storybook/server": "6.5.0-alpha.55",
57
- "@storybook/source-loader": "6.5.0-alpha.55",
58
- "@storybook/store": "6.5.0-alpha.55",
59
- "@storybook/svelte": "6.5.0-alpha.55",
60
- "@storybook/theming": "6.5.0-alpha.55",
61
- "@storybook/ui": "6.5.0-alpha.55",
62
- "@storybook/vue": "6.5.0-alpha.55",
63
- "@storybook/vue3": "6.5.0-alpha.55",
64
- "@storybook/web-components": "6.5.0-alpha.55"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.58",
10
+ "@storybook/addon-actions": "6.5.0-alpha.58",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.58",
12
+ "@storybook/addon-controls": "6.5.0-alpha.58",
13
+ "@storybook/addon-docs": "6.5.0-alpha.58",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.58",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.58",
16
+ "@storybook/addon-jest": "6.5.0-alpha.58",
17
+ "@storybook/addon-links": "6.5.0-alpha.58",
18
+ "@storybook/addon-measure": "6.5.0-alpha.58",
19
+ "@storybook/addon-outline": "6.5.0-alpha.58",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.58",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.58",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.58",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.58",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.58",
25
+ "@storybook/addons": "6.5.0-alpha.58",
26
+ "@storybook/angular": "6.5.0-alpha.58",
27
+ "@storybook/api": "6.5.0-alpha.58",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.58",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.58",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.58",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.58",
32
+ "@storybook/channels": "6.5.0-alpha.58",
33
+ "@storybook/cli": "6.5.0-alpha.58",
34
+ "@storybook/client-api": "6.5.0-alpha.58",
35
+ "@storybook/client-logger": "6.5.0-alpha.58",
36
+ "@storybook/codemod": "6.5.0-alpha.58",
37
+ "@storybook/components": "6.5.0-alpha.58",
38
+ "@storybook/core": "6.5.0-alpha.58",
39
+ "@storybook/core-client": "6.5.0-alpha.58",
40
+ "@storybook/core-common": "6.5.0-alpha.58",
41
+ "@storybook/core-events": "6.5.0-alpha.58",
42
+ "@storybook/core-server": "6.5.0-alpha.58",
43
+ "@storybook/csf-tools": "6.5.0-alpha.58",
44
+ "@storybook/docs-tools": "6.5.0-alpha.58",
45
+ "@storybook/ember": "6.5.0-alpha.58",
46
+ "@storybook/html": "6.5.0-alpha.58",
47
+ "@storybook/instrumenter": "6.5.0-alpha.58",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.58",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.58",
50
+ "@storybook/node-logger": "6.5.0-alpha.58",
51
+ "@storybook/postinstall": "6.5.0-alpha.58",
52
+ "@storybook/preact": "6.5.0-alpha.58",
53
+ "@storybook/preview-web": "6.5.0-alpha.58",
54
+ "@storybook/react": "6.5.0-alpha.58",
55
+ "@storybook/router": "6.5.0-alpha.58",
56
+ "@storybook/server": "6.5.0-alpha.58",
57
+ "@storybook/source-loader": "6.5.0-alpha.58",
58
+ "@storybook/store": "6.5.0-alpha.58",
59
+ "@storybook/svelte": "6.5.0-alpha.58",
60
+ "@storybook/theming": "6.5.0-alpha.58",
61
+ "@storybook/ui": "6.5.0-alpha.58",
62
+ "@storybook/vue": "6.5.0-alpha.58",
63
+ "@storybook/vue3": "6.5.0-alpha.58",
64
+ "@storybook/web-components": "6.5.0-alpha.58"
65
65
  };
66
66
  exports.default = _default;
package/dist/esm/detect.js CHANGED
@@ -109,12 +109,39 @@ function detectFrameworkPreset(packageJson = {}) {
109
109
  */
110
110
 
111
111
 
112
- function detectBuilder() {
112
+ function detectBuilder(packageManager) {
113
113
  const viteConfig = _findUp.default.sync(viteConfigFiles);
114
114
 
115
115
  if (viteConfig) {
116
116
  (0, _helpers.paddedLog)('Detected vite project, setting builder to @storybook/builder-vite');
117
117
  return _project_types.CoreBuilder.Vite;
118
+ }
119
+
120
+ try {
121
+ let out = '';
122
+
123
+ if (packageManager.type === 'npm') {
124
+ try {
125
+ // npm <= v7
126
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
127
+ } catch (e2) {
128
+ // npm >= v8
129
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
130
+ }
131
+ } else {
132
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
133
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
134
+
135
+
136
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
137
+ return _project_types.CoreBuilder.Webpack5;
138
+ } // the user has webpack 4 installed, but not 5
139
+
140
+
141
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
142
+ return _project_types.CoreBuilder.Webpack5;
143
+ }
144
+ } catch (err) {//
118
145
  } // Fallback to webpack4
119
146
 
120
147
 
package/dist/esm/generators/baseGenerator.js CHANGED
@@ -41,7 +41,7 @@ const defaultOptions = {
41
41
  const builderDependencies = builder => {
42
42
  switch (builder) {
43
43
  case _project_types.CoreBuilder.Webpack4:
44
- return [];
44
+ return ['@storybook/builder-webpack4', '@storybook/manager-webpack4'];
45
45
 
46
46
  case _project_types.CoreBuilder.Webpack5:
47
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
package/dist/esm/initiate.js CHANGED
@@ -83,7 +83,7 @@ const installStorybook = (projectType, options) => {
83
83
  const language = (0, _detect.detectLanguage)();
84
84
  const generatorOptions = {
85
85
  language,
86
- builder: options.builder || (0, _detect.detectBuilder)(),
86
+ builder: options.builder || (0, _detect.detectBuilder)(packageManager),
87
87
  linkable: !!options.linkable,
88
88
  commonJs: options.commonJs
89
89
  };
package/dist/esm/repro-generators/configs.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
6
+ exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.vite_react = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_legacy_root_api = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -34,6 +34,19 @@ const react = {
34
34
  additionalDeps: ['prop-types']
35
35
  };
36
36
  exports.react = react;
37
+ const react_legacy_root_api = {
38
+ framework: 'react',
39
+ name: 'react_legacy_root_api',
40
+ version: 'latest',
41
+ generator: fromDeps('react', 'react-dom'),
42
+ additionalDeps: ['prop-types'],
43
+ mainOverrides: {
44
+ reactOptions: {
45
+ legacyRootApi: true
46
+ }
47
+ }
48
+ };
49
+ exports.react_legacy_root_api = react_legacy_root_api;
37
50
  const react_typescript = {
38
51
  framework: 'react',
39
52
  name: 'react_typescript',
@@ -49,6 +62,13 @@ const webpack_react = {
49
62
  generator: fromDeps('react', 'react-dom', 'webpack@webpack-4')
50
63
  };
51
64
  exports.webpack_react = webpack_react;
65
+ const vite_react = {
66
+ framework: 'react',
67
+ name: 'vite_react',
68
+ version: 'latest',
69
+ generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts'
70
+ };
71
+ exports.vite_react = vite_react;
52
72
  const react_in_yarn_workspace = {
53
73
  framework: 'react',
54
74
  name: 'react_in_yarn_workspace',
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.55",
10
- "@storybook/addon-actions": "6.5.0-alpha.55",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.55",
12
- "@storybook/addon-controls": "6.5.0-alpha.55",
13
- "@storybook/addon-docs": "6.5.0-alpha.55",
14
- "@storybook/addon-essentials": "6.5.0-alpha.55",
15
- "@storybook/addon-interactions": "6.5.0-alpha.55",
16
- "@storybook/addon-jest": "6.5.0-alpha.55",
17
- "@storybook/addon-links": "6.5.0-alpha.55",
18
- "@storybook/addon-measure": "6.5.0-alpha.55",
19
- "@storybook/addon-outline": "6.5.0-alpha.55",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.55",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.55",
22
- "@storybook/addon-storysource": "6.5.0-alpha.55",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.55",
24
- "@storybook/addon-viewport": "6.5.0-alpha.55",
25
- "@storybook/addons": "6.5.0-alpha.55",
26
- "@storybook/angular": "6.5.0-alpha.55",
27
- "@storybook/api": "6.5.0-alpha.55",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.55",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.55",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.55",
31
- "@storybook/channel-websocket": "6.5.0-alpha.55",
32
- "@storybook/channels": "6.5.0-alpha.55",
33
- "@storybook/cli": "6.5.0-alpha.55",
34
- "@storybook/client-api": "6.5.0-alpha.55",
35
- "@storybook/client-logger": "6.5.0-alpha.55",
36
- "@storybook/codemod": "6.5.0-alpha.55",
37
- "@storybook/components": "6.5.0-alpha.55",
38
- "@storybook/core": "6.5.0-alpha.55",
39
- "@storybook/core-client": "6.5.0-alpha.55",
40
- "@storybook/core-common": "6.5.0-alpha.55",
41
- "@storybook/core-events": "6.5.0-alpha.55",
42
- "@storybook/core-server": "6.5.0-alpha.55",
43
- "@storybook/csf-tools": "6.5.0-alpha.55",
44
- "@storybook/docs-tools": "6.5.0-alpha.55",
45
- "@storybook/ember": "6.5.0-alpha.55",
46
- "@storybook/html": "6.5.0-alpha.55",
47
- "@storybook/instrumenter": "6.5.0-alpha.55",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.55",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.55",
50
- "@storybook/node-logger": "6.5.0-alpha.55",
51
- "@storybook/postinstall": "6.5.0-alpha.55",
52
- "@storybook/preact": "6.5.0-alpha.55",
53
- "@storybook/preview-web": "6.5.0-alpha.55",
54
- "@storybook/react": "6.5.0-alpha.55",
55
- "@storybook/router": "6.5.0-alpha.55",
56
- "@storybook/server": "6.5.0-alpha.55",
57
- "@storybook/source-loader": "6.5.0-alpha.55",
58
- "@storybook/store": "6.5.0-alpha.55",
59
- "@storybook/svelte": "6.5.0-alpha.55",
60
- "@storybook/theming": "6.5.0-alpha.55",
61
- "@storybook/ui": "6.5.0-alpha.55",
62
- "@storybook/vue": "6.5.0-alpha.55",
63
- "@storybook/vue3": "6.5.0-alpha.55",
64
- "@storybook/web-components": "6.5.0-alpha.55"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.58",
10
+ "@storybook/addon-actions": "6.5.0-alpha.58",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.58",
12
+ "@storybook/addon-controls": "6.5.0-alpha.58",
13
+ "@storybook/addon-docs": "6.5.0-alpha.58",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.58",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.58",
16
+ "@storybook/addon-jest": "6.5.0-alpha.58",
17
+ "@storybook/addon-links": "6.5.0-alpha.58",
18
+ "@storybook/addon-measure": "6.5.0-alpha.58",
19
+ "@storybook/addon-outline": "6.5.0-alpha.58",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.58",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.58",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.58",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.58",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.58",
25
+ "@storybook/addons": "6.5.0-alpha.58",
26
+ "@storybook/angular": "6.5.0-alpha.58",
27
+ "@storybook/api": "6.5.0-alpha.58",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.58",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.58",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.58",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.58",
32
+ "@storybook/channels": "6.5.0-alpha.58",
33
+ "@storybook/cli": "6.5.0-alpha.58",
34
+ "@storybook/client-api": "6.5.0-alpha.58",
35
+ "@storybook/client-logger": "6.5.0-alpha.58",
36
+ "@storybook/codemod": "6.5.0-alpha.58",
37
+ "@storybook/components": "6.5.0-alpha.58",
38
+ "@storybook/core": "6.5.0-alpha.58",
39
+ "@storybook/core-client": "6.5.0-alpha.58",
40
+ "@storybook/core-common": "6.5.0-alpha.58",
41
+ "@storybook/core-events": "6.5.0-alpha.58",
42
+ "@storybook/core-server": "6.5.0-alpha.58",
43
+ "@storybook/csf-tools": "6.5.0-alpha.58",
44
+ "@storybook/docs-tools": "6.5.0-alpha.58",
45
+ "@storybook/ember": "6.5.0-alpha.58",
46
+ "@storybook/html": "6.5.0-alpha.58",
47
+ "@storybook/instrumenter": "6.5.0-alpha.58",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.58",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.58",
50
+ "@storybook/node-logger": "6.5.0-alpha.58",
51
+ "@storybook/postinstall": "6.5.0-alpha.58",
52
+ "@storybook/preact": "6.5.0-alpha.58",
53
+ "@storybook/preview-web": "6.5.0-alpha.58",
54
+ "@storybook/react": "6.5.0-alpha.58",
55
+ "@storybook/router": "6.5.0-alpha.58",
56
+ "@storybook/server": "6.5.0-alpha.58",
57
+ "@storybook/source-loader": "6.5.0-alpha.58",
58
+ "@storybook/store": "6.5.0-alpha.58",
59
+ "@storybook/svelte": "6.5.0-alpha.58",
60
+ "@storybook/theming": "6.5.0-alpha.58",
61
+ "@storybook/ui": "6.5.0-alpha.58",
62
+ "@storybook/vue": "6.5.0-alpha.58",
63
+ "@storybook/vue3": "6.5.0-alpha.58",
64
+ "@storybook/web-components": "6.5.0-alpha.58"
65
65
  };
66
66
  exports.default = _default;
package/dist/modern/detect.js CHANGED
@@ -109,12 +109,39 @@ function detectFrameworkPreset(packageJson = {}) {
109
109
  */
110
110
 
111
111
 
112
- function detectBuilder() {
112
+ function detectBuilder(packageManager) {
113
113
  const viteConfig = _findUp.default.sync(viteConfigFiles);
114
114
 
115
115
  if (viteConfig) {
116
116
  (0, _helpers.paddedLog)('Detected vite project, setting builder to @storybook/builder-vite');
117
117
  return _project_types.CoreBuilder.Vite;
118
+ }
119
+
120
+ try {
121
+ let out = '';
122
+
123
+ if (packageManager.type === 'npm') {
124
+ try {
125
+ // npm <= v7
126
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
127
+ } catch (e2) {
128
+ // npm >= v8
129
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
130
+ }
131
+ } else {
132
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
133
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
134
+
135
+
136
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
137
+ return _project_types.CoreBuilder.Webpack5;
138
+ } // the user has webpack 4 installed, but not 5
139
+
140
+
141
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
142
+ return _project_types.CoreBuilder.Webpack5;
143
+ }
144
+ } catch (err) {//
118
145
  } // Fallback to webpack4
119
146
 
120
147
 
package/dist/modern/generators/baseGenerator.js CHANGED
@@ -41,7 +41,7 @@ const defaultOptions = {
41
41
  const builderDependencies = builder => {
42
42
  switch (builder) {
43
43
  case _project_types.CoreBuilder.Webpack4:
44
- return [];
44
+ return ['@storybook/builder-webpack4', '@storybook/manager-webpack4'];
45
45
 
46
46
  case _project_types.CoreBuilder.Webpack5:
47
47
  return ['@storybook/builder-webpack5', '@storybook/manager-webpack5'];
package/dist/modern/initiate.js CHANGED
@@ -83,7 +83,7 @@ const installStorybook = (projectType, options) => {
83
83
  const language = (0, _detect.detectLanguage)();
84
84
  const generatorOptions = {
85
85
  language,
86
- builder: options.builder || (0, _detect.detectBuilder)(),
86
+ builder: options.builder || (0, _detect.detectBuilder)(packageManager),
87
87
  linkable: !!options.linkable,
88
88
  commonJs: options.commonJs
89
89
  };
package/dist/modern/repro-generators/configs.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
6
+ exports.webpack_react = exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.vite_react = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_legacy_root_api = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -34,6 +34,19 @@ const react = {
34
34
  additionalDeps: ['prop-types']
35
35
  };
36
36
  exports.react = react;
37
+ const react_legacy_root_api = {
38
+ framework: 'react',
39
+ name: 'react_legacy_root_api',
40
+ version: 'latest',
41
+ generator: fromDeps('react', 'react-dom'),
42
+ additionalDeps: ['prop-types'],
43
+ mainOverrides: {
44
+ reactOptions: {
45
+ legacyRootApi: true
46
+ }
47
+ }
48
+ };
49
+ exports.react_legacy_root_api = react_legacy_root_api;
37
50
  const react_typescript = {
38
51
  framework: 'react',
39
52
  name: 'react_typescript',
@@ -49,6 +62,13 @@ const webpack_react = {
49
62
  generator: fromDeps('react', 'react-dom', 'webpack@webpack-4')
50
63
  };
51
64
  exports.webpack_react = webpack_react;
65
+ const vite_react = {
66
+ framework: 'react',
67
+ name: 'vite_react',
68
+ version: 'latest',
69
+ generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts'
70
+ };
71
+ exports.vite_react = vite_react;
52
72
  const react_in_yarn_workspace = {
53
73
  framework: 'react',
54
74
  name: 'react_in_yarn_workspace',
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.55",
10
- "@storybook/addon-actions": "6.5.0-alpha.55",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.55",
12
- "@storybook/addon-controls": "6.5.0-alpha.55",
13
- "@storybook/addon-docs": "6.5.0-alpha.55",
14
- "@storybook/addon-essentials": "6.5.0-alpha.55",
15
- "@storybook/addon-interactions": "6.5.0-alpha.55",
16
- "@storybook/addon-jest": "6.5.0-alpha.55",
17
- "@storybook/addon-links": "6.5.0-alpha.55",
18
- "@storybook/addon-measure": "6.5.0-alpha.55",
19
- "@storybook/addon-outline": "6.5.0-alpha.55",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.55",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.55",
22
- "@storybook/addon-storysource": "6.5.0-alpha.55",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.55",
24
- "@storybook/addon-viewport": "6.5.0-alpha.55",
25
- "@storybook/addons": "6.5.0-alpha.55",
26
- "@storybook/angular": "6.5.0-alpha.55",
27
- "@storybook/api": "6.5.0-alpha.55",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.55",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.55",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.55",
31
- "@storybook/channel-websocket": "6.5.0-alpha.55",
32
- "@storybook/channels": "6.5.0-alpha.55",
33
- "@storybook/cli": "6.5.0-alpha.55",
34
- "@storybook/client-api": "6.5.0-alpha.55",
35
- "@storybook/client-logger": "6.5.0-alpha.55",
36
- "@storybook/codemod": "6.5.0-alpha.55",
37
- "@storybook/components": "6.5.0-alpha.55",
38
- "@storybook/core": "6.5.0-alpha.55",
39
- "@storybook/core-client": "6.5.0-alpha.55",
40
- "@storybook/core-common": "6.5.0-alpha.55",
41
- "@storybook/core-events": "6.5.0-alpha.55",
42
- "@storybook/core-server": "6.5.0-alpha.55",
43
- "@storybook/csf-tools": "6.5.0-alpha.55",
44
- "@storybook/docs-tools": "6.5.0-alpha.55",
45
- "@storybook/ember": "6.5.0-alpha.55",
46
- "@storybook/html": "6.5.0-alpha.55",
47
- "@storybook/instrumenter": "6.5.0-alpha.55",
48
- "@storybook/manager-webpack4": "6.5.0-alpha.55",
49
- "@storybook/manager-webpack5": "6.5.0-alpha.55",
50
- "@storybook/node-logger": "6.5.0-alpha.55",
51
- "@storybook/postinstall": "6.5.0-alpha.55",
52
- "@storybook/preact": "6.5.0-alpha.55",
53
- "@storybook/preview-web": "6.5.0-alpha.55",
54
- "@storybook/react": "6.5.0-alpha.55",
55
- "@storybook/router": "6.5.0-alpha.55",
56
- "@storybook/server": "6.5.0-alpha.55",
57
- "@storybook/source-loader": "6.5.0-alpha.55",
58
- "@storybook/store": "6.5.0-alpha.55",
59
- "@storybook/svelte": "6.5.0-alpha.55",
60
- "@storybook/theming": "6.5.0-alpha.55",
61
- "@storybook/ui": "6.5.0-alpha.55",
62
- "@storybook/vue": "6.5.0-alpha.55",
63
- "@storybook/vue3": "6.5.0-alpha.55",
64
- "@storybook/web-components": "6.5.0-alpha.55"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.58",
10
+ "@storybook/addon-actions": "6.5.0-alpha.58",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.58",
12
+ "@storybook/addon-controls": "6.5.0-alpha.58",
13
+ "@storybook/addon-docs": "6.5.0-alpha.58",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.58",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.58",
16
+ "@storybook/addon-jest": "6.5.0-alpha.58",
17
+ "@storybook/addon-links": "6.5.0-alpha.58",
18
+ "@storybook/addon-measure": "6.5.0-alpha.58",
19
+ "@storybook/addon-outline": "6.5.0-alpha.58",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.58",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.58",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.58",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.58",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.58",
25
+ "@storybook/addons": "6.5.0-alpha.58",
26
+ "@storybook/angular": "6.5.0-alpha.58",
27
+ "@storybook/api": "6.5.0-alpha.58",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.58",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.58",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.58",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.58",
32
+ "@storybook/channels": "6.5.0-alpha.58",
33
+ "@storybook/cli": "6.5.0-alpha.58",
34
+ "@storybook/client-api": "6.5.0-alpha.58",
35
+ "@storybook/client-logger": "6.5.0-alpha.58",
36
+ "@storybook/codemod": "6.5.0-alpha.58",
37
+ "@storybook/components": "6.5.0-alpha.58",
38
+ "@storybook/core": "6.5.0-alpha.58",
39
+ "@storybook/core-client": "6.5.0-alpha.58",
40
+ "@storybook/core-common": "6.5.0-alpha.58",
41
+ "@storybook/core-events": "6.5.0-alpha.58",
42
+ "@storybook/core-server": "6.5.0-alpha.58",
43
+ "@storybook/csf-tools": "6.5.0-alpha.58",
44
+ "@storybook/docs-tools": "6.5.0-alpha.58",
45
+ "@storybook/ember": "6.5.0-alpha.58",
46
+ "@storybook/html": "6.5.0-alpha.58",
47
+ "@storybook/instrumenter": "6.5.0-alpha.58",
48
+ "@storybook/manager-webpack4": "6.5.0-alpha.58",
49
+ "@storybook/manager-webpack5": "6.5.0-alpha.58",
50
+ "@storybook/node-logger": "6.5.0-alpha.58",
51
+ "@storybook/postinstall": "6.5.0-alpha.58",
52
+ "@storybook/preact": "6.5.0-alpha.58",
53
+ "@storybook/preview-web": "6.5.0-alpha.58",
54
+ "@storybook/react": "6.5.0-alpha.58",
55
+ "@storybook/router": "6.5.0-alpha.58",
56
+ "@storybook/server": "6.5.0-alpha.58",
57
+ "@storybook/source-loader": "6.5.0-alpha.58",
58
+ "@storybook/store": "6.5.0-alpha.58",
59
+ "@storybook/svelte": "6.5.0-alpha.58",
60
+ "@storybook/theming": "6.5.0-alpha.58",
61
+ "@storybook/ui": "6.5.0-alpha.58",
62
+ "@storybook/vue": "6.5.0-alpha.58",
63
+ "@storybook/vue3": "6.5.0-alpha.58",
64
+ "@storybook/web-components": "6.5.0-alpha.58"
65
65
  };
66
66
  exports.default = _default;
package/dist/ts3.4/detect.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { ProjectType, SupportedLanguage, CoreBuilder } from './project_types';
2
- import { PackageJson } from './js-package-manager';
2
+ import { PackageJson, JsPackageManager } from './js-package-manager';
3
3
  export declare function detectFrameworkPreset(packageJson?: {}): ProjectType.UNDETECTED | ProjectType;
4
4
  /**
5
5
  * Attempts to detect which builder to use, by searching for a vite config file. If one is found, the vite builder
@@ -7,7 +7,7 @@ export declare function detectFrameworkPreset(packageJson?: {}): ProjectType.UND
7
7
  *
8
8
  * @returns CoreBuilder
9
9
  */
10
- export declare function detectBuilder(): CoreBuilder.Webpack4 | CoreBuilder.Vite;
10
+ export declare function detectBuilder(packageManager: JsPackageManager): CoreBuilder;
11
11
  export declare function isStorybookInstalled(dependencies: PackageJson | false, force?: boolean): false | ProjectType.ALREADY_HAS_STORYBOOK | ProjectType.UPDATE_PACKAGE_ORGANIZATIONS;
12
12
  export declare function detectLanguage(): SupportedLanguage;
13
13
  export declare function detect(options?: {
package/dist/ts3.4/repro-generators/configs.d.ts CHANGED
@@ -20,8 +20,10 @@ export interface Parameters {
20
20
  export declare const cra: Parameters;
21
21
  export declare const cra_typescript: Parameters;
22
22
  export declare const react: Parameters;
23
+ export declare const react_legacy_root_api: Parameters;
23
24
  export declare const react_typescript: Parameters;
24
25
  export declare const webpack_react: Parameters;
26
+ export declare const vite_react: Parameters;
25
27
  export declare const react_in_yarn_workspace: Parameters;
26
28
  export declare const angular10: Parameters;
27
29
  export declare const angular11: Parameters;
package/dist/ts3.9/detect.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { ProjectType, SupportedLanguage, CoreBuilder } from './project_types';
2
- import { PackageJson } from './js-package-manager';
2
+ import { PackageJson, JsPackageManager } from './js-package-manager';
3
3
  export declare function detectFrameworkPreset(packageJson?: {}): ProjectType.UNDETECTED | ProjectType;
4
4
  /**
5
5
  * Attempts to detect which builder to use, by searching for a vite config file. If one is found, the vite builder
@@ -7,7 +7,7 @@ export declare function detectFrameworkPreset(packageJson?: {}): ProjectType.UND
7
7
  *
8
8
  * @returns CoreBuilder
9
9
  */
10
- export declare function detectBuilder(): CoreBuilder.Webpack4 | CoreBuilder.Vite;
10
+ export declare function detectBuilder(packageManager: JsPackageManager): CoreBuilder;
11
11
  export declare function isStorybookInstalled(dependencies: PackageJson | false, force?: boolean): false | ProjectType.ALREADY_HAS_STORYBOOK | ProjectType.UPDATE_PACKAGE_ORGANIZATIONS;
12
12
  export declare function detectLanguage(): SupportedLanguage;
13
13
  export declare function detect(options?: {
package/dist/ts3.9/repro-generators/configs.d.ts CHANGED
@@ -20,8 +20,10 @@ export interface Parameters {
20
20
  export declare const cra: Parameters;
21
21
  export declare const cra_typescript: Parameters;
22
22
  export declare const react: Parameters;
23
+ export declare const react_legacy_root_api: Parameters;
23
24
  export declare const react_typescript: Parameters;
24
25
  export declare const webpack_react: Parameters;
26
+ export declare const vite_react: Parameters;
25
27
  export declare const react_in_yarn_workspace: Parameters;
26
28
  export declare const angular10: Parameters;
27
29
  export declare const angular11: Parameters;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "6.5.0-alpha.55",
3
+ "version": "6.5.0-alpha.58",
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.55",
51
- "@storybook/core-common": "6.5.0-alpha.55",
52
- "@storybook/csf-tools": "6.5.0-alpha.55",
53
- "@storybook/node-logger": "6.5.0-alpha.55",
50
+ "@storybook/codemod": "6.5.0-alpha.58",
51
+ "@storybook/core-common": "6.5.0-alpha.58",
52
+ "@storybook/csf-tools": "6.5.0-alpha.58",
53
+ "@storybook/node-logger": "6.5.0-alpha.58",
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.55",
78
+ "@storybook/client-api": "6.5.0-alpha.58",
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": "0d051c3d8efb90e15d8734e6e6914b2439420953"
94
+ "gitHead": "bf25496b2d3d2daa91ab211a9b73b1f4d5b0b52d"
95
95
  }