@storybook/cli 7.0.0-alpha.26 → 7.0.0-alpha.29

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/automigrate/fixes/eslint-plugin.js +1 -2
  2. package/dist/cjs/automigrate/fixes/mainjsFramework.js +2 -1
  3. package/dist/cjs/automigrate/fixes/new-frameworks.js +3 -3
  4. package/dist/cjs/generators/baseGenerator.js +3 -3
  5. package/dist/cjs/helpers.js +13 -15
  6. package/dist/cjs/repro-templates.js +15 -10
  7. package/dist/cjs/versions.js +79 -79
  8. package/dist/esm/automigrate/fixes/eslint-plugin.js +1 -2
  9. package/dist/esm/automigrate/fixes/mainjsFramework.js +2 -1
  10. package/dist/esm/automigrate/fixes/new-frameworks.js +3 -3
  11. package/dist/esm/generators/baseGenerator.js +3 -3
  12. package/dist/esm/helpers.js +13 -14
  13. package/dist/esm/repro-templates.js +15 -10
  14. package/dist/esm/versions.js +79 -79
  15. package/dist/types/helpers.d.ts +1 -1
  16. package/dist/types/repro-templates.d.ts +0 -10
  17. package/package.json +9 -9
package/dist/cjs/automigrate/fixes/eslint-plugin.js CHANGED
@@ -43,10 +43,9 @@ const eslintPlugin = {
43
43
  return null;
44
44
  }
45
45
 
46
- const config = (0, _coreCommon.getStorybookInfo)(packageJson);
47
46
  const {
48
47
  mainConfig
49
- } = config;
48
+ } = (0, _coreCommon.getStorybookInfo)(packageJson);
50
49
 
51
50
  if (!mainConfig) {
52
51
  logger.warn('Unable to find storybook main.js config, skipping');
package/dist/cjs/automigrate/fixes/mainjsFramework.js CHANGED
@@ -26,7 +26,8 @@ const mainjsFramework = {
26
26
  }) {
27
27
  var _semver$coerce;
28
28
 
29
- const packageJson = packageManager.retrievePackageJson();
29
+ const packageJson = packageManager.retrievePackageJson(); // FIXME: use renderer in SB7?
30
+
30
31
  const {
31
32
  mainConfig,
32
33
  framework,
package/dist/cjs/automigrate/fixes/new-frameworks.js CHANGED
@@ -92,13 +92,13 @@ const newFrameworks = {
92
92
  var _semver$coerce;
93
93
 
94
94
  const packageJson = packageManager.retrievePackageJson();
95
- const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies);
96
- const config = (0, _coreCommon.getStorybookInfo)(packageJson);
95
+ const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies); // FIXME: update to use renderer instead of framework
96
+
97
97
  const {
98
98
  mainConfig,
99
99
  version: storybookVersion,
100
100
  framework
101
- } = config;
101
+ } = (0, _coreCommon.getStorybookInfo)(packageJson);
102
102
 
103
103
  if (!mainConfig) {
104
104
  logger.warn('Unable to find storybook main.js config, skipping');
package/dist/cjs/generators/baseGenerator.js CHANGED
@@ -150,7 +150,7 @@ async function baseGenerator(packageManager, npmOptions, {
150
150
  `);
151
151
  }
152
152
 
153
- const packages = ['storybook', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
153
+ const packages = ['storybook', `@storybook/${renderer}`, ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
154
154
  const versionedPackages = await packageManager.getVersionedPackages(packages);
155
155
  await _fsExtra.default.ensureDir('./.storybook');
156
156
  await (0, _configure.configureMain)(Object.assign({
@@ -169,7 +169,7 @@ async function baseGenerator(packageManager, npmOptions, {
169
169
  await (0, _configure.configurePreview)(renderer, options.commonJs);
170
170
 
171
171
  if (addComponents) {
172
- (0, _helpers.copyComponents)(renderer, language);
172
+ await (0, _helpers.copyComponents)(renderer, language);
173
173
  } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
174
174
 
175
175
 
@@ -184,7 +184,7 @@ async function baseGenerator(packageManager, npmOptions, {
184
184
  });
185
185
  }
186
186
 
187
- const babelDependencies = addBabel ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
187
+ const babelDependencies = addBabel && builder !== _project_types.CoreBuilder.Vite ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
188
188
  const isNewFolder = !files.some(fname => fname.startsWith('.babel') || fname.startsWith('babel') || fname === 'package.json');
189
189
 
190
190
  if (isNewFolder) {
package/dist/cjs/helpers.js CHANGED
@@ -196,7 +196,7 @@ function copyTemplate(templateRoot) {
196
196
  });
197
197
  }
198
198
 
199
- async function copyComponents(framework, language) {
199
+ async function copyComponents(renderer, language) {
200
200
  const languageFolderMapping = {
201
201
  javascript: 'js',
202
202
  typescript: 'ts'
@@ -204,27 +204,25 @@ async function copyComponents(framework, language) {
204
204
 
205
205
  const componentsPath = async () => {
206
206
  const baseDir = (0, _dirs.getBaseDir)();
207
- const frameworkPath = (0, _path.join)(baseDir, 'frameworks', framework);
207
+ const assetsRoot = (0, _path.join)(baseDir, 'rendererAssets');
208
+ const assetsRenderer = (0, _path.join)(assetsRoot, renderer);
209
+ const assetsLanguage = (0, _path.join)(assetsRenderer, languageFolderMapping[language]);
208
210
 
209
- const languageSpecific = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
210
-
211
- if (await _fsExtra.default.pathExists(languageSpecific)) {
212
- return languageSpecific;
211
+ if (await _fsExtra.default.pathExists(assetsLanguage)) {
212
+ return assetsLanguage;
213
213
  }
214
214
 
215
- const jsFallback = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
215
+ const assetsJS = (0, _path.join)(assetsRenderer, languageFolderMapping.javascript);
216
216
 
217
- if (await _fsExtra.default.pathExists(jsFallback)) {
218
- return jsFallback;
217
+ if (await _fsExtra.default.pathExists(assetsJS)) {
218
+ return assetsJS;
219
219
  }
220
220
 
221
- const frameworkRootPath = _path.default.resolve(__dirname, frameworkPath);
222
-
223
- if (await _fsExtra.default.pathExists(frameworkRootPath)) {
224
- return frameworkRootPath;
221
+ if (await _fsExtra.default.pathExists(assetsRenderer)) {
222
+ return assetsRenderer;
225
223
  }
226
224
 
227
- throw new Error(`Unsupported framework: ${framework}`);
225
+ throw new Error(`Unsupported renderer: ${renderer}`);
228
226
  };
229
227
 
230
228
  const targetPath = async () => {
@@ -239,7 +237,7 @@ async function copyComponents(framework, language) {
239
237
  await _fsExtra.default.copy(await componentsPath(), destinationPath, {
240
238
  overwrite: true
241
239
  });
242
- await _fsExtra.default.copy((0, _path.join)((0, _dirs.getBaseDir)(), 'frameworks/common'), destinationPath, {
240
+ await _fsExtra.default.copy((0, _path.join)((0, _dirs.getBaseDir)(), 'rendererAssets/common'), destinationPath, {
243
241
  overwrite: true
244
242
  });
245
243
  } // Given a package.json, finds any official storybook package within it
package/dist/cjs/repro-templates.js CHANGED
@@ -80,17 +80,22 @@ const svelteViteTemplates = {
80
80
  renderer: '@storybook/svelte',
81
81
  builder: '@storybook/builder-vite'
82
82
  }
83
- },
84
- 'svelte-vite/default-ts': {
85
- name: 'Svelte Vite (TS)',
86
- script: 'yarn create vite . --template svelte-ts',
87
- cadence: ['ci', 'daily', 'weekly'],
88
- expected: {
89
- framework: '@storybook/svelte-vite',
90
- renderer: '@storybook/svelte',
91
- builder: '@storybook/builder-vite'
92
- }
93
83
  }
84
+ /*
85
+ * I disabled this, because it was flaky
86
+ * TODO: we should fixd the instability and re-enable it
87
+ */
88
+ // 'svelte-vite/default-ts': {
89
+ // name: 'Svelte Vite (TS)',
90
+ // script: 'yarn create vite . --template svelte-ts',
91
+ // cadence: ['ci', 'daily', 'weekly'],
92
+ // expected: {
93
+ // framework: '@storybook/svelte-vite',
94
+ // renderer: '@storybook/svelte',
95
+ // builder: '@storybook/builder-vite'
96
+ // }
97
+ // }
98
+
94
99
  };
95
100
 
96
101
  var _default = Object.assign({}, craTemplates, reactViteTemplates, vue3ViteTemplates, svelteViteTemplates);
package/dist/cjs/versions.js CHANGED
@@ -6,84 +6,84 @@ 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': '7.0.0-alpha.26',
10
- '@storybook/addon-actions': '7.0.0-alpha.26',
11
- '@storybook/addon-backgrounds': '7.0.0-alpha.26',
12
- '@storybook/addon-controls': '7.0.0-alpha.26',
13
- '@storybook/addon-docs': '7.0.0-alpha.26',
14
- '@storybook/addon-essentials': '7.0.0-alpha.26',
15
- '@storybook/addon-highlight': '7.0.0-alpha.26',
16
- '@storybook/addon-interactions': '7.0.0-alpha.26',
17
- '@storybook/addon-jest': '7.0.0-alpha.26',
18
- '@storybook/addon-links': '7.0.0-alpha.26',
19
- '@storybook/addon-measure': '7.0.0-alpha.26',
20
- '@storybook/addon-outline': '7.0.0-alpha.26',
21
- '@storybook/addon-storyshots': '7.0.0-alpha.26',
22
- '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.26',
23
- '@storybook/addon-storysource': '7.0.0-alpha.26',
24
- '@storybook/addon-toolbars': '7.0.0-alpha.26',
25
- '@storybook/addon-viewport': '7.0.0-alpha.26',
26
- '@storybook/addons': '7.0.0-alpha.26',
27
- '@storybook/angular': '7.0.0-alpha.26',
28
- '@storybook/api': '7.0.0-alpha.26',
29
- '@storybook/blocks': '7.0.0-alpha.26',
30
- '@storybook/builder-manager': '7.0.0-alpha.26',
31
- '@storybook/builder-vite': '7.0.0-alpha.26',
32
- '@storybook/builder-webpack5': '7.0.0-alpha.26',
33
- '@storybook/channel-postmessage': '7.0.0-alpha.26',
34
- '@storybook/channel-websocket': '7.0.0-alpha.26',
35
- '@storybook/channels': '7.0.0-alpha.26',
36
- '@storybook/cli': '7.0.0-alpha.26',
37
- '@storybook/client-api': '7.0.0-alpha.26',
38
- '@storybook/client-logger': '7.0.0-alpha.26',
39
- '@storybook/codemod': '7.0.0-alpha.26',
40
- '@storybook/components': '7.0.0-alpha.26',
41
- '@storybook/core-client': '7.0.0-alpha.26',
42
- '@storybook/core-common': '7.0.0-alpha.26',
43
- '@storybook/core-events': '7.0.0-alpha.26',
44
- '@storybook/core-server': '7.0.0-alpha.26',
45
- '@storybook/core-webpack': '7.0.0-alpha.26',
46
- '@storybook/csf-tools': '7.0.0-alpha.26',
47
- '@storybook/docs-tools': '7.0.0-alpha.26',
48
- '@storybook/ember': '7.0.0-alpha.26',
49
- '@storybook/html': '7.0.0-alpha.26',
50
- '@storybook/html-webpack5': '7.0.0-alpha.26',
51
- '@storybook/instrumenter': '7.0.0-alpha.26',
52
- '@storybook/node-logger': '7.0.0-alpha.26',
53
- '@storybook/postinstall': '7.0.0-alpha.26',
54
- '@storybook/preact': '7.0.0-alpha.26',
55
- '@storybook/preact-webpack5': '7.0.0-alpha.26',
56
- '@storybook/preset-html-webpack': '7.0.0-alpha.26',
57
- '@storybook/preset-preact-webpack': '7.0.0-alpha.26',
58
- '@storybook/preset-react-webpack': '7.0.0-alpha.26',
59
- '@storybook/preset-server-webpack': '7.0.0-alpha.26',
60
- '@storybook/preset-svelte-webpack': '7.0.0-alpha.26',
61
- '@storybook/preset-vue-webpack': '7.0.0-alpha.26',
62
- '@storybook/preset-vue3-webpack': '7.0.0-alpha.26',
63
- '@storybook/preset-web-components-webpack': '7.0.0-alpha.26',
64
- '@storybook/preview-web': '7.0.0-alpha.26',
65
- '@storybook/react': '7.0.0-alpha.26',
66
- '@storybook/react-vite': '7.0.0-alpha.26',
67
- '@storybook/react-webpack5': '7.0.0-alpha.26',
68
- '@storybook/router': '7.0.0-alpha.26',
69
- '@storybook/server': '7.0.0-alpha.26',
70
- '@storybook/server-webpack5': '7.0.0-alpha.26',
71
- '@storybook/source-loader': '7.0.0-alpha.26',
72
- '@storybook/store': '7.0.0-alpha.26',
73
- '@storybook/svelte': '7.0.0-alpha.26',
74
- '@storybook/svelte-vite': '7.0.0-alpha.26',
75
- '@storybook/svelte-webpack5': '7.0.0-alpha.26',
76
- '@storybook/telemetry': '7.0.0-alpha.26',
77
- '@storybook/theming': '7.0.0-alpha.26',
78
- '@storybook/ui': '7.0.0-alpha.26',
79
- '@storybook/vue': '7.0.0-alpha.26',
80
- '@storybook/vue-webpack5': '7.0.0-alpha.26',
81
- '@storybook/vue3': '7.0.0-alpha.26',
82
- '@storybook/vue3-vite': '7.0.0-alpha.26',
83
- '@storybook/vue3-webpack5': '7.0.0-alpha.26',
84
- '@storybook/web-components': '7.0.0-alpha.26',
85
- '@storybook/web-components-webpack5': '7.0.0-alpha.26',
86
- sb: '7.0.0-alpha.26',
87
- storybook: '7.0.0-alpha.26'
9
+ '@storybook/addon-a11y': '7.0.0-alpha.29',
10
+ '@storybook/addon-actions': '7.0.0-alpha.29',
11
+ '@storybook/addon-backgrounds': '7.0.0-alpha.29',
12
+ '@storybook/addon-controls': '7.0.0-alpha.29',
13
+ '@storybook/addon-docs': '7.0.0-alpha.29',
14
+ '@storybook/addon-essentials': '7.0.0-alpha.29',
15
+ '@storybook/addon-highlight': '7.0.0-alpha.29',
16
+ '@storybook/addon-interactions': '7.0.0-alpha.29',
17
+ '@storybook/addon-jest': '7.0.0-alpha.29',
18
+ '@storybook/addon-links': '7.0.0-alpha.29',
19
+ '@storybook/addon-measure': '7.0.0-alpha.29',
20
+ '@storybook/addon-outline': '7.0.0-alpha.29',
21
+ '@storybook/addon-storyshots': '7.0.0-alpha.29',
22
+ '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.29',
23
+ '@storybook/addon-storysource': '7.0.0-alpha.29',
24
+ '@storybook/addon-toolbars': '7.0.0-alpha.29',
25
+ '@storybook/addon-viewport': '7.0.0-alpha.29',
26
+ '@storybook/addons': '7.0.0-alpha.29',
27
+ '@storybook/angular': '7.0.0-alpha.29',
28
+ '@storybook/api': '7.0.0-alpha.29',
29
+ '@storybook/blocks': '7.0.0-alpha.29',
30
+ '@storybook/builder-manager': '7.0.0-alpha.29',
31
+ '@storybook/builder-vite': '7.0.0-alpha.29',
32
+ '@storybook/builder-webpack5': '7.0.0-alpha.29',
33
+ '@storybook/channel-postmessage': '7.0.0-alpha.29',
34
+ '@storybook/channel-websocket': '7.0.0-alpha.29',
35
+ '@storybook/channels': '7.0.0-alpha.29',
36
+ '@storybook/cli': '7.0.0-alpha.29',
37
+ '@storybook/client-api': '7.0.0-alpha.29',
38
+ '@storybook/client-logger': '7.0.0-alpha.29',
39
+ '@storybook/codemod': '7.0.0-alpha.29',
40
+ '@storybook/components': '7.0.0-alpha.29',
41
+ '@storybook/core-client': '7.0.0-alpha.29',
42
+ '@storybook/core-common': '7.0.0-alpha.29',
43
+ '@storybook/core-events': '7.0.0-alpha.29',
44
+ '@storybook/core-server': '7.0.0-alpha.29',
45
+ '@storybook/core-webpack': '7.0.0-alpha.29',
46
+ '@storybook/csf-tools': '7.0.0-alpha.29',
47
+ '@storybook/docs-tools': '7.0.0-alpha.29',
48
+ '@storybook/ember': '7.0.0-alpha.29',
49
+ '@storybook/html': '7.0.0-alpha.29',
50
+ '@storybook/html-webpack5': '7.0.0-alpha.29',
51
+ '@storybook/instrumenter': '7.0.0-alpha.29',
52
+ '@storybook/node-logger': '7.0.0-alpha.29',
53
+ '@storybook/postinstall': '7.0.0-alpha.29',
54
+ '@storybook/preact': '7.0.0-alpha.29',
55
+ '@storybook/preact-webpack5': '7.0.0-alpha.29',
56
+ '@storybook/preset-html-webpack': '7.0.0-alpha.29',
57
+ '@storybook/preset-preact-webpack': '7.0.0-alpha.29',
58
+ '@storybook/preset-react-webpack': '7.0.0-alpha.29',
59
+ '@storybook/preset-server-webpack': '7.0.0-alpha.29',
60
+ '@storybook/preset-svelte-webpack': '7.0.0-alpha.29',
61
+ '@storybook/preset-vue-webpack': '7.0.0-alpha.29',
62
+ '@storybook/preset-vue3-webpack': '7.0.0-alpha.29',
63
+ '@storybook/preset-web-components-webpack': '7.0.0-alpha.29',
64
+ '@storybook/preview-web': '7.0.0-alpha.29',
65
+ '@storybook/react': '7.0.0-alpha.29',
66
+ '@storybook/react-vite': '7.0.0-alpha.29',
67
+ '@storybook/react-webpack5': '7.0.0-alpha.29',
68
+ '@storybook/router': '7.0.0-alpha.29',
69
+ '@storybook/server': '7.0.0-alpha.29',
70
+ '@storybook/server-webpack5': '7.0.0-alpha.29',
71
+ '@storybook/source-loader': '7.0.0-alpha.29',
72
+ '@storybook/store': '7.0.0-alpha.29',
73
+ '@storybook/svelte': '7.0.0-alpha.29',
74
+ '@storybook/svelte-vite': '7.0.0-alpha.29',
75
+ '@storybook/svelte-webpack5': '7.0.0-alpha.29',
76
+ '@storybook/telemetry': '7.0.0-alpha.29',
77
+ '@storybook/theming': '7.0.0-alpha.29',
78
+ '@storybook/ui': '7.0.0-alpha.29',
79
+ '@storybook/vue': '7.0.0-alpha.29',
80
+ '@storybook/vue-webpack5': '7.0.0-alpha.29',
81
+ '@storybook/vue3': '7.0.0-alpha.29',
82
+ '@storybook/vue3-vite': '7.0.0-alpha.29',
83
+ '@storybook/vue3-webpack5': '7.0.0-alpha.29',
84
+ '@storybook/web-components': '7.0.0-alpha.29',
85
+ '@storybook/web-components-webpack5': '7.0.0-alpha.29',
86
+ sb: '7.0.0-alpha.29',
87
+ storybook: '7.0.0-alpha.29'
88
88
  };
89
89
  exports.default = _default;
package/dist/esm/automigrate/fixes/eslint-plugin.js CHANGED
@@ -29,10 +29,9 @@ export const eslintPlugin = {
29
29
  return null;
30
30
  }
31
31
 
32
- const config = getStorybookInfo(packageJson);
33
32
  const {
34
33
  mainConfig
35
- } = config;
34
+ } = getStorybookInfo(packageJson);
36
35
 
37
36
  if (!mainConfig) {
38
37
  logger.warn('Unable to find storybook main.js config, skipping');
package/dist/esm/automigrate/fixes/mainjsFramework.js CHANGED
@@ -10,7 +10,8 @@ export const mainjsFramework = {
10
10
  async check({
11
11
  packageManager
12
12
  }) {
13
- const packageJson = packageManager.retrievePackageJson();
13
+ const packageJson = packageManager.retrievePackageJson(); // FIXME: use renderer in SB7?
14
+
14
15
  const {
15
16
  mainConfig,
16
17
  framework,
package/dist/esm/automigrate/fixes/new-frameworks.js CHANGED
@@ -69,13 +69,13 @@ export const newFrameworks = {
69
69
  packageManager
70
70
  }) {
71
71
  const packageJson = packageManager.retrievePackageJson();
72
- const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies);
73
- const config = getStorybookInfo(packageJson);
72
+ const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies); // FIXME: update to use renderer instead of framework
73
+
74
74
  const {
75
75
  mainConfig,
76
76
  version: storybookVersion,
77
77
  framework
78
- } = config;
78
+ } = getStorybookInfo(packageJson);
79
79
 
80
80
  if (!mainConfig) {
81
81
  logger.warn('Unable to find storybook main.js config, skipping');
package/dist/esm/generators/baseGenerator.js CHANGED
@@ -133,7 +133,7 @@ export async function baseGenerator(packageManager, npmOptions, {
133
133
  `);
134
134
  }
135
135
 
136
- const packages = ['storybook', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has(getPackageDetails(packageToInstall)[0]));
136
+ const packages = ['storybook', `@storybook/${renderer}`, ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has(getPackageDetails(packageToInstall)[0]));
137
137
  const versionedPackages = await packageManager.getVersionedPackages(packages);
138
138
  await fse.ensureDir('./.storybook');
139
139
  await configureMain(Object.assign({
@@ -152,7 +152,7 @@ export async function baseGenerator(packageManager, npmOptions, {
152
152
  await configurePreview(renderer, options.commonJs);
153
153
 
154
154
  if (addComponents) {
155
- copyComponents(renderer, language);
155
+ await copyComponents(renderer, language);
156
156
  } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
157
157
 
158
158
 
@@ -167,7 +167,7 @@ export async function baseGenerator(packageManager, npmOptions, {
167
167
  });
168
168
  }
169
169
 
170
- const babelDependencies = addBabel ? await getBabelDependencies(packageManager, packageJson) : [];
170
+ const babelDependencies = addBabel && builder !== CoreBuilder.Vite ? await getBabelDependencies(packageManager, packageJson) : [];
171
171
  const isNewFolder = !files.some(fname => fname.startsWith('.babel') || fname.startsWith('babel') || fname === 'package.json');
172
172
 
173
173
  if (isNewFolder) {
package/dist/esm/helpers.js CHANGED
@@ -146,7 +146,7 @@ export function copyTemplate(templateRoot) {
146
146
  overwrite: true
147
147
  });
148
148
  }
149
- export async function copyComponents(framework, language) {
149
+ export async function copyComponents(renderer, language) {
150
150
  const languageFolderMapping = {
151
151
  javascript: 'js',
152
152
  typescript: 'ts'
@@ -154,26 +154,25 @@ export async function copyComponents(framework, language) {
154
154
 
155
155
  const componentsPath = async () => {
156
156
  const baseDir = getBaseDir();
157
- const frameworkPath = join(baseDir, 'frameworks', framework);
158
- const languageSpecific = path.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
157
+ const assetsRoot = join(baseDir, 'rendererAssets');
158
+ const assetsRenderer = join(assetsRoot, renderer);
159
+ const assetsLanguage = join(assetsRenderer, languageFolderMapping[language]);
159
160
 
160
- if (await fse.pathExists(languageSpecific)) {
161
- return languageSpecific;
161
+ if (await fse.pathExists(assetsLanguage)) {
162
+ return assetsLanguage;
162
163
  }
163
164
 
164
- const jsFallback = path.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
165
+ const assetsJS = join(assetsRenderer, languageFolderMapping.javascript);
165
166
 
166
- if (await fse.pathExists(jsFallback)) {
167
- return jsFallback;
167
+ if (await fse.pathExists(assetsJS)) {
168
+ return assetsJS;
168
169
  }
169
170
 
170
- const frameworkRootPath = path.resolve(__dirname, frameworkPath);
171
-
172
- if (await fse.pathExists(frameworkRootPath)) {
173
- return frameworkRootPath;
171
+ if (await fse.pathExists(assetsRenderer)) {
172
+ return assetsRenderer;
174
173
  }
175
174
 
176
- throw new Error(`Unsupported framework: ${framework}`);
175
+ throw new Error(`Unsupported renderer: ${renderer}`);
177
176
  };
178
177
 
179
178
  const targetPath = async () => {
@@ -188,7 +187,7 @@ export async function copyComponents(framework, language) {
188
187
  await fse.copy(await componentsPath(), destinationPath, {
189
188
  overwrite: true
190
189
  });
191
- await fse.copy(join(getBaseDir(), 'frameworks/common'), destinationPath, {
190
+ await fse.copy(join(getBaseDir(), 'rendererAssets/common'), destinationPath, {
192
191
  overwrite: true
193
192
  });
194
193
  } // Given a package.json, finds any official storybook package within it
package/dist/esm/repro-templates.js CHANGED
@@ -74,16 +74,21 @@ const svelteViteTemplates = {
74
74
  renderer: '@storybook/svelte',
75
75
  builder: '@storybook/builder-vite'
76
76
  }
77
- },
78
- 'svelte-vite/default-ts': {
79
- name: 'Svelte Vite (TS)',
80
- script: 'yarn create vite . --template svelte-ts',
81
- cadence: ['ci', 'daily', 'weekly'],
82
- expected: {
83
- framework: '@storybook/svelte-vite',
84
- renderer: '@storybook/svelte',
85
- builder: '@storybook/builder-vite'
86
- }
87
77
  }
78
+ /*
79
+ * I disabled this, because it was flaky
80
+ * TODO: we should fixd the instability and re-enable it
81
+ */
82
+ // 'svelte-vite/default-ts': {
83
+ // name: 'Svelte Vite (TS)',
84
+ // script: 'yarn create vite . --template svelte-ts',
85
+ // cadence: ['ci', 'daily', 'weekly'],
86
+ // expected: {
87
+ // framework: '@storybook/svelte-vite',
88
+ // renderer: '@storybook/svelte',
89
+ // builder: '@storybook/builder-vite'
90
+ // }
91
+ // }
92
+
88
93
  };
89
94
  export default Object.assign({}, craTemplates, reactViteTemplates, vue3ViteTemplates, svelteViteTemplates);
package/dist/esm/versions.js CHANGED
@@ -1,82 +1,82 @@
1
1
  // auto generated file, do not edit
2
2
  export default {
3
- '@storybook/addon-a11y': '7.0.0-alpha.26',
4
- '@storybook/addon-actions': '7.0.0-alpha.26',
5
- '@storybook/addon-backgrounds': '7.0.0-alpha.26',
6
- '@storybook/addon-controls': '7.0.0-alpha.26',
7
- '@storybook/addon-docs': '7.0.0-alpha.26',
8
- '@storybook/addon-essentials': '7.0.0-alpha.26',
9
- '@storybook/addon-highlight': '7.0.0-alpha.26',
10
- '@storybook/addon-interactions': '7.0.0-alpha.26',
11
- '@storybook/addon-jest': '7.0.0-alpha.26',
12
- '@storybook/addon-links': '7.0.0-alpha.26',
13
- '@storybook/addon-measure': '7.0.0-alpha.26',
14
- '@storybook/addon-outline': '7.0.0-alpha.26',
15
- '@storybook/addon-storyshots': '7.0.0-alpha.26',
16
- '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.26',
17
- '@storybook/addon-storysource': '7.0.0-alpha.26',
18
- '@storybook/addon-toolbars': '7.0.0-alpha.26',
19
- '@storybook/addon-viewport': '7.0.0-alpha.26',
20
- '@storybook/addons': '7.0.0-alpha.26',
21
- '@storybook/angular': '7.0.0-alpha.26',
22
- '@storybook/api': '7.0.0-alpha.26',
23
- '@storybook/blocks': '7.0.0-alpha.26',
24
- '@storybook/builder-manager': '7.0.0-alpha.26',
25
- '@storybook/builder-vite': '7.0.0-alpha.26',
26
- '@storybook/builder-webpack5': '7.0.0-alpha.26',
27
- '@storybook/channel-postmessage': '7.0.0-alpha.26',
28
- '@storybook/channel-websocket': '7.0.0-alpha.26',
29
- '@storybook/channels': '7.0.0-alpha.26',
30
- '@storybook/cli': '7.0.0-alpha.26',
31
- '@storybook/client-api': '7.0.0-alpha.26',
32
- '@storybook/client-logger': '7.0.0-alpha.26',
33
- '@storybook/codemod': '7.0.0-alpha.26',
34
- '@storybook/components': '7.0.0-alpha.26',
35
- '@storybook/core-client': '7.0.0-alpha.26',
36
- '@storybook/core-common': '7.0.0-alpha.26',
37
- '@storybook/core-events': '7.0.0-alpha.26',
38
- '@storybook/core-server': '7.0.0-alpha.26',
39
- '@storybook/core-webpack': '7.0.0-alpha.26',
40
- '@storybook/csf-tools': '7.0.0-alpha.26',
41
- '@storybook/docs-tools': '7.0.0-alpha.26',
42
- '@storybook/ember': '7.0.0-alpha.26',
43
- '@storybook/html': '7.0.0-alpha.26',
44
- '@storybook/html-webpack5': '7.0.0-alpha.26',
45
- '@storybook/instrumenter': '7.0.0-alpha.26',
46
- '@storybook/node-logger': '7.0.0-alpha.26',
47
- '@storybook/postinstall': '7.0.0-alpha.26',
48
- '@storybook/preact': '7.0.0-alpha.26',
49
- '@storybook/preact-webpack5': '7.0.0-alpha.26',
50
- '@storybook/preset-html-webpack': '7.0.0-alpha.26',
51
- '@storybook/preset-preact-webpack': '7.0.0-alpha.26',
52
- '@storybook/preset-react-webpack': '7.0.0-alpha.26',
53
- '@storybook/preset-server-webpack': '7.0.0-alpha.26',
54
- '@storybook/preset-svelte-webpack': '7.0.0-alpha.26',
55
- '@storybook/preset-vue-webpack': '7.0.0-alpha.26',
56
- '@storybook/preset-vue3-webpack': '7.0.0-alpha.26',
57
- '@storybook/preset-web-components-webpack': '7.0.0-alpha.26',
58
- '@storybook/preview-web': '7.0.0-alpha.26',
59
- '@storybook/react': '7.0.0-alpha.26',
60
- '@storybook/react-vite': '7.0.0-alpha.26',
61
- '@storybook/react-webpack5': '7.0.0-alpha.26',
62
- '@storybook/router': '7.0.0-alpha.26',
63
- '@storybook/server': '7.0.0-alpha.26',
64
- '@storybook/server-webpack5': '7.0.0-alpha.26',
65
- '@storybook/source-loader': '7.0.0-alpha.26',
66
- '@storybook/store': '7.0.0-alpha.26',
67
- '@storybook/svelte': '7.0.0-alpha.26',
68
- '@storybook/svelte-vite': '7.0.0-alpha.26',
69
- '@storybook/svelte-webpack5': '7.0.0-alpha.26',
70
- '@storybook/telemetry': '7.0.0-alpha.26',
71
- '@storybook/theming': '7.0.0-alpha.26',
72
- '@storybook/ui': '7.0.0-alpha.26',
73
- '@storybook/vue': '7.0.0-alpha.26',
74
- '@storybook/vue-webpack5': '7.0.0-alpha.26',
75
- '@storybook/vue3': '7.0.0-alpha.26',
76
- '@storybook/vue3-vite': '7.0.0-alpha.26',
77
- '@storybook/vue3-webpack5': '7.0.0-alpha.26',
78
- '@storybook/web-components': '7.0.0-alpha.26',
79
- '@storybook/web-components-webpack5': '7.0.0-alpha.26',
80
- sb: '7.0.0-alpha.26',
81
- storybook: '7.0.0-alpha.26'
3
+ '@storybook/addon-a11y': '7.0.0-alpha.29',
4
+ '@storybook/addon-actions': '7.0.0-alpha.29',
5
+ '@storybook/addon-backgrounds': '7.0.0-alpha.29',
6
+ '@storybook/addon-controls': '7.0.0-alpha.29',
7
+ '@storybook/addon-docs': '7.0.0-alpha.29',
8
+ '@storybook/addon-essentials': '7.0.0-alpha.29',
9
+ '@storybook/addon-highlight': '7.0.0-alpha.29',
10
+ '@storybook/addon-interactions': '7.0.0-alpha.29',
11
+ '@storybook/addon-jest': '7.0.0-alpha.29',
12
+ '@storybook/addon-links': '7.0.0-alpha.29',
13
+ '@storybook/addon-measure': '7.0.0-alpha.29',
14
+ '@storybook/addon-outline': '7.0.0-alpha.29',
15
+ '@storybook/addon-storyshots': '7.0.0-alpha.29',
16
+ '@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.29',
17
+ '@storybook/addon-storysource': '7.0.0-alpha.29',
18
+ '@storybook/addon-toolbars': '7.0.0-alpha.29',
19
+ '@storybook/addon-viewport': '7.0.0-alpha.29',
20
+ '@storybook/addons': '7.0.0-alpha.29',
21
+ '@storybook/angular': '7.0.0-alpha.29',
22
+ '@storybook/api': '7.0.0-alpha.29',
23
+ '@storybook/blocks': '7.0.0-alpha.29',
24
+ '@storybook/builder-manager': '7.0.0-alpha.29',
25
+ '@storybook/builder-vite': '7.0.0-alpha.29',
26
+ '@storybook/builder-webpack5': '7.0.0-alpha.29',
27
+ '@storybook/channel-postmessage': '7.0.0-alpha.29',
28
+ '@storybook/channel-websocket': '7.0.0-alpha.29',
29
+ '@storybook/channels': '7.0.0-alpha.29',
30
+ '@storybook/cli': '7.0.0-alpha.29',
31
+ '@storybook/client-api': '7.0.0-alpha.29',
32
+ '@storybook/client-logger': '7.0.0-alpha.29',
33
+ '@storybook/codemod': '7.0.0-alpha.29',
34
+ '@storybook/components': '7.0.0-alpha.29',
35
+ '@storybook/core-client': '7.0.0-alpha.29',
36
+ '@storybook/core-common': '7.0.0-alpha.29',
37
+ '@storybook/core-events': '7.0.0-alpha.29',
38
+ '@storybook/core-server': '7.0.0-alpha.29',
39
+ '@storybook/core-webpack': '7.0.0-alpha.29',
40
+ '@storybook/csf-tools': '7.0.0-alpha.29',
41
+ '@storybook/docs-tools': '7.0.0-alpha.29',
42
+ '@storybook/ember': '7.0.0-alpha.29',
43
+ '@storybook/html': '7.0.0-alpha.29',
44
+ '@storybook/html-webpack5': '7.0.0-alpha.29',
45
+ '@storybook/instrumenter': '7.0.0-alpha.29',
46
+ '@storybook/node-logger': '7.0.0-alpha.29',
47
+ '@storybook/postinstall': '7.0.0-alpha.29',
48
+ '@storybook/preact': '7.0.0-alpha.29',
49
+ '@storybook/preact-webpack5': '7.0.0-alpha.29',
50
+ '@storybook/preset-html-webpack': '7.0.0-alpha.29',
51
+ '@storybook/preset-preact-webpack': '7.0.0-alpha.29',
52
+ '@storybook/preset-react-webpack': '7.0.0-alpha.29',
53
+ '@storybook/preset-server-webpack': '7.0.0-alpha.29',
54
+ '@storybook/preset-svelte-webpack': '7.0.0-alpha.29',
55
+ '@storybook/preset-vue-webpack': '7.0.0-alpha.29',
56
+ '@storybook/preset-vue3-webpack': '7.0.0-alpha.29',
57
+ '@storybook/preset-web-components-webpack': '7.0.0-alpha.29',
58
+ '@storybook/preview-web': '7.0.0-alpha.29',
59
+ '@storybook/react': '7.0.0-alpha.29',
60
+ '@storybook/react-vite': '7.0.0-alpha.29',
61
+ '@storybook/react-webpack5': '7.0.0-alpha.29',
62
+ '@storybook/router': '7.0.0-alpha.29',
63
+ '@storybook/server': '7.0.0-alpha.29',
64
+ '@storybook/server-webpack5': '7.0.0-alpha.29',
65
+ '@storybook/source-loader': '7.0.0-alpha.29',
66
+ '@storybook/store': '7.0.0-alpha.29',
67
+ '@storybook/svelte': '7.0.0-alpha.29',
68
+ '@storybook/svelte-vite': '7.0.0-alpha.29',
69
+ '@storybook/svelte-webpack5': '7.0.0-alpha.29',
70
+ '@storybook/telemetry': '7.0.0-alpha.29',
71
+ '@storybook/theming': '7.0.0-alpha.29',
72
+ '@storybook/ui': '7.0.0-alpha.29',
73
+ '@storybook/vue': '7.0.0-alpha.29',
74
+ '@storybook/vue-webpack5': '7.0.0-alpha.29',
75
+ '@storybook/vue3': '7.0.0-alpha.29',
76
+ '@storybook/vue3-vite': '7.0.0-alpha.29',
77
+ '@storybook/vue3-webpack5': '7.0.0-alpha.29',
78
+ '@storybook/web-components': '7.0.0-alpha.29',
79
+ '@storybook/web-components-webpack5': '7.0.0-alpha.29',
80
+ sb: '7.0.0-alpha.29',
81
+ storybook: '7.0.0-alpha.29'
82
82
  };
package/dist/types/helpers.d.ts CHANGED
@@ -22,5 +22,5 @@ export declare function codeLog(codeLines: string[], leftPadAmount?: number): vo
22
22
  export declare function getBabelDependencies(packageManager: JsPackageManager, packageJson: PackageJsonWithDepsAndDevDeps): Promise<string[]>;
23
23
  export declare function addToDevDependenciesIfNotPresent(packageJson: PackageJson, name: string, packageVersion: string): void;
24
24
  export declare function copyTemplate(templateRoot: string): void;
25
- export declare function copyComponents(framework: SupportedRenderers, language: SupportedLanguage): Promise<void>;
25
+ export declare function copyComponents(renderer: SupportedRenderers, language: SupportedLanguage): Promise<void>;
26
26
  export declare function getStorybookVersionSpecifier(packageJson: PackageJsonWithDepsAndDevDeps): string;
package/dist/types/repro-templates.d.ts CHANGED
@@ -9,16 +9,6 @@ declare const _default: {
9
9
  builder: string;
10
10
  };
11
11
  };
12
- readonly 'svelte-vite/default-ts': {
13
- name: string;
14
- script: string;
15
- cadence: string[];
16
- expected: {
17
- framework: string;
18
- renderer: string;
19
- builder: string;
20
- };
21
- };
22
12
  readonly 'vue3-vite/default-js': {
23
13
  name: string;
24
14
  script: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "7.0.0-alpha.26",
3
+ "version": "7.0.0-alpha.29",
4
4
  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
5
5
  "keywords": [
6
6
  "cli",
@@ -41,13 +41,13 @@
41
41
  "dependencies": {
42
42
  "@babel/core": "^7.12.10",
43
43
  "@babel/preset-env": "^7.12.11",
44
- "@storybook/codemod": "7.0.0-alpha.26",
45
- "@storybook/core-common": "7.0.0-alpha.26",
46
- "@storybook/core-server": "7.0.0-alpha.26",
47
- "@storybook/csf-tools": "7.0.0-alpha.26",
48
- "@storybook/node-logger": "7.0.0-alpha.26",
44
+ "@storybook/codemod": "7.0.0-alpha.29",
45
+ "@storybook/core-common": "7.0.0-alpha.29",
46
+ "@storybook/core-server": "7.0.0-alpha.29",
47
+ "@storybook/csf-tools": "7.0.0-alpha.29",
48
+ "@storybook/node-logger": "7.0.0-alpha.29",
49
49
  "@storybook/semver": "^7.3.2",
50
- "@storybook/telemetry": "7.0.0-alpha.26",
50
+ "@storybook/telemetry": "7.0.0-alpha.29",
51
51
  "boxen": "^5.1.2",
52
52
  "chalk": "^4.1.0",
53
53
  "commander": "^6.2.1",
@@ -74,7 +74,7 @@
74
74
  "update-notifier": "^5.0.1"
75
75
  },
76
76
  "devDependencies": {
77
- "@storybook/client-api": "7.0.0-alpha.26",
77
+ "@storybook/client-api": "7.0.0-alpha.29",
78
78
  "@types/cross-spawn": "^6.0.2",
79
79
  "@types/degit": "^2.8.3",
80
80
  "@types/prompts": "^2.0.9",
@@ -89,5 +89,5 @@
89
89
  "publishConfig": {
90
90
  "access": "public"
91
91
  },
92
- "gitHead": "e5c9cfe1d0482132e59734d9cfce57477045914f"
92
+ "gitHead": "87ce9b91ce2c7e35a716d2254768fb1a34e777c7"
93
93
  }