@storybook/cli 6.5.0-rc.0 → 6.5.0-rc.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 (17) hide show
  1. package/dist/cjs/detect-nextjs.js +33 -0
  2. package/dist/cjs/detect-webpack.js +39 -0
  3. package/dist/cjs/detect.js +17 -20
  4. package/dist/cjs/versions.js +57 -57
  5. package/dist/esm/detect-nextjs.js +33 -0
  6. package/dist/esm/detect-webpack.js +39 -0
  7. package/dist/esm/detect.js +17 -20
  8. package/dist/esm/versions.js +57 -57
  9. package/dist/modern/detect-nextjs.js +33 -0
  10. package/dist/modern/detect-webpack.js +39 -0
  11. package/dist/modern/detect.js +17 -20
  12. package/dist/modern/versions.js +57 -57
  13. package/dist/ts3.4/detect-nextjs.d.ts +2 -0
  14. package/dist/ts3.4/detect-webpack.d.ts +2 -0
  15. package/dist/ts3.9/detect-nextjs.d.ts +2 -0
  16. package/dist/ts3.9/detect-webpack.d.ts +2 -0
  17. package/package.json +8 -8
package/dist/cjs/detect-nextjs.js ADDED
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectNextJS = void 0;
7
+ const regex = /[\s"\n]next.*?(\d+).*/;
8
+
9
+ const detectNextJS = packageManager => {
10
+ try {
11
+ let out = '';
12
+
13
+ if (packageManager.type === 'npm') {
14
+ try {
15
+ // npm <= v7
16
+ out = packageManager.executeCommand('npm', ['ls', 'next']);
17
+ } catch (e2) {
18
+ // npm >= v8
19
+ out = packageManager.executeCommand('npm', ['why', 'next']);
20
+ }
21
+ } else {
22
+ out = packageManager.executeCommand('yarn', ['why', 'next']);
23
+ }
24
+
25
+ const [, version] = out.match(regex);
26
+ return version && parseInt(version, 10) ? parseInt(version, 10) : false;
27
+ } catch (err) {//
28
+ }
29
+
30
+ return false;
31
+ };
32
+
33
+ exports.detectNextJS = detectNextJS;
package/dist/cjs/detect-webpack.js ADDED
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectWebpack = void 0;
7
+
8
+ const detectWebpack = packageManager => {
9
+ try {
10
+ let out = '';
11
+
12
+ if (packageManager.type === 'npm') {
13
+ try {
14
+ // npm <= v7
15
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
16
+ } catch (e2) {
17
+ // npm >= v8
18
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
19
+ }
20
+ } else {
21
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
22
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
23
+
24
+
25
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
26
+ return 4;
27
+ } // the user has webpack 4 installed, but not 5
28
+
29
+
30
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
31
+ return 5;
32
+ }
33
+ } catch (err) {//
34
+ }
35
+
36
+ return false;
37
+ };
38
+
39
+ exports.detectWebpack = detectWebpack;
package/dist/cjs/detect.js CHANGED
@@ -21,6 +21,10 @@ var _helpers = require("./helpers");
21
21
 
22
22
  var _jsPackageManager = require("./js-package-manager");
23
23
 
24
+ var _detectWebpack = require("./detect-webpack");
25
+
26
+ var _detectNextjs = require("./detect-nextjs");
27
+
24
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
29
 
26
30
  const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
@@ -117,31 +121,24 @@ function detectBuilder(packageManager) {
117
121
  return _project_types.CoreBuilder.Vite;
118
122
  }
119
123
 
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')) {
124
+ const nextJSVersion = (0, _detectNextjs.detectNextJS)(packageManager);
125
+
126
+ if (nextJSVersion) {
127
+ if (nextJSVersion >= 11) {
137
128
  return _project_types.CoreBuilder.Webpack5;
138
- } // the user has webpack 4 installed, but not 5
129
+ }
130
+ }
131
+
132
+ const webpackVersion = (0, _detectWebpack.detectWebpack)(packageManager);
139
133
 
134
+ if (webpackVersion) {
135
+ if (webpackVersion <= 4) {
136
+ return _project_types.CoreBuilder.Webpack4;
137
+ }
140
138
 
141
- if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
139
+ if (webpackVersion >= 5) {
142
140
  return _project_types.CoreBuilder.Webpack5;
143
141
  }
144
- } catch (err) {//
145
142
  } // Fallback to webpack4
146
143
 
147
144
 
package/dist/cjs/versions.js CHANGED
@@ -6,62 +6,62 @@ 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-rc.0',
10
- '@storybook/addon-actions': '6.5.0-rc.0',
11
- '@storybook/addon-backgrounds': '6.5.0-rc.0',
12
- '@storybook/addon-controls': '6.5.0-rc.0',
13
- '@storybook/addon-docs': '6.5.0-rc.0',
14
- '@storybook/addon-essentials': '6.5.0-rc.0',
15
- '@storybook/addon-interactions': '6.5.0-rc.0',
16
- '@storybook/addon-jest': '6.5.0-rc.0',
17
- '@storybook/addon-links': '6.5.0-rc.0',
18
- '@storybook/addon-measure': '6.5.0-rc.0',
19
- '@storybook/addon-outline': '6.5.0-rc.0',
20
- '@storybook/addon-storyshots': '6.5.0-rc.0',
21
- '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.0',
22
- '@storybook/addon-storysource': '6.5.0-rc.0',
23
- '@storybook/addon-toolbars': '6.5.0-rc.0',
24
- '@storybook/addon-viewport': '6.5.0-rc.0',
25
- '@storybook/addons': '6.5.0-rc.0',
26
- '@storybook/angular': '6.5.0-rc.0',
27
- '@storybook/api': '6.5.0-rc.0',
28
- '@storybook/builder-webpack4': '6.5.0-rc.0',
29
- '@storybook/builder-webpack5': '6.5.0-rc.0',
30
- '@storybook/channel-postmessage': '6.5.0-rc.0',
31
- '@storybook/channel-websocket': '6.5.0-rc.0',
32
- '@storybook/channels': '6.5.0-rc.0',
33
- '@storybook/cli': '6.5.0-rc.0',
34
- '@storybook/client-api': '6.5.0-rc.0',
35
- '@storybook/client-logger': '6.5.0-rc.0',
36
- '@storybook/codemod': '6.5.0-rc.0',
37
- '@storybook/components': '6.5.0-rc.0',
38
- '@storybook/core': '6.5.0-rc.0',
39
- '@storybook/core-client': '6.5.0-rc.0',
40
- '@storybook/core-common': '6.5.0-rc.0',
41
- '@storybook/core-events': '6.5.0-rc.0',
42
- '@storybook/core-server': '6.5.0-rc.0',
43
- '@storybook/csf-tools': '6.5.0-rc.0',
44
- '@storybook/docs-tools': '6.5.0-rc.0',
45
- '@storybook/ember': '6.5.0-rc.0',
46
- '@storybook/html': '6.5.0-rc.0',
47
- '@storybook/instrumenter': '6.5.0-rc.0',
48
- '@storybook/manager-webpack4': '6.5.0-rc.0',
49
- '@storybook/manager-webpack5': '6.5.0-rc.0',
50
- '@storybook/node-logger': '6.5.0-rc.0',
51
- '@storybook/postinstall': '6.5.0-rc.0',
52
- '@storybook/preact': '6.5.0-rc.0',
53
- '@storybook/preview-web': '6.5.0-rc.0',
54
- '@storybook/react': '6.5.0-rc.0',
55
- '@storybook/router': '6.5.0-rc.0',
56
- '@storybook/server': '6.5.0-rc.0',
57
- '@storybook/source-loader': '6.5.0-rc.0',
58
- '@storybook/store': '6.5.0-rc.0',
59
- '@storybook/svelte': '6.5.0-rc.0',
60
- '@storybook/telemetry': '6.5.0-rc.0',
61
- '@storybook/theming': '6.5.0-rc.0',
62
- '@storybook/ui': '6.5.0-rc.0',
63
- '@storybook/vue': '6.5.0-rc.0',
64
- '@storybook/vue3': '6.5.0-rc.0',
65
- '@storybook/web-components': '6.5.0-rc.0'
9
+ '@storybook/addon-a11y': '6.5.0-rc.1',
10
+ '@storybook/addon-actions': '6.5.0-rc.1',
11
+ '@storybook/addon-backgrounds': '6.5.0-rc.1',
12
+ '@storybook/addon-controls': '6.5.0-rc.1',
13
+ '@storybook/addon-docs': '6.5.0-rc.1',
14
+ '@storybook/addon-essentials': '6.5.0-rc.1',
15
+ '@storybook/addon-interactions': '6.5.0-rc.1',
16
+ '@storybook/addon-jest': '6.5.0-rc.1',
17
+ '@storybook/addon-links': '6.5.0-rc.1',
18
+ '@storybook/addon-measure': '6.5.0-rc.1',
19
+ '@storybook/addon-outline': '6.5.0-rc.1',
20
+ '@storybook/addon-storyshots': '6.5.0-rc.1',
21
+ '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.1',
22
+ '@storybook/addon-storysource': '6.5.0-rc.1',
23
+ '@storybook/addon-toolbars': '6.5.0-rc.1',
24
+ '@storybook/addon-viewport': '6.5.0-rc.1',
25
+ '@storybook/addons': '6.5.0-rc.1',
26
+ '@storybook/angular': '6.5.0-rc.1',
27
+ '@storybook/api': '6.5.0-rc.1',
28
+ '@storybook/builder-webpack4': '6.5.0-rc.1',
29
+ '@storybook/builder-webpack5': '6.5.0-rc.1',
30
+ '@storybook/channel-postmessage': '6.5.0-rc.1',
31
+ '@storybook/channel-websocket': '6.5.0-rc.1',
32
+ '@storybook/channels': '6.5.0-rc.1',
33
+ '@storybook/cli': '6.5.0-rc.1',
34
+ '@storybook/client-api': '6.5.0-rc.1',
35
+ '@storybook/client-logger': '6.5.0-rc.1',
36
+ '@storybook/codemod': '6.5.0-rc.1',
37
+ '@storybook/components': '6.5.0-rc.1',
38
+ '@storybook/core': '6.5.0-rc.1',
39
+ '@storybook/core-client': '6.5.0-rc.1',
40
+ '@storybook/core-common': '6.5.0-rc.1',
41
+ '@storybook/core-events': '6.5.0-rc.1',
42
+ '@storybook/core-server': '6.5.0-rc.1',
43
+ '@storybook/csf-tools': '6.5.0-rc.1',
44
+ '@storybook/docs-tools': '6.5.0-rc.1',
45
+ '@storybook/ember': '6.5.0-rc.1',
46
+ '@storybook/html': '6.5.0-rc.1',
47
+ '@storybook/instrumenter': '6.5.0-rc.1',
48
+ '@storybook/manager-webpack4': '6.5.0-rc.1',
49
+ '@storybook/manager-webpack5': '6.5.0-rc.1',
50
+ '@storybook/node-logger': '6.5.0-rc.1',
51
+ '@storybook/postinstall': '6.5.0-rc.1',
52
+ '@storybook/preact': '6.5.0-rc.1',
53
+ '@storybook/preview-web': '6.5.0-rc.1',
54
+ '@storybook/react': '6.5.0-rc.1',
55
+ '@storybook/router': '6.5.0-rc.1',
56
+ '@storybook/server': '6.5.0-rc.1',
57
+ '@storybook/source-loader': '6.5.0-rc.1',
58
+ '@storybook/store': '6.5.0-rc.1',
59
+ '@storybook/svelte': '6.5.0-rc.1',
60
+ '@storybook/telemetry': '6.5.0-rc.1',
61
+ '@storybook/theming': '6.5.0-rc.1',
62
+ '@storybook/ui': '6.5.0-rc.1',
63
+ '@storybook/vue': '6.5.0-rc.1',
64
+ '@storybook/vue3': '6.5.0-rc.1',
65
+ '@storybook/web-components': '6.5.0-rc.1'
66
66
  };
67
67
  exports.default = _default;
package/dist/esm/detect-nextjs.js ADDED
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectNextJS = void 0;
7
+ const regex = /[\s"\n]next.*?(\d+).*/;
8
+
9
+ const detectNextJS = packageManager => {
10
+ try {
11
+ let out = '';
12
+
13
+ if (packageManager.type === 'npm') {
14
+ try {
15
+ // npm <= v7
16
+ out = packageManager.executeCommand('npm', ['ls', 'next']);
17
+ } catch (e2) {
18
+ // npm >= v8
19
+ out = packageManager.executeCommand('npm', ['why', 'next']);
20
+ }
21
+ } else {
22
+ out = packageManager.executeCommand('yarn', ['why', 'next']);
23
+ }
24
+
25
+ const [, version] = out.match(regex);
26
+ return version && parseInt(version, 10) ? parseInt(version, 10) : false;
27
+ } catch (err) {//
28
+ }
29
+
30
+ return false;
31
+ };
32
+
33
+ exports.detectNextJS = detectNextJS;
package/dist/esm/detect-webpack.js ADDED
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectWebpack = void 0;
7
+
8
+ const detectWebpack = packageManager => {
9
+ try {
10
+ let out = '';
11
+
12
+ if (packageManager.type === 'npm') {
13
+ try {
14
+ // npm <= v7
15
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
16
+ } catch (e2) {
17
+ // npm >= v8
18
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
19
+ }
20
+ } else {
21
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
22
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
23
+
24
+
25
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
26
+ return 4;
27
+ } // the user has webpack 4 installed, but not 5
28
+
29
+
30
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
31
+ return 5;
32
+ }
33
+ } catch (err) {//
34
+ }
35
+
36
+ return false;
37
+ };
38
+
39
+ exports.detectWebpack = detectWebpack;
package/dist/esm/detect.js CHANGED
@@ -21,6 +21,10 @@ var _helpers = require("./helpers");
21
21
 
22
22
  var _jsPackageManager = require("./js-package-manager");
23
23
 
24
+ var _detectWebpack = require("./detect-webpack");
25
+
26
+ var _detectNextjs = require("./detect-nextjs");
27
+
24
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
29
 
26
30
  const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
@@ -117,31 +121,24 @@ function detectBuilder(packageManager) {
117
121
  return _project_types.CoreBuilder.Vite;
118
122
  }
119
123
 
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')) {
124
+ const nextJSVersion = (0, _detectNextjs.detectNextJS)(packageManager);
125
+
126
+ if (nextJSVersion) {
127
+ if (nextJSVersion >= 11) {
137
128
  return _project_types.CoreBuilder.Webpack5;
138
- } // the user has webpack 4 installed, but not 5
129
+ }
130
+ }
131
+
132
+ const webpackVersion = (0, _detectWebpack.detectWebpack)(packageManager);
139
133
 
134
+ if (webpackVersion) {
135
+ if (webpackVersion <= 4) {
136
+ return _project_types.CoreBuilder.Webpack4;
137
+ }
140
138
 
141
- if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
139
+ if (webpackVersion >= 5) {
142
140
  return _project_types.CoreBuilder.Webpack5;
143
141
  }
144
- } catch (err) {//
145
142
  } // Fallback to webpack4
146
143
 
147
144
 
package/dist/esm/versions.js CHANGED
@@ -6,62 +6,62 @@ 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-rc.0',
10
- '@storybook/addon-actions': '6.5.0-rc.0',
11
- '@storybook/addon-backgrounds': '6.5.0-rc.0',
12
- '@storybook/addon-controls': '6.5.0-rc.0',
13
- '@storybook/addon-docs': '6.5.0-rc.0',
14
- '@storybook/addon-essentials': '6.5.0-rc.0',
15
- '@storybook/addon-interactions': '6.5.0-rc.0',
16
- '@storybook/addon-jest': '6.5.0-rc.0',
17
- '@storybook/addon-links': '6.5.0-rc.0',
18
- '@storybook/addon-measure': '6.5.0-rc.0',
19
- '@storybook/addon-outline': '6.5.0-rc.0',
20
- '@storybook/addon-storyshots': '6.5.0-rc.0',
21
- '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.0',
22
- '@storybook/addon-storysource': '6.5.0-rc.0',
23
- '@storybook/addon-toolbars': '6.5.0-rc.0',
24
- '@storybook/addon-viewport': '6.5.0-rc.0',
25
- '@storybook/addons': '6.5.0-rc.0',
26
- '@storybook/angular': '6.5.0-rc.0',
27
- '@storybook/api': '6.5.0-rc.0',
28
- '@storybook/builder-webpack4': '6.5.0-rc.0',
29
- '@storybook/builder-webpack5': '6.5.0-rc.0',
30
- '@storybook/channel-postmessage': '6.5.0-rc.0',
31
- '@storybook/channel-websocket': '6.5.0-rc.0',
32
- '@storybook/channels': '6.5.0-rc.0',
33
- '@storybook/cli': '6.5.0-rc.0',
34
- '@storybook/client-api': '6.5.0-rc.0',
35
- '@storybook/client-logger': '6.5.0-rc.0',
36
- '@storybook/codemod': '6.5.0-rc.0',
37
- '@storybook/components': '6.5.0-rc.0',
38
- '@storybook/core': '6.5.0-rc.0',
39
- '@storybook/core-client': '6.5.0-rc.0',
40
- '@storybook/core-common': '6.5.0-rc.0',
41
- '@storybook/core-events': '6.5.0-rc.0',
42
- '@storybook/core-server': '6.5.0-rc.0',
43
- '@storybook/csf-tools': '6.5.0-rc.0',
44
- '@storybook/docs-tools': '6.5.0-rc.0',
45
- '@storybook/ember': '6.5.0-rc.0',
46
- '@storybook/html': '6.5.0-rc.0',
47
- '@storybook/instrumenter': '6.5.0-rc.0',
48
- '@storybook/manager-webpack4': '6.5.0-rc.0',
49
- '@storybook/manager-webpack5': '6.5.0-rc.0',
50
- '@storybook/node-logger': '6.5.0-rc.0',
51
- '@storybook/postinstall': '6.5.0-rc.0',
52
- '@storybook/preact': '6.5.0-rc.0',
53
- '@storybook/preview-web': '6.5.0-rc.0',
54
- '@storybook/react': '6.5.0-rc.0',
55
- '@storybook/router': '6.5.0-rc.0',
56
- '@storybook/server': '6.5.0-rc.0',
57
- '@storybook/source-loader': '6.5.0-rc.0',
58
- '@storybook/store': '6.5.0-rc.0',
59
- '@storybook/svelte': '6.5.0-rc.0',
60
- '@storybook/telemetry': '6.5.0-rc.0',
61
- '@storybook/theming': '6.5.0-rc.0',
62
- '@storybook/ui': '6.5.0-rc.0',
63
- '@storybook/vue': '6.5.0-rc.0',
64
- '@storybook/vue3': '6.5.0-rc.0',
65
- '@storybook/web-components': '6.5.0-rc.0'
9
+ '@storybook/addon-a11y': '6.5.0-rc.1',
10
+ '@storybook/addon-actions': '6.5.0-rc.1',
11
+ '@storybook/addon-backgrounds': '6.5.0-rc.1',
12
+ '@storybook/addon-controls': '6.5.0-rc.1',
13
+ '@storybook/addon-docs': '6.5.0-rc.1',
14
+ '@storybook/addon-essentials': '6.5.0-rc.1',
15
+ '@storybook/addon-interactions': '6.5.0-rc.1',
16
+ '@storybook/addon-jest': '6.5.0-rc.1',
17
+ '@storybook/addon-links': '6.5.0-rc.1',
18
+ '@storybook/addon-measure': '6.5.0-rc.1',
19
+ '@storybook/addon-outline': '6.5.0-rc.1',
20
+ '@storybook/addon-storyshots': '6.5.0-rc.1',
21
+ '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.1',
22
+ '@storybook/addon-storysource': '6.5.0-rc.1',
23
+ '@storybook/addon-toolbars': '6.5.0-rc.1',
24
+ '@storybook/addon-viewport': '6.5.0-rc.1',
25
+ '@storybook/addons': '6.5.0-rc.1',
26
+ '@storybook/angular': '6.5.0-rc.1',
27
+ '@storybook/api': '6.5.0-rc.1',
28
+ '@storybook/builder-webpack4': '6.5.0-rc.1',
29
+ '@storybook/builder-webpack5': '6.5.0-rc.1',
30
+ '@storybook/channel-postmessage': '6.5.0-rc.1',
31
+ '@storybook/channel-websocket': '6.5.0-rc.1',
32
+ '@storybook/channels': '6.5.0-rc.1',
33
+ '@storybook/cli': '6.5.0-rc.1',
34
+ '@storybook/client-api': '6.5.0-rc.1',
35
+ '@storybook/client-logger': '6.5.0-rc.1',
36
+ '@storybook/codemod': '6.5.0-rc.1',
37
+ '@storybook/components': '6.5.0-rc.1',
38
+ '@storybook/core': '6.5.0-rc.1',
39
+ '@storybook/core-client': '6.5.0-rc.1',
40
+ '@storybook/core-common': '6.5.0-rc.1',
41
+ '@storybook/core-events': '6.5.0-rc.1',
42
+ '@storybook/core-server': '6.5.0-rc.1',
43
+ '@storybook/csf-tools': '6.5.0-rc.1',
44
+ '@storybook/docs-tools': '6.5.0-rc.1',
45
+ '@storybook/ember': '6.5.0-rc.1',
46
+ '@storybook/html': '6.5.0-rc.1',
47
+ '@storybook/instrumenter': '6.5.0-rc.1',
48
+ '@storybook/manager-webpack4': '6.5.0-rc.1',
49
+ '@storybook/manager-webpack5': '6.5.0-rc.1',
50
+ '@storybook/node-logger': '6.5.0-rc.1',
51
+ '@storybook/postinstall': '6.5.0-rc.1',
52
+ '@storybook/preact': '6.5.0-rc.1',
53
+ '@storybook/preview-web': '6.5.0-rc.1',
54
+ '@storybook/react': '6.5.0-rc.1',
55
+ '@storybook/router': '6.5.0-rc.1',
56
+ '@storybook/server': '6.5.0-rc.1',
57
+ '@storybook/source-loader': '6.5.0-rc.1',
58
+ '@storybook/store': '6.5.0-rc.1',
59
+ '@storybook/svelte': '6.5.0-rc.1',
60
+ '@storybook/telemetry': '6.5.0-rc.1',
61
+ '@storybook/theming': '6.5.0-rc.1',
62
+ '@storybook/ui': '6.5.0-rc.1',
63
+ '@storybook/vue': '6.5.0-rc.1',
64
+ '@storybook/vue3': '6.5.0-rc.1',
65
+ '@storybook/web-components': '6.5.0-rc.1'
66
66
  };
67
67
  exports.default = _default;
package/dist/modern/detect-nextjs.js ADDED
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectNextJS = void 0;
7
+ const regex = /[\s"\n]next.*?(\d+).*/;
8
+
9
+ const detectNextJS = packageManager => {
10
+ try {
11
+ let out = '';
12
+
13
+ if (packageManager.type === 'npm') {
14
+ try {
15
+ // npm <= v7
16
+ out = packageManager.executeCommand('npm', ['ls', 'next']);
17
+ } catch (e2) {
18
+ // npm >= v8
19
+ out = packageManager.executeCommand('npm', ['why', 'next']);
20
+ }
21
+ } else {
22
+ out = packageManager.executeCommand('yarn', ['why', 'next']);
23
+ }
24
+
25
+ const [, version] = out.match(regex);
26
+ return version && parseInt(version, 10) ? parseInt(version, 10) : false;
27
+ } catch (err) {//
28
+ }
29
+
30
+ return false;
31
+ };
32
+
33
+ exports.detectNextJS = detectNextJS;
package/dist/modern/detect-webpack.js ADDED
@@ -0,0 +1,39 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.detectWebpack = void 0;
7
+
8
+ const detectWebpack = packageManager => {
9
+ try {
10
+ let out = '';
11
+
12
+ if (packageManager.type === 'npm') {
13
+ try {
14
+ // npm <= v7
15
+ out = packageManager.executeCommand('npm', ['ls', 'webpack']);
16
+ } catch (e2) {
17
+ // npm >= v8
18
+ out = packageManager.executeCommand('npm', ['why', 'webpack']);
19
+ }
20
+ } else {
21
+ out = packageManager.executeCommand('yarn', ['why', 'webpack']);
22
+ } // if the user has BOTH webpack 4 and 5 installed already, we'll pick the safest options (4)
23
+
24
+
25
+ if (out.includes('webpack@4') || out.includes('webpack@npm:4')) {
26
+ return 4;
27
+ } // the user has webpack 4 installed, but not 5
28
+
29
+
30
+ if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
31
+ return 5;
32
+ }
33
+ } catch (err) {//
34
+ }
35
+
36
+ return false;
37
+ };
38
+
39
+ exports.detectWebpack = detectWebpack;
package/dist/modern/detect.js CHANGED
@@ -21,6 +21,10 @@ var _helpers = require("./helpers");
21
21
 
22
22
  var _jsPackageManager = require("./js-package-manager");
23
23
 
24
+ var _detectWebpack = require("./detect-webpack");
25
+
26
+ var _detectNextjs = require("./detect-nextjs");
27
+
24
28
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
29
 
26
30
  const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
@@ -117,31 +121,24 @@ function detectBuilder(packageManager) {
117
121
  return _project_types.CoreBuilder.Vite;
118
122
  }
119
123
 
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')) {
124
+ const nextJSVersion = (0, _detectNextjs.detectNextJS)(packageManager);
125
+
126
+ if (nextJSVersion) {
127
+ if (nextJSVersion >= 11) {
137
128
  return _project_types.CoreBuilder.Webpack5;
138
- } // the user has webpack 4 installed, but not 5
129
+ }
130
+ }
131
+
132
+ const webpackVersion = (0, _detectWebpack.detectWebpack)(packageManager);
139
133
 
134
+ if (webpackVersion) {
135
+ if (webpackVersion <= 4) {
136
+ return _project_types.CoreBuilder.Webpack4;
137
+ }
140
138
 
141
- if (out.includes('webpack@5') || out.includes('webpack@npm:5')) {
139
+ if (webpackVersion >= 5) {
142
140
  return _project_types.CoreBuilder.Webpack5;
143
141
  }
144
- } catch (err) {//
145
142
  } // Fallback to webpack4
146
143
 
147
144
 
package/dist/modern/versions.js CHANGED
@@ -6,62 +6,62 @@ 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-rc.0',
10
- '@storybook/addon-actions': '6.5.0-rc.0',
11
- '@storybook/addon-backgrounds': '6.5.0-rc.0',
12
- '@storybook/addon-controls': '6.5.0-rc.0',
13
- '@storybook/addon-docs': '6.5.0-rc.0',
14
- '@storybook/addon-essentials': '6.5.0-rc.0',
15
- '@storybook/addon-interactions': '6.5.0-rc.0',
16
- '@storybook/addon-jest': '6.5.0-rc.0',
17
- '@storybook/addon-links': '6.5.0-rc.0',
18
- '@storybook/addon-measure': '6.5.0-rc.0',
19
- '@storybook/addon-outline': '6.5.0-rc.0',
20
- '@storybook/addon-storyshots': '6.5.0-rc.0',
21
- '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.0',
22
- '@storybook/addon-storysource': '6.5.0-rc.0',
23
- '@storybook/addon-toolbars': '6.5.0-rc.0',
24
- '@storybook/addon-viewport': '6.5.0-rc.0',
25
- '@storybook/addons': '6.5.0-rc.0',
26
- '@storybook/angular': '6.5.0-rc.0',
27
- '@storybook/api': '6.5.0-rc.0',
28
- '@storybook/builder-webpack4': '6.5.0-rc.0',
29
- '@storybook/builder-webpack5': '6.5.0-rc.0',
30
- '@storybook/channel-postmessage': '6.5.0-rc.0',
31
- '@storybook/channel-websocket': '6.5.0-rc.0',
32
- '@storybook/channels': '6.5.0-rc.0',
33
- '@storybook/cli': '6.5.0-rc.0',
34
- '@storybook/client-api': '6.5.0-rc.0',
35
- '@storybook/client-logger': '6.5.0-rc.0',
36
- '@storybook/codemod': '6.5.0-rc.0',
37
- '@storybook/components': '6.5.0-rc.0',
38
- '@storybook/core': '6.5.0-rc.0',
39
- '@storybook/core-client': '6.5.0-rc.0',
40
- '@storybook/core-common': '6.5.0-rc.0',
41
- '@storybook/core-events': '6.5.0-rc.0',
42
- '@storybook/core-server': '6.5.0-rc.0',
43
- '@storybook/csf-tools': '6.5.0-rc.0',
44
- '@storybook/docs-tools': '6.5.0-rc.0',
45
- '@storybook/ember': '6.5.0-rc.0',
46
- '@storybook/html': '6.5.0-rc.0',
47
- '@storybook/instrumenter': '6.5.0-rc.0',
48
- '@storybook/manager-webpack4': '6.5.0-rc.0',
49
- '@storybook/manager-webpack5': '6.5.0-rc.0',
50
- '@storybook/node-logger': '6.5.0-rc.0',
51
- '@storybook/postinstall': '6.5.0-rc.0',
52
- '@storybook/preact': '6.5.0-rc.0',
53
- '@storybook/preview-web': '6.5.0-rc.0',
54
- '@storybook/react': '6.5.0-rc.0',
55
- '@storybook/router': '6.5.0-rc.0',
56
- '@storybook/server': '6.5.0-rc.0',
57
- '@storybook/source-loader': '6.5.0-rc.0',
58
- '@storybook/store': '6.5.0-rc.0',
59
- '@storybook/svelte': '6.5.0-rc.0',
60
- '@storybook/telemetry': '6.5.0-rc.0',
61
- '@storybook/theming': '6.5.0-rc.0',
62
- '@storybook/ui': '6.5.0-rc.0',
63
- '@storybook/vue': '6.5.0-rc.0',
64
- '@storybook/vue3': '6.5.0-rc.0',
65
- '@storybook/web-components': '6.5.0-rc.0'
9
+ '@storybook/addon-a11y': '6.5.0-rc.1',
10
+ '@storybook/addon-actions': '6.5.0-rc.1',
11
+ '@storybook/addon-backgrounds': '6.5.0-rc.1',
12
+ '@storybook/addon-controls': '6.5.0-rc.1',
13
+ '@storybook/addon-docs': '6.5.0-rc.1',
14
+ '@storybook/addon-essentials': '6.5.0-rc.1',
15
+ '@storybook/addon-interactions': '6.5.0-rc.1',
16
+ '@storybook/addon-jest': '6.5.0-rc.1',
17
+ '@storybook/addon-links': '6.5.0-rc.1',
18
+ '@storybook/addon-measure': '6.5.0-rc.1',
19
+ '@storybook/addon-outline': '6.5.0-rc.1',
20
+ '@storybook/addon-storyshots': '6.5.0-rc.1',
21
+ '@storybook/addon-storyshots-puppeteer': '6.5.0-rc.1',
22
+ '@storybook/addon-storysource': '6.5.0-rc.1',
23
+ '@storybook/addon-toolbars': '6.5.0-rc.1',
24
+ '@storybook/addon-viewport': '6.5.0-rc.1',
25
+ '@storybook/addons': '6.5.0-rc.1',
26
+ '@storybook/angular': '6.5.0-rc.1',
27
+ '@storybook/api': '6.5.0-rc.1',
28
+ '@storybook/builder-webpack4': '6.5.0-rc.1',
29
+ '@storybook/builder-webpack5': '6.5.0-rc.1',
30
+ '@storybook/channel-postmessage': '6.5.0-rc.1',
31
+ '@storybook/channel-websocket': '6.5.0-rc.1',
32
+ '@storybook/channels': '6.5.0-rc.1',
33
+ '@storybook/cli': '6.5.0-rc.1',
34
+ '@storybook/client-api': '6.5.0-rc.1',
35
+ '@storybook/client-logger': '6.5.0-rc.1',
36
+ '@storybook/codemod': '6.5.0-rc.1',
37
+ '@storybook/components': '6.5.0-rc.1',
38
+ '@storybook/core': '6.5.0-rc.1',
39
+ '@storybook/core-client': '6.5.0-rc.1',
40
+ '@storybook/core-common': '6.5.0-rc.1',
41
+ '@storybook/core-events': '6.5.0-rc.1',
42
+ '@storybook/core-server': '6.5.0-rc.1',
43
+ '@storybook/csf-tools': '6.5.0-rc.1',
44
+ '@storybook/docs-tools': '6.5.0-rc.1',
45
+ '@storybook/ember': '6.5.0-rc.1',
46
+ '@storybook/html': '6.5.0-rc.1',
47
+ '@storybook/instrumenter': '6.5.0-rc.1',
48
+ '@storybook/manager-webpack4': '6.5.0-rc.1',
49
+ '@storybook/manager-webpack5': '6.5.0-rc.1',
50
+ '@storybook/node-logger': '6.5.0-rc.1',
51
+ '@storybook/postinstall': '6.5.0-rc.1',
52
+ '@storybook/preact': '6.5.0-rc.1',
53
+ '@storybook/preview-web': '6.5.0-rc.1',
54
+ '@storybook/react': '6.5.0-rc.1',
55
+ '@storybook/router': '6.5.0-rc.1',
56
+ '@storybook/server': '6.5.0-rc.1',
57
+ '@storybook/source-loader': '6.5.0-rc.1',
58
+ '@storybook/store': '6.5.0-rc.1',
59
+ '@storybook/svelte': '6.5.0-rc.1',
60
+ '@storybook/telemetry': '6.5.0-rc.1',
61
+ '@storybook/theming': '6.5.0-rc.1',
62
+ '@storybook/ui': '6.5.0-rc.1',
63
+ '@storybook/vue': '6.5.0-rc.1',
64
+ '@storybook/vue3': '6.5.0-rc.1',
65
+ '@storybook/web-components': '6.5.0-rc.1'
66
66
  };
67
67
  exports.default = _default;
package/dist/ts3.4/detect-nextjs.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { JsPackageManager } from './js-package-manager';
2
+ export declare const detectNextJS: (packageManager: Pick<JsPackageManager, 'type' | 'executeCommand'>) => number | false;
package/dist/ts3.4/detect-webpack.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { JsPackageManager } from './js-package-manager';
2
+ export declare const detectWebpack: (packageManager: JsPackageManager) => number | false;
package/dist/ts3.9/detect-nextjs.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { JsPackageManager } from './js-package-manager';
2
+ export declare const detectNextJS: (packageManager: Pick<JsPackageManager, 'type' | 'executeCommand'>) => number | false;
package/dist/ts3.9/detect-webpack.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import type { JsPackageManager } from './js-package-manager';
2
+ export declare const detectWebpack: (packageManager: JsPackageManager) => number | false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "6.5.0-rc.0",
3
+ "version": "6.5.0-rc.1",
4
4
  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
5
5
  "keywords": [
6
6
  "cli",
@@ -47,12 +47,12 @@
47
47
  "dependencies": {
48
48
  "@babel/core": "^7.12.10",
49
49
  "@babel/preset-env": "^7.12.11",
50
- "@storybook/codemod": "6.5.0-rc.0",
51
- "@storybook/core-common": "6.5.0-rc.0",
52
- "@storybook/csf-tools": "6.5.0-rc.0",
53
- "@storybook/node-logger": "6.5.0-rc.0",
50
+ "@storybook/codemod": "6.5.0-rc.1",
51
+ "@storybook/core-common": "6.5.0-rc.1",
52
+ "@storybook/csf-tools": "6.5.0-rc.1",
53
+ "@storybook/node-logger": "6.5.0-rc.1",
54
54
  "@storybook/semver": "^7.3.2",
55
- "@storybook/telemetry": "6.5.0-rc.0",
55
+ "@storybook/telemetry": "6.5.0-rc.1",
56
56
  "boxen": "^5.1.2",
57
57
  "chalk": "^4.1.0",
58
58
  "commander": "^6.2.1",
@@ -76,7 +76,7 @@
76
76
  "update-notifier": "^5.0.1"
77
77
  },
78
78
  "devDependencies": {
79
- "@storybook/client-api": "6.5.0-rc.0",
79
+ "@storybook/client-api": "6.5.0-rc.1",
80
80
  "@types/cross-spawn": "^6.0.2",
81
81
  "@types/prompts": "^2.0.9",
82
82
  "@types/puppeteer-core": "^2.1.0",
@@ -89,5 +89,5 @@
89
89
  "publishConfig": {
90
90
  "access": "public"
91
91
  },
92
- "gitHead": "c27fd9eebc4c6db5c50f28c36b204d76c2f9e123"
92
+ "gitHead": "3f09d4e6b0c655a092dc812488ef2c7ed3808401"
93
93
  }