@storybook/cli 7.0.0-alpha.1 → 7.0.0-alpha.10
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.
- package/dist/cjs/automigrate/fixes/index.js +3 -1
- package/dist/cjs/automigrate/fixes/npm7.js +59 -0
- package/dist/cjs/automigrate/index.js +9 -3
- package/dist/cjs/babel-config.js +5 -4
- package/dist/cjs/frameworks/angular/Button.stories.ts +6 -4
- package/dist/cjs/frameworks/angular/Header.stories.ts +2 -2
- package/dist/cjs/frameworks/angular/Page.stories.ts +3 -3
- package/dist/cjs/frameworks/html/ts/Button.stories.ts +3 -3
- package/dist/cjs/frameworks/html/ts/Button.ts +6 -2
- package/dist/cjs/frameworks/html/ts/Header.stories.ts +3 -3
- package/dist/cjs/frameworks/html/ts/Page.stories.ts +2 -2
- package/dist/cjs/frameworks/html/ts/Page.ts +4 -4
- package/dist/cjs/frameworks/react/ts/Button.stories.tsx +2 -2
- package/dist/cjs/frameworks/react/ts/Header.stories.tsx +2 -2
- package/dist/cjs/frameworks/react/ts/Page.stories.tsx +2 -2
- package/dist/cjs/frameworks/web-components/ts/Button.stories.ts +2 -2
- package/dist/cjs/frameworks/web-components/ts/Header.stories.ts +2 -2
- package/dist/cjs/frameworks/web-components/ts/Page.stories.ts +2 -2
- package/dist/cjs/generate.js +1 -1
- package/dist/cjs/generators/ANGULAR/index.js +24 -1
- package/dist/cjs/generators/REACT_SCRIPTS/index.js +4 -4
- package/dist/cjs/generators/SVELTE/index.js +8 -14
- package/dist/cjs/generators/baseGenerator.js +39 -37
- package/dist/cjs/generators/configure.js +16 -18
- package/dist/cjs/generators/types.js +5 -0
- package/dist/cjs/helpers.js +10 -12
- package/dist/cjs/initiate.js +2 -1
- package/dist/cjs/js-package-manager/JsPackageManager.js +2 -2
- package/dist/cjs/js-package-manager/NPMProxy.js +18 -2
- package/dist/cjs/repro-generators/configs.js +22 -24
- package/dist/cjs/repro-generators/scripts.js +23 -13
- package/dist/cjs/versions.js +75 -73
- package/dist/esm/automigrate/fixes/index.js +3 -1
- package/dist/esm/automigrate/fixes/npm7.js +59 -0
- package/dist/esm/automigrate/index.js +9 -3
- package/dist/esm/babel-config.js +5 -4
- package/dist/esm/frameworks/angular/Button.stories.ts +6 -4
- package/dist/esm/frameworks/angular/Header.stories.ts +2 -2
- package/dist/esm/frameworks/angular/Page.stories.ts +3 -3
- package/dist/esm/frameworks/html/ts/Button.stories.ts +3 -3
- package/dist/esm/frameworks/html/ts/Button.ts +6 -2
- package/dist/esm/frameworks/html/ts/Header.stories.ts +3 -3
- package/dist/esm/frameworks/html/ts/Page.stories.ts +2 -2
- package/dist/esm/frameworks/html/ts/Page.ts +4 -4
- package/dist/esm/frameworks/react/ts/Button.stories.tsx +2 -2
- package/dist/esm/frameworks/react/ts/Header.stories.tsx +2 -2
- package/dist/esm/frameworks/react/ts/Page.stories.tsx +2 -2
- package/dist/esm/frameworks/web-components/ts/Button.stories.ts +2 -2
- package/dist/esm/frameworks/web-components/ts/Header.stories.ts +2 -2
- package/dist/esm/frameworks/web-components/ts/Page.stories.ts +2 -2
- package/dist/esm/generate.js +1 -1
- package/dist/esm/generators/ANGULAR/index.js +24 -1
- package/dist/esm/generators/REACT_SCRIPTS/index.js +4 -4
- package/dist/esm/generators/SVELTE/index.js +8 -14
- package/dist/esm/generators/baseGenerator.js +39 -37
- package/dist/esm/generators/configure.js +16 -18
- package/dist/esm/generators/types.js +5 -0
- package/dist/esm/helpers.js +10 -12
- package/dist/esm/initiate.js +2 -1
- package/dist/esm/js-package-manager/JsPackageManager.js +2 -2
- package/dist/esm/js-package-manager/NPMProxy.js +18 -2
- package/dist/esm/repro-generators/configs.js +22 -24
- package/dist/esm/repro-generators/scripts.js +23 -13
- package/dist/esm/versions.js +75 -73
- package/dist/types/automigrate/fixes/npm7.d.ts +9 -0
- package/dist/types/generators/ANGULAR/index.d.ts +1 -1
- package/dist/types/generators/AURELIA/index.d.ts +1 -1
- package/dist/types/generators/EMBER/index.d.ts +1 -1
- package/dist/types/generators/HTML/index.d.ts +1 -1
- package/dist/types/generators/MARIONETTE/index.d.ts +1 -1
- package/dist/types/generators/MARKO/index.d.ts +1 -1
- package/dist/types/generators/MITHRIL/index.d.ts +1 -1
- package/dist/types/generators/PREACT/index.d.ts +1 -1
- package/dist/types/generators/RAX/index.d.ts +1 -1
- package/dist/types/generators/REACT/index.d.ts +1 -1
- package/dist/types/generators/REACT_SCRIPTS/index.d.ts +1 -1
- package/dist/types/generators/RIOT/index.d.ts +1 -1
- package/dist/types/generators/SERVER/index.d.ts +1 -1
- package/dist/types/generators/SFC_VUE/index.d.ts +1 -1
- package/dist/types/generators/SVELTE/index.d.ts +1 -1
- package/dist/types/generators/VUE/index.d.ts +1 -1
- package/dist/types/generators/VUE3/index.d.ts +1 -1
- package/dist/types/generators/WEB-COMPONENTS/index.d.ts +1 -1
- package/dist/types/generators/WEBPACK_REACT/index.d.ts +1 -1
- package/dist/types/generators/baseGenerator.d.ts +3 -20
- package/dist/types/generators/configure.d.ts +2 -1
- package/dist/types/generators/types.d.ts +37 -0
- package/dist/types/helpers.d.ts +1 -1
- package/dist/types/initiate.d.ts +1 -15
- package/dist/types/js-package-manager/NPMProxy.d.ts +4 -0
- package/dist/types/repro-generators/configs.d.ts +1 -4
- package/dist/types/repro-generators/scripts.d.ts +1 -1
- package/dist/types/versions.d.ts +2 -0
- package/package.json +9 -9
|
@@ -3,7 +3,10 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.configureMain = configureMain;
|
|
7
|
+
exports.configurePreview = configurePreview;
|
|
8
|
+
|
|
9
|
+
require("core-js/modules/es.promise.js");
|
|
7
10
|
|
|
8
11
|
var _fsExtra = _interopRequireDefault(require("fs-extra"));
|
|
9
12
|
|
|
@@ -15,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
15
18
|
|
|
16
19
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
17
20
|
|
|
18
|
-
function configureMain(_ref) {
|
|
21
|
+
async function configureMain(_ref) {
|
|
19
22
|
let {
|
|
20
23
|
addons,
|
|
21
24
|
extensions = ['js', 'jsx', 'ts', 'tsx'],
|
|
@@ -23,17 +26,20 @@ function configureMain(_ref) {
|
|
|
23
26
|
} = _ref,
|
|
24
27
|
custom = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
25
28
|
|
|
26
|
-
const prefix = _fsExtra.default.
|
|
29
|
+
const prefix = (await _fsExtra.default.pathExists('./src')) ? '../src' : '../stories';
|
|
27
30
|
const config = Object.assign({
|
|
28
31
|
stories: [`${prefix}/**/*.stories.mdx`, `${prefix}/**/*.stories.@(${extensions.join('|')})`],
|
|
29
32
|
addons
|
|
30
33
|
}, custom); // replace escaped values and delimiters
|
|
31
34
|
|
|
32
|
-
const stringified = `module.exports = ${JSON.stringify(config, null, 2).replace(/\\"/g, '"').replace(/['"]%%/g, '').replace(/%%['"]
|
|
33
|
-
|
|
34
|
-
|
|
35
|
+
const stringified = `module.exports = ${JSON.stringify(config, null, 2).replace(/\\"/g, '"').replace(/['"]%%/g, '').replace(/%%['"]/g, '').replace(/\\n/g, '\r\n')}`; // main.js isn't actually JSON, but we used JSON.stringify to convert the runtime-object into code.
|
|
36
|
+
// un-stringify the value for referencing packages by string
|
|
37
|
+
// .replaceAll(/"(path\.dirname\(require\.resolve\(path\.join\('.*\))"/g, (_, a) => a)}`;
|
|
35
38
|
|
|
36
|
-
_fsExtra.default.
|
|
39
|
+
await _fsExtra.default.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, (0, _tsDedent.default)`
|
|
40
|
+
const path = require('path');
|
|
41
|
+
${stringified}
|
|
42
|
+
`, {
|
|
37
43
|
encoding: 'utf8'
|
|
38
44
|
});
|
|
39
45
|
}
|
|
@@ -50,14 +56,14 @@ const frameworkToPreviewParts = {
|
|
|
50
56
|
}
|
|
51
57
|
};
|
|
52
58
|
|
|
53
|
-
function configurePreview(framework, commonJs) {
|
|
59
|
+
async function configurePreview(framework, commonJs) {
|
|
54
60
|
const {
|
|
55
61
|
prefix = '',
|
|
56
62
|
extraParameters = ''
|
|
57
63
|
} = frameworkToPreviewParts[framework] || {};
|
|
58
64
|
const previewPath = `./.storybook/preview.${commonJs ? 'cjs' : 'js'}`; // If the framework template included a preview then we have nothing to do
|
|
59
65
|
|
|
60
|
-
if (_fsExtra.default.
|
|
66
|
+
if (await _fsExtra.default.pathExists(previewPath)) {
|
|
61
67
|
return;
|
|
62
68
|
}
|
|
63
69
|
|
|
@@ -73,15 +79,7 @@ function configurePreview(framework, commonJs) {
|
|
|
73
79
|
},
|
|
74
80
|
${extraParameters}
|
|
75
81
|
}`.replace(' \n', '').trim();
|
|
76
|
-
|
|
77
|
-
_fsExtra.default.writeFileSync(previewPath, preview, {
|
|
82
|
+
await _fsExtra.default.writeFile(previewPath, preview, {
|
|
78
83
|
encoding: 'utf8'
|
|
79
84
|
});
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
function configure(framework, mainOptions) {
|
|
83
|
-
_fsExtra.default.ensureDirSync('./.storybook');
|
|
84
|
-
|
|
85
|
-
configureMain(mainOptions);
|
|
86
|
-
configurePreview(framework, mainOptions.commonJs);
|
|
87
85
|
}
|
package/dist/cjs/helpers.js
CHANGED
|
@@ -189,51 +189,49 @@ function copyTemplate(templateRoot) {
|
|
|
189
189
|
});
|
|
190
190
|
}
|
|
191
191
|
|
|
192
|
-
function copyComponents(framework, language) {
|
|
192
|
+
async function copyComponents(framework, language) {
|
|
193
193
|
const languageFolderMapping = {
|
|
194
194
|
javascript: 'js',
|
|
195
195
|
typescript: 'ts'
|
|
196
196
|
};
|
|
197
197
|
|
|
198
|
-
const componentsPath = () => {
|
|
198
|
+
const componentsPath = async () => {
|
|
199
199
|
const frameworkPath = `frameworks/${framework}`;
|
|
200
200
|
|
|
201
201
|
const languageSpecific = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
|
|
202
202
|
|
|
203
|
-
if (_fsExtra.default.
|
|
203
|
+
if (await _fsExtra.default.pathExists(languageSpecific)) {
|
|
204
204
|
return languageSpecific;
|
|
205
205
|
}
|
|
206
206
|
|
|
207
207
|
const jsFallback = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
|
|
208
208
|
|
|
209
|
-
if (_fsExtra.default.
|
|
209
|
+
if (await _fsExtra.default.pathExists(jsFallback)) {
|
|
210
210
|
return jsFallback;
|
|
211
211
|
}
|
|
212
212
|
|
|
213
213
|
const frameworkRootPath = _path.default.resolve(__dirname, frameworkPath);
|
|
214
214
|
|
|
215
|
-
if (_fsExtra.default.
|
|
215
|
+
if (await _fsExtra.default.pathExists(frameworkRootPath)) {
|
|
216
216
|
return frameworkRootPath;
|
|
217
217
|
}
|
|
218
218
|
|
|
219
219
|
throw new Error(`Unsupported framework: ${framework}`);
|
|
220
220
|
};
|
|
221
221
|
|
|
222
|
-
const targetPath = () => {
|
|
223
|
-
if (_fsExtra.default.
|
|
222
|
+
const targetPath = async () => {
|
|
223
|
+
if (await _fsExtra.default.pathExists('./src')) {
|
|
224
224
|
return './src/stories';
|
|
225
225
|
}
|
|
226
226
|
|
|
227
227
|
return './stories';
|
|
228
228
|
};
|
|
229
229
|
|
|
230
|
-
const destinationPath = targetPath();
|
|
231
|
-
|
|
232
|
-
_fsExtra.default.copySync(componentsPath(), destinationPath, {
|
|
230
|
+
const destinationPath = await targetPath();
|
|
231
|
+
await _fsExtra.default.copy(await componentsPath(), destinationPath, {
|
|
233
232
|
overwrite: true
|
|
234
233
|
});
|
|
235
|
-
|
|
236
|
-
_fsExtra.default.copySync(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
|
|
234
|
+
await _fsExtra.default.copy(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
|
|
237
235
|
overwrite: true
|
|
238
236
|
});
|
|
239
237
|
}
|
package/dist/cjs/initiate.js
CHANGED
|
@@ -81,7 +81,8 @@ const installStorybook = (projectType, packageManager, options) => {
|
|
|
81
81
|
language,
|
|
82
82
|
builder: options.builder || (0, _detect.detectBuilder)(packageManager),
|
|
83
83
|
linkable: !!options.linkable,
|
|
84
|
-
commonJs: options.commonJs
|
|
84
|
+
commonJs: options.commonJs,
|
|
85
|
+
pnp: options.usePnp
|
|
85
86
|
};
|
|
86
87
|
|
|
87
88
|
const runGenerator = async () => {
|
|
@@ -221,8 +221,8 @@ class JsPackageManager {
|
|
|
221
221
|
var _options$port;
|
|
222
222
|
|
|
223
223
|
const sbPort = (_options$port = options === null || options === void 0 ? void 0 : options.port) !== null && _options$port !== void 0 ? _options$port : 6006;
|
|
224
|
-
const storybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx
|
|
225
|
-
const buildStorybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx
|
|
224
|
+
const storybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook dev -p ${sbPort} -s ${options.staticFolder}` : `npx storybook dev -p ${sbPort}`;
|
|
225
|
+
const buildStorybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook build -s ${options.staticFolder}` : `npx storybook build`;
|
|
226
226
|
const preCommand = options !== null && options !== void 0 && options.preCommand ? this.getRunCommand(options.preCommand) : undefined;
|
|
227
227
|
this.addScripts({
|
|
228
228
|
storybook: [preCommand, storybookCmd].filter(Boolean).join(' && '),
|
|
@@ -30,10 +30,26 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
|
|
|
30
30
|
return `npm run ${command}`;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
getNpmVersion() {
|
|
34
|
+
return this.executeCommand('npm', ['--version']);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
hasLegacyPeerDeps() {
|
|
38
|
+
const result = this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']);
|
|
39
|
+
return result.trim() === 'true';
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
setLegacyPeerDeps() {
|
|
43
|
+
this.executeCommand('npm', ['config', 'set', 'legacy-peer-deps=true', '--location=project']);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
needsLegacyPeerDeps(version) {
|
|
47
|
+
return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
|
|
48
|
+
}
|
|
49
|
+
|
|
33
50
|
getInstallArgs() {
|
|
34
51
|
if (!this.installArgs) {
|
|
35
|
-
|
|
36
|
-
this.installArgs = _semver.default.gte(version, '7.0.0') ? ['install', '--legacy-peer-deps'] : ['install'];
|
|
52
|
+
this.installArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['install', '--legacy-peer-deps'] : ['install'];
|
|
37
53
|
}
|
|
38
54
|
|
|
39
55
|
return this.installArgs;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.
|
|
6
|
+
exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = 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.angular = void 0;
|
|
7
7
|
|
|
8
8
|
/* eslint-disable camelcase */
|
|
9
9
|
const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
|
|
@@ -67,15 +67,14 @@ const react_typescript = {
|
|
|
67
67
|
path: '.babelrc',
|
|
68
68
|
contents: '{ "presets": ["@babel/preset-react", "@babel/preset-typescript"] }'
|
|
69
69
|
}]
|
|
70
|
-
};
|
|
70
|
+
}; // export const vite_react: Parameters = {
|
|
71
|
+
// renderer: 'react',
|
|
72
|
+
// name: 'vite_react',
|
|
73
|
+
// version: 'latest',
|
|
74
|
+
// generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts',
|
|
75
|
+
// };
|
|
76
|
+
|
|
71
77
|
exports.react_typescript = react_typescript;
|
|
72
|
-
const vite_react = {
|
|
73
|
-
renderer: 'react',
|
|
74
|
-
name: 'vite_react',
|
|
75
|
-
version: 'latest',
|
|
76
|
-
generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts'
|
|
77
|
-
};
|
|
78
|
-
exports.vite_react = vite_react;
|
|
79
78
|
const react_in_yarn_workspace = {
|
|
80
79
|
renderer: 'react',
|
|
81
80
|
name: 'react_in_yarn_workspace',
|
|
@@ -89,18 +88,8 @@ const baseAngular = {
|
|
|
89
88
|
renderer: 'angular',
|
|
90
89
|
name: 'angular',
|
|
91
90
|
version: 'latest',
|
|
92
|
-
generator: `npx -p @angular/cli@{{version}} ng new {{appName}} --routing=true --minimal=true --style=scss --
|
|
91
|
+
generator: `npx -p @angular/cli@{{version}} ng new {{appName}} --routing=true --minimal=true --style=scss --skip-install=true --strict`
|
|
93
92
|
};
|
|
94
|
-
const angular10 = Object.assign({}, baseAngular, {
|
|
95
|
-
name: 'angular10',
|
|
96
|
-
version: 'v10-lts'
|
|
97
|
-
});
|
|
98
|
-
exports.angular10 = angular10;
|
|
99
|
-
const angular11 = Object.assign({}, baseAngular, {
|
|
100
|
-
name: 'angular11',
|
|
101
|
-
version: 'v11-lts'
|
|
102
|
-
});
|
|
103
|
-
exports.angular11 = angular11;
|
|
104
93
|
const angular12 = Object.assign({}, baseAngular, {
|
|
105
94
|
name: 'angular12',
|
|
106
95
|
version: 'v12-lts'
|
|
@@ -121,8 +110,7 @@ const angular_modern_inline_rendering = Object.assign({}, baseAngular, {
|
|
|
121
110
|
additionalDeps: ['jest@27', '@storybook/test-runner'],
|
|
122
111
|
mainOverrides: {
|
|
123
112
|
features: {
|
|
124
|
-
storyStoreV7: true
|
|
125
|
-
modernInlineRender: true
|
|
113
|
+
storyStoreV7: true
|
|
126
114
|
}
|
|
127
115
|
}
|
|
128
116
|
});
|
|
@@ -140,14 +128,24 @@ const web_components = {
|
|
|
140
128
|
exports.web_components = web_components;
|
|
141
129
|
const web_components_typescript = Object.assign({}, web_components, {
|
|
142
130
|
name: 'web_components_typescript',
|
|
143
|
-
typescript: true
|
|
131
|
+
typescript: true,
|
|
132
|
+
additionalDeps: ['@babel/preset-typescript'],
|
|
133
|
+
additionalFiles: [{
|
|
134
|
+
path: '.babelrc',
|
|
135
|
+
contents: '{ "presets": ["@babel/preset-typescript"] }'
|
|
136
|
+
}]
|
|
144
137
|
});
|
|
145
138
|
exports.web_components_typescript = web_components_typescript;
|
|
146
139
|
const web_components_lit2 = Object.assign({}, web_components, {
|
|
147
140
|
version: 'next',
|
|
148
141
|
name: 'web_components_lit2',
|
|
149
142
|
generator: fromDeps('lit'),
|
|
150
|
-
typescript: true
|
|
143
|
+
typescript: true,
|
|
144
|
+
additionalDeps: ['@babel/preset-typescript'],
|
|
145
|
+
additionalFiles: [{
|
|
146
|
+
path: '.babelrc',
|
|
147
|
+
contents: '{ "presets": ["@babel/preset-typescript"] }'
|
|
148
|
+
}]
|
|
151
149
|
}); // #endregion
|
|
152
150
|
// #region vue
|
|
153
151
|
|
|
@@ -41,11 +41,12 @@ const exec = async (command, options = {}, {
|
|
|
41
41
|
logger.debug(command);
|
|
42
42
|
return new Promise((resolve, reject) => {
|
|
43
43
|
const defaultOptions = {
|
|
44
|
-
silent:
|
|
44
|
+
silent: false
|
|
45
45
|
};
|
|
46
46
|
|
|
47
47
|
const child = _shelljs.default.exec(command, Object.assign({}, defaultOptions, options, {
|
|
48
|
-
async: true
|
|
48
|
+
async: true,
|
|
49
|
+
silent: false
|
|
49
50
|
}));
|
|
50
51
|
|
|
51
52
|
child.stderr.pipe(process.stderr);
|
|
@@ -170,28 +171,37 @@ const addAdditionalFiles = async ({
|
|
|
170
171
|
additionalFiles,
|
|
171
172
|
cwd
|
|
172
173
|
}) => {
|
|
173
|
-
if (!additionalFiles || additionalFiles.length === 0) {
|
|
174
|
-
return;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
174
|
logger.info(`⤵️ Adding required files`);
|
|
178
|
-
additionalFiles.
|
|
175
|
+
await Promise.all(additionalFiles.map(async file => {
|
|
179
176
|
await (0, _fsExtra.outputFile)(_path.default.resolve(cwd, file.path), file.contents, {
|
|
180
177
|
encoding: 'UTF-8'
|
|
181
178
|
});
|
|
182
|
-
});
|
|
179
|
+
}));
|
|
183
180
|
};
|
|
184
181
|
|
|
185
182
|
const initStorybook = async ({
|
|
186
183
|
cwd,
|
|
187
184
|
autoDetect = true,
|
|
188
185
|
name,
|
|
189
|
-
e2e
|
|
186
|
+
e2e,
|
|
187
|
+
pnp
|
|
190
188
|
}) => {
|
|
191
|
-
const
|
|
192
|
-
|
|
189
|
+
const flags = ['--yes'];
|
|
190
|
+
|
|
191
|
+
if (!autoDetect) {
|
|
192
|
+
flags.push(`--type ${name}`);
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
if (e2e) {
|
|
196
|
+
flags.push('--linkable');
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
if (pnp) {
|
|
200
|
+
flags.push('--use-pnp');
|
|
201
|
+
}
|
|
202
|
+
|
|
193
203
|
const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
|
|
194
|
-
const command = `${sbCLICommand} init
|
|
204
|
+
const command = `${sbCLICommand} init ${flags.join(' ')}`;
|
|
195
205
|
await exec(command, {
|
|
196
206
|
cwd
|
|
197
207
|
}, {
|
|
@@ -283,7 +293,7 @@ const createAndInit = async (cwd, _ref, {
|
|
|
283
293
|
}));
|
|
284
294
|
await doTask(addAdditionalFiles, Object.assign({}, options, {
|
|
285
295
|
cwd
|
|
286
|
-
}));
|
|
296
|
+
}), !!options.additionalFiles);
|
|
287
297
|
|
|
288
298
|
if (e2e) {
|
|
289
299
|
await doTask(addPackageResolutions, options);
|
package/dist/cjs/versions.js
CHANGED
|
@@ -6,78 +6,80 @@ 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.
|
|
10
|
-
'@storybook/addon-actions': '7.0.0-alpha.
|
|
11
|
-
'@storybook/addon-backgrounds': '7.0.0-alpha.
|
|
12
|
-
'@storybook/addon-controls': '7.0.0-alpha.
|
|
13
|
-
'@storybook/addon-docs': '7.0.0-alpha.
|
|
14
|
-
'@storybook/addon-essentials': '7.0.0-alpha.
|
|
15
|
-
'@storybook/addon-
|
|
16
|
-
'@storybook/addon-
|
|
17
|
-
'@storybook/addon-
|
|
18
|
-
'@storybook/addon-
|
|
19
|
-
'@storybook/addon-
|
|
20
|
-
'@storybook/addon-
|
|
21
|
-
'@storybook/addon-storyshots
|
|
22
|
-
'@storybook/addon-
|
|
23
|
-
'@storybook/addon-
|
|
24
|
-
'@storybook/addon-
|
|
25
|
-
'@storybook/
|
|
26
|
-
'@storybook/
|
|
27
|
-
'@storybook/
|
|
28
|
-
'@storybook/
|
|
29
|
-
'@storybook/
|
|
30
|
-
'@storybook/
|
|
31
|
-
'@storybook/
|
|
32
|
-
'@storybook/
|
|
33
|
-
'@storybook/
|
|
34
|
-
'@storybook/
|
|
35
|
-
'@storybook/
|
|
36
|
-
'@storybook/
|
|
37
|
-
'@storybook/
|
|
38
|
-
'@storybook/
|
|
39
|
-
'@storybook/core-
|
|
40
|
-
'@storybook/core-
|
|
41
|
-
'@storybook/core-
|
|
42
|
-
'@storybook/
|
|
43
|
-
'@storybook/
|
|
44
|
-
'@storybook/
|
|
45
|
-
'@storybook/
|
|
46
|
-
'@storybook/
|
|
47
|
-
'@storybook/
|
|
48
|
-
'@storybook/
|
|
49
|
-
'@storybook/
|
|
50
|
-
'@storybook/
|
|
51
|
-
'@storybook/
|
|
52
|
-
'@storybook/
|
|
53
|
-
'@storybook/
|
|
54
|
-
'@storybook/
|
|
55
|
-
'@storybook/preset-
|
|
56
|
-
'@storybook/preset-
|
|
57
|
-
'@storybook/preset-
|
|
58
|
-
'@storybook/preset-
|
|
59
|
-
'@storybook/preset-
|
|
60
|
-
'@storybook/preset-
|
|
61
|
-
'@storybook/
|
|
62
|
-
'@storybook/
|
|
63
|
-
'@storybook/
|
|
64
|
-
'@storybook/
|
|
65
|
-
'@storybook/
|
|
66
|
-
'@storybook/
|
|
67
|
-
'@storybook/
|
|
68
|
-
'@storybook/
|
|
69
|
-
'@storybook/
|
|
70
|
-
'@storybook/
|
|
71
|
-
'@storybook/
|
|
72
|
-
'@storybook/
|
|
73
|
-
'@storybook/
|
|
74
|
-
'@storybook/
|
|
75
|
-
'@storybook/
|
|
76
|
-
'@storybook/
|
|
77
|
-
'@storybook/
|
|
78
|
-
'@storybook/
|
|
79
|
-
'@storybook/
|
|
80
|
-
|
|
81
|
-
storybook: '7.0.0-alpha.
|
|
9
|
+
'@storybook/addon-a11y': '7.0.0-alpha.10',
|
|
10
|
+
'@storybook/addon-actions': '7.0.0-alpha.10',
|
|
11
|
+
'@storybook/addon-backgrounds': '7.0.0-alpha.10',
|
|
12
|
+
'@storybook/addon-controls': '7.0.0-alpha.10',
|
|
13
|
+
'@storybook/addon-docs': '7.0.0-alpha.10',
|
|
14
|
+
'@storybook/addon-essentials': '7.0.0-alpha.10',
|
|
15
|
+
'@storybook/addon-highlight': '7.0.0-alpha.10',
|
|
16
|
+
'@storybook/addon-interactions': '7.0.0-alpha.10',
|
|
17
|
+
'@storybook/addon-jest': '7.0.0-alpha.10',
|
|
18
|
+
'@storybook/addon-links': '7.0.0-alpha.10',
|
|
19
|
+
'@storybook/addon-measure': '7.0.0-alpha.10',
|
|
20
|
+
'@storybook/addon-outline': '7.0.0-alpha.10',
|
|
21
|
+
'@storybook/addon-storyshots': '7.0.0-alpha.10',
|
|
22
|
+
'@storybook/addon-storyshots-puppeteer': '7.0.0-alpha.10',
|
|
23
|
+
'@storybook/addon-storysource': '7.0.0-alpha.10',
|
|
24
|
+
'@storybook/addon-toolbars': '7.0.0-alpha.10',
|
|
25
|
+
'@storybook/addon-viewport': '7.0.0-alpha.10',
|
|
26
|
+
'@storybook/addons': '7.0.0-alpha.10',
|
|
27
|
+
'@storybook/angular': '7.0.0-alpha.10',
|
|
28
|
+
'@storybook/api': '7.0.0-alpha.10',
|
|
29
|
+
'@storybook/blocks': '7.0.0-alpha.10',
|
|
30
|
+
'@storybook/builder-webpack5': '7.0.0-alpha.10',
|
|
31
|
+
'@storybook/channel-postmessage': '7.0.0-alpha.10',
|
|
32
|
+
'@storybook/channel-websocket': '7.0.0-alpha.10',
|
|
33
|
+
'@storybook/channels': '7.0.0-alpha.10',
|
|
34
|
+
'@storybook/cli': '7.0.0-alpha.10',
|
|
35
|
+
'@storybook/client-api': '7.0.0-alpha.10',
|
|
36
|
+
'@storybook/client-logger': '7.0.0-alpha.10',
|
|
37
|
+
'@storybook/codemod': '7.0.0-alpha.10',
|
|
38
|
+
'@storybook/components': '7.0.0-alpha.10',
|
|
39
|
+
'@storybook/core-client': '7.0.0-alpha.10',
|
|
40
|
+
'@storybook/core-common': '7.0.0-alpha.10',
|
|
41
|
+
'@storybook/core-events': '7.0.0-alpha.10',
|
|
42
|
+
'@storybook/core-server': '7.0.0-alpha.10',
|
|
43
|
+
'@storybook/core-webpack': '7.0.0-alpha.10',
|
|
44
|
+
'@storybook/csf-tools': '7.0.0-alpha.10',
|
|
45
|
+
'@storybook/docs-tools': '7.0.0-alpha.10',
|
|
46
|
+
'@storybook/ember': '7.0.0-alpha.10',
|
|
47
|
+
'@storybook/html': '7.0.0-alpha.10',
|
|
48
|
+
'@storybook/html-webpack5': '7.0.0-alpha.10',
|
|
49
|
+
'@storybook/instrumenter': '7.0.0-alpha.10',
|
|
50
|
+
'@storybook/manager-webpack5': '7.0.0-alpha.10',
|
|
51
|
+
'@storybook/node-logger': '7.0.0-alpha.10',
|
|
52
|
+
'@storybook/postinstall': '7.0.0-alpha.10',
|
|
53
|
+
'@storybook/preact': '7.0.0-alpha.10',
|
|
54
|
+
'@storybook/preact-webpack5': '7.0.0-alpha.10',
|
|
55
|
+
'@storybook/preset-html-webpack': '7.0.0-alpha.10',
|
|
56
|
+
'@storybook/preset-preact-webpack': '7.0.0-alpha.10',
|
|
57
|
+
'@storybook/preset-react-webpack': '7.0.0-alpha.10',
|
|
58
|
+
'@storybook/preset-server-webpack': '7.0.0-alpha.10',
|
|
59
|
+
'@storybook/preset-svelte-webpack': '7.0.0-alpha.10',
|
|
60
|
+
'@storybook/preset-vue-webpack': '7.0.0-alpha.10',
|
|
61
|
+
'@storybook/preset-vue3-webpack': '7.0.0-alpha.10',
|
|
62
|
+
'@storybook/preset-web-components-webpack': '7.0.0-alpha.10',
|
|
63
|
+
'@storybook/preview-web': '7.0.0-alpha.10',
|
|
64
|
+
'@storybook/react': '7.0.0-alpha.10',
|
|
65
|
+
'@storybook/react-webpack5': '7.0.0-alpha.10',
|
|
66
|
+
'@storybook/router': '7.0.0-alpha.10',
|
|
67
|
+
'@storybook/server': '7.0.0-alpha.10',
|
|
68
|
+
'@storybook/server-webpack5': '7.0.0-alpha.10',
|
|
69
|
+
'@storybook/source-loader': '7.0.0-alpha.10',
|
|
70
|
+
'@storybook/store': '7.0.0-alpha.10',
|
|
71
|
+
'@storybook/svelte': '7.0.0-alpha.10',
|
|
72
|
+
'@storybook/svelte-webpack5': '7.0.0-alpha.10',
|
|
73
|
+
'@storybook/telemetry': '7.0.0-alpha.10',
|
|
74
|
+
'@storybook/theming': '7.0.0-alpha.10',
|
|
75
|
+
'@storybook/ui': '7.0.0-alpha.10',
|
|
76
|
+
'@storybook/vue': '7.0.0-alpha.10',
|
|
77
|
+
'@storybook/vue-webpack5': '7.0.0-alpha.10',
|
|
78
|
+
'@storybook/vue3': '7.0.0-alpha.10',
|
|
79
|
+
'@storybook/vue3-webpack5': '7.0.0-alpha.10',
|
|
80
|
+
'@storybook/web-components': '7.0.0-alpha.10',
|
|
81
|
+
'@storybook/web-components-webpack5': '7.0.0-alpha.10',
|
|
82
|
+
sb: '7.0.0-alpha.10',
|
|
83
|
+
storybook: '7.0.0-alpha.10'
|
|
82
84
|
};
|
|
83
85
|
exports.default = _default;
|
|
@@ -22,6 +22,8 @@ var _eslintPlugin = require("./eslint-plugin");
|
|
|
22
22
|
|
|
23
23
|
var _builderVite = require("./builder-vite");
|
|
24
24
|
|
|
25
|
+
var _npm = require("./npm7");
|
|
26
|
+
|
|
25
27
|
var _types = require("../types");
|
|
26
28
|
|
|
27
29
|
Object.keys(_types).forEach(function (key) {
|
|
@@ -35,5 +37,5 @@ Object.keys(_types).forEach(function (key) {
|
|
|
35
37
|
}
|
|
36
38
|
});
|
|
37
39
|
});
|
|
38
|
-
const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
|
|
40
|
+
const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
|
|
39
41
|
exports.fixes = fixes;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.npm7 = void 0;
|
|
7
|
+
|
|
8
|
+
require("core-js/modules/es.promise.js");
|
|
9
|
+
|
|
10
|
+
var _chalk = _interopRequireDefault(require("chalk"));
|
|
11
|
+
|
|
12
|
+
var _tsDedent = _interopRequireDefault(require("ts-dedent"));
|
|
13
|
+
|
|
14
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
|
|
18
|
+
*/
|
|
19
|
+
const npm7 = {
|
|
20
|
+
id: 'npm7',
|
|
21
|
+
|
|
22
|
+
async check({
|
|
23
|
+
packageManager
|
|
24
|
+
}) {
|
|
25
|
+
if (packageManager.type !== 'npm') return null;
|
|
26
|
+
const npmVersion = packageManager.getNpmVersion();
|
|
27
|
+
|
|
28
|
+
if (packageManager.needsLegacyPeerDeps(npmVersion)) {
|
|
29
|
+
return {
|
|
30
|
+
npmVersion
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
return null;
|
|
35
|
+
},
|
|
36
|
+
|
|
37
|
+
prompt({
|
|
38
|
+
npmVersion
|
|
39
|
+
}) {
|
|
40
|
+
const npmFormatted = _chalk.default.cyan(`npm ${npmVersion}`);
|
|
41
|
+
|
|
42
|
+
return (0, _tsDedent.default)`
|
|
43
|
+
We've detected you are running ${npmFormatted} which has peer dependency semantics which Storybook is incompatible with.
|
|
44
|
+
|
|
45
|
+
In order to work with Storybook's package structure, you'll need to run \`npm\` with the
|
|
46
|
+
\`--legacy-peer-deps=true\` flag. We can generate an \`.npmrc\` which will do that automatically.
|
|
47
|
+
|
|
48
|
+
More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/issues/18298')}
|
|
49
|
+
`;
|
|
50
|
+
},
|
|
51
|
+
|
|
52
|
+
async run({
|
|
53
|
+
packageManager
|
|
54
|
+
}) {
|
|
55
|
+
packageManager.setLegacyPeerDeps();
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
};
|
|
59
|
+
exports.npm7 = npm7;
|
|
@@ -34,9 +34,15 @@ const automigrate = async ({
|
|
|
34
34
|
|
|
35
35
|
for (let i = 0; i < filtered.length; i += 1) {
|
|
36
36
|
const f = _fixes.fixes[i];
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
let result;
|
|
38
|
+
|
|
39
|
+
try {
|
|
40
|
+
result = await f.check({
|
|
41
|
+
packageManager
|
|
42
|
+
});
|
|
43
|
+
} catch (e) {
|
|
44
|
+
logger.info(`failed to check fix: ${f.id}`);
|
|
45
|
+
}
|
|
40
46
|
|
|
41
47
|
if (result) {
|
|
42
48
|
logger.info(`🔎 found a '${_chalk.default.cyan(f.id)}' migration:`);
|
package/dist/esm/babel-config.js
CHANGED
|
@@ -11,8 +11,6 @@ var _fsExtra = require("fs-extra");
|
|
|
11
11
|
|
|
12
12
|
var _nodeLogger = require("@storybook/node-logger");
|
|
13
13
|
|
|
14
|
-
var _coreCommon = require("@storybook/core-common");
|
|
15
|
-
|
|
16
14
|
var _path = _interopRequireDefault(require("path"));
|
|
17
15
|
|
|
18
16
|
var _prompts = _interopRequireDefault(require("prompts"));
|
|
@@ -33,8 +31,11 @@ const generateStorybookBabelConfig = async ({
|
|
|
33
31
|
}) => {
|
|
34
32
|
_nodeLogger.logger.info(`Generating the storybook default babel config at ${target}`);
|
|
35
33
|
|
|
36
|
-
const
|
|
37
|
-
|
|
34
|
+
const contents = JSON.stringify({
|
|
35
|
+
sourceType: 'unambiguous',
|
|
36
|
+
presets: [],
|
|
37
|
+
plugins: []
|
|
38
|
+
}, null, 2);
|
|
38
39
|
const fileName = '.babelrc.json';
|
|
39
40
|
|
|
40
41
|
const location = _path.default.join(target, fileName);
|