@storybook/cli 6.4.0-beta.32 → 6.4.0-beta.33

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.
@@ -103,15 +103,14 @@ const eslintPlugin = {
103
103
  }, deps);
104
104
 
105
105
  if (!dryRun && unsupportedExtension) {
106
- logger.warn((0, _tsDedent.default)(`
107
- ⚠️ The plugin was successfuly installed but failed to configure.
108
-
109
- Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
- Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
-
112
- Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
- `));
114
- return;
106
+ throw new Error((0, _tsDedent.default)`
107
+ ⚠️ The plugin was successfuly installed but failed to configure.
108
+
109
+ Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
+ Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
+
112
+ Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
+ `);
115
114
  }
116
115
 
117
116
  const eslint = await (0, _csfTools.readConfig)(eslintFile);
@@ -26,7 +26,7 @@ const automigrate = async ({
26
26
  fixId,
27
27
  dryRun,
28
28
  yes
29
- }) => {
29
+ } = {}) => {
30
30
  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager();
31
31
 
32
32
  const filtered = fixId ? _fixes.fixes.filter(f => f.id === fixId) : _fixes.fixes;
@@ -54,12 +54,18 @@ const automigrate = async ({
54
54
  }]);
55
55
 
56
56
  if (runAnswer.fix) {
57
- await f.run({
58
- result,
59
- packageManager,
60
- dryRun
61
- });
62
- logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
57
+ try {
58
+ await f.run({
59
+ result,
60
+ packageManager,
61
+ dryRun
62
+ });
63
+ logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
64
+ } catch (error) {
65
+ logger.info(`❌ error in ${_chalk.default.cyan(f.id)}:`);
66
+ logger.info(error.message);
67
+ logger.info();
68
+ }
63
69
  } else {
64
70
  logger.info(`Skipping the ${_chalk.default.cyan(f.id)} fix.`);
65
71
  logger.info();
@@ -65,6 +65,8 @@ var _SERVER = _interopRequireDefault(require("./generators/SERVER"));
65
65
 
66
66
  var _jsPackageManager = require("./js-package-manager");
67
67
 
68
+ var _automigrate = require("./automigrate");
69
+
68
70
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
69
71
 
70
72
  const logger = console;
@@ -242,7 +244,7 @@ const projectTypeInquirer = async options => {
242
244
  return Promise.resolve();
243
245
  };
244
246
 
245
- function initiate(options, pkg) {
247
+ async function initiate(options, pkg) {
246
248
  const welcomeMessage = 'sb init - the simplest way to add a Storybook to your project.';
247
249
  logger.log(_chalk.default.inverse(`\n ${welcomeMessage} \n`)); // Update notify code.
248
250
 
@@ -253,18 +255,18 @@ function initiate(options, pkg) {
253
255
  }).notify();
254
256
  let projectType;
255
257
  const projectTypeProvided = options.type;
256
- const infoText = projectTypeProvided ? 'Installing Storybook for user specified project type' : 'Detecting project type';
258
+ const infoText = projectTypeProvided ? `Installing Storybook for user specified project type: ${projectTypeProvided}` : 'Detecting project type';
257
259
  const done = (0, _helpers.commandLog)(infoText);
258
260
  const packageJson = (0, _jsPackageManager.readPackageJson)();
259
261
  const isEsm = packageJson && packageJson.type === 'module';
260
262
 
261
263
  try {
262
264
  if (projectTypeProvided) {
263
- if (_project_types.installableProjectTypes.includes(options.type)) {
265
+ if (_project_types.installableProjectTypes.includes(projectTypeProvided)) {
264
266
  const storybookInstalled = (0, _detect.isStorybookInstalled)(packageJson, options.force);
265
- projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : options.type.toUpperCase();
267
+ projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : projectTypeProvided.toUpperCase();
266
268
  } else {
267
- done(`The provided project type was not recognized by Storybook.`);
269
+ done(`The provided project type was not recognized by Storybook: ${projectTypeProvided}`);
268
270
  logger.log(`\nThe project types currently supported by Storybook are:\n`);
269
271
 
270
272
  _project_types.installableProjectTypes.sort().forEach(framework => (0, _helpers.paddedLog)(`- ${framework}`));
@@ -281,7 +283,8 @@ function initiate(options, pkg) {
281
283
  }
282
284
 
283
285
  done();
284
- return installStorybook(projectType, Object.assign({}, options, isEsm ? {
286
+ await installStorybook(projectType, Object.assign({}, options, isEsm ? {
285
287
  commonJs: true
286
288
  } : undefined));
289
+ return (0, _automigrate.automigrate)();
287
290
  }
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
6
+ exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular12 = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -74,6 +74,11 @@ const angular11 = Object.assign({}, baseAngular, {
74
74
  version: 'v11-lts'
75
75
  });
76
76
  exports.angular11 = angular11;
77
+ const angular12 = Object.assign({}, baseAngular, {
78
+ name: 'angular12',
79
+ version: 'v12-lts'
80
+ });
81
+ exports.angular12 = angular12;
77
82
  const angular = baseAngular; // #endregion
78
83
  // #region web components
79
84
 
@@ -1,59 +1,59 @@
1
1
  {
2
- "@storybook/addon-a11y": "6.4.0-beta.32",
3
- "@storybook/addon-actions": "6.4.0-beta.32",
4
- "@storybook/addon-backgrounds": "6.4.0-beta.32",
5
- "@storybook/addon-controls": "6.4.0-beta.32",
6
- "@storybook/addon-docs": "6.4.0-beta.32",
7
- "@storybook/addon-essentials": "6.4.0-beta.32",
8
- "@storybook/addon-interactions": "6.4.0-beta.32",
9
- "@storybook/addon-jest": "6.4.0-beta.32",
10
- "@storybook/addon-links": "6.4.0-beta.32",
11
- "@storybook/addon-storyshots": "6.4.0-beta.32",
12
- "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.32",
13
- "@storybook/addon-storysource": "6.4.0-beta.32",
14
- "@storybook/addon-toolbars": "6.4.0-beta.32",
15
- "@storybook/addon-viewport": "6.4.0-beta.32",
16
- "@storybook/addons": "6.4.0-beta.32",
17
- "@storybook/angular": "6.4.0-beta.32",
18
- "@storybook/api": "6.4.0-beta.32",
19
- "@storybook/aurelia": "6.4.0-beta.32",
20
- "@storybook/builder-webpack4": "6.4.0-beta.32",
21
- "@storybook/builder-webpack5": "6.4.0-beta.32",
22
- "@storybook/channel-postmessage": "6.4.0-beta.32",
23
- "@storybook/channel-websocket": "6.4.0-beta.32",
24
- "@storybook/channels": "6.4.0-beta.32",
25
- "@storybook/cli": "6.4.0-beta.32",
26
- "@storybook/client-api": "6.4.0-beta.32",
27
- "@storybook/client-logger": "6.4.0-beta.32",
28
- "@storybook/codemod": "6.4.0-beta.32",
29
- "@storybook/components": "6.4.0-beta.32",
30
- "@storybook/core": "6.4.0-beta.32",
31
- "@storybook/core-client": "6.4.0-beta.32",
32
- "@storybook/core-common": "6.4.0-beta.32",
33
- "@storybook/core-events": "6.4.0-beta.32",
34
- "@storybook/core-server": "6.4.0-beta.32",
35
- "@storybook/csf-tools": "6.4.0-beta.32",
36
- "@storybook/ember": "6.4.0-beta.32",
37
- "@storybook/html": "6.4.0-beta.32",
38
- "@storybook/instrumenter": "6.4.0-beta.32",
39
- "@storybook/manager-webpack4": "6.4.0-beta.32",
40
- "@storybook/manager-webpack5": "6.4.0-beta.32",
41
- "@storybook/marionette": "6.4.0-beta.32",
42
- "@storybook/marko": "6.4.0-beta.32",
43
- "@storybook/mithril": "6.4.0-beta.32",
44
- "@storybook/node-logger": "6.4.0-beta.32",
45
- "@storybook/postinstall": "6.4.0-beta.32",
46
- "@storybook/preact": "6.4.0-beta.32",
47
- "@storybook/rax": "6.4.0-beta.32",
48
- "@storybook/react": "6.4.0-beta.32",
49
- "@storybook/riot": "6.4.0-beta.32",
50
- "@storybook/router": "6.4.0-beta.32",
51
- "@storybook/server": "6.4.0-beta.32",
52
- "@storybook/source-loader": "6.4.0-beta.32",
53
- "@storybook/svelte": "6.4.0-beta.32",
54
- "@storybook/theming": "6.4.0-beta.32",
55
- "@storybook/ui": "6.4.0-beta.32",
56
- "@storybook/vue": "6.4.0-beta.32",
57
- "@storybook/vue3": "6.4.0-beta.32",
58
- "@storybook/web-components": "6.4.0-beta.32"
2
+ "@storybook/addon-a11y": "6.4.0-beta.33",
3
+ "@storybook/addon-actions": "6.4.0-beta.33",
4
+ "@storybook/addon-backgrounds": "6.4.0-beta.33",
5
+ "@storybook/addon-controls": "6.4.0-beta.33",
6
+ "@storybook/addon-docs": "6.4.0-beta.33",
7
+ "@storybook/addon-essentials": "6.4.0-beta.33",
8
+ "@storybook/addon-interactions": "6.4.0-beta.33",
9
+ "@storybook/addon-jest": "6.4.0-beta.33",
10
+ "@storybook/addon-links": "6.4.0-beta.33",
11
+ "@storybook/addon-storyshots": "6.4.0-beta.33",
12
+ "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.33",
13
+ "@storybook/addon-storysource": "6.4.0-beta.33",
14
+ "@storybook/addon-toolbars": "6.4.0-beta.33",
15
+ "@storybook/addon-viewport": "6.4.0-beta.33",
16
+ "@storybook/addons": "6.4.0-beta.33",
17
+ "@storybook/angular": "6.4.0-beta.33",
18
+ "@storybook/api": "6.4.0-beta.33",
19
+ "@storybook/aurelia": "6.4.0-beta.33",
20
+ "@storybook/builder-webpack4": "6.4.0-beta.33",
21
+ "@storybook/builder-webpack5": "6.4.0-beta.33",
22
+ "@storybook/channel-postmessage": "6.4.0-beta.33",
23
+ "@storybook/channel-websocket": "6.4.0-beta.33",
24
+ "@storybook/channels": "6.4.0-beta.33",
25
+ "@storybook/cli": "6.4.0-beta.33",
26
+ "@storybook/client-api": "6.4.0-beta.33",
27
+ "@storybook/client-logger": "6.4.0-beta.33",
28
+ "@storybook/codemod": "6.4.0-beta.33",
29
+ "@storybook/components": "6.4.0-beta.33",
30
+ "@storybook/core": "6.4.0-beta.33",
31
+ "@storybook/core-client": "6.4.0-beta.33",
32
+ "@storybook/core-common": "6.4.0-beta.33",
33
+ "@storybook/core-events": "6.4.0-beta.33",
34
+ "@storybook/core-server": "6.4.0-beta.33",
35
+ "@storybook/csf-tools": "6.4.0-beta.33",
36
+ "@storybook/ember": "6.4.0-beta.33",
37
+ "@storybook/html": "6.4.0-beta.33",
38
+ "@storybook/instrumenter": "6.4.0-beta.33",
39
+ "@storybook/manager-webpack4": "6.4.0-beta.33",
40
+ "@storybook/manager-webpack5": "6.4.0-beta.33",
41
+ "@storybook/marionette": "6.4.0-beta.33",
42
+ "@storybook/marko": "6.4.0-beta.33",
43
+ "@storybook/mithril": "6.4.0-beta.33",
44
+ "@storybook/node-logger": "6.4.0-beta.33",
45
+ "@storybook/postinstall": "6.4.0-beta.33",
46
+ "@storybook/preact": "6.4.0-beta.33",
47
+ "@storybook/rax": "6.4.0-beta.33",
48
+ "@storybook/react": "6.4.0-beta.33",
49
+ "@storybook/riot": "6.4.0-beta.33",
50
+ "@storybook/router": "6.4.0-beta.33",
51
+ "@storybook/server": "6.4.0-beta.33",
52
+ "@storybook/source-loader": "6.4.0-beta.33",
53
+ "@storybook/svelte": "6.4.0-beta.33",
54
+ "@storybook/theming": "6.4.0-beta.33",
55
+ "@storybook/ui": "6.4.0-beta.33",
56
+ "@storybook/vue": "6.4.0-beta.33",
57
+ "@storybook/vue3": "6.4.0-beta.33",
58
+ "@storybook/web-components": "6.4.0-beta.33"
59
59
  }
@@ -103,15 +103,14 @@ const eslintPlugin = {
103
103
  }, deps);
104
104
 
105
105
  if (!dryRun && unsupportedExtension) {
106
- logger.warn((0, _tsDedent.default)(`
107
- ⚠️ The plugin was successfuly installed but failed to configure.
108
-
109
- Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
- Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
-
112
- Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
- `));
114
- return;
106
+ throw new Error((0, _tsDedent.default)`
107
+ ⚠️ The plugin was successfuly installed but failed to configure.
108
+
109
+ Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
+ Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
+
112
+ Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
+ `);
115
114
  }
116
115
 
117
116
  const eslint = await (0, _csfTools.readConfig)(eslintFile);
@@ -26,7 +26,7 @@ const automigrate = async ({
26
26
  fixId,
27
27
  dryRun,
28
28
  yes
29
- }) => {
29
+ } = {}) => {
30
30
  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager();
31
31
 
32
32
  const filtered = fixId ? _fixes.fixes.filter(f => f.id === fixId) : _fixes.fixes;
@@ -54,12 +54,18 @@ const automigrate = async ({
54
54
  }]);
55
55
 
56
56
  if (runAnswer.fix) {
57
- await f.run({
58
- result,
59
- packageManager,
60
- dryRun
61
- });
62
- logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
57
+ try {
58
+ await f.run({
59
+ result,
60
+ packageManager,
61
+ dryRun
62
+ });
63
+ logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
64
+ } catch (error) {
65
+ logger.info(`❌ error in ${_chalk.default.cyan(f.id)}:`);
66
+ logger.info(error.message);
67
+ logger.info();
68
+ }
63
69
  } else {
64
70
  logger.info(`Skipping the ${_chalk.default.cyan(f.id)} fix.`);
65
71
  logger.info();
@@ -65,6 +65,8 @@ var _SERVER = _interopRequireDefault(require("./generators/SERVER"));
65
65
 
66
66
  var _jsPackageManager = require("./js-package-manager");
67
67
 
68
+ var _automigrate = require("./automigrate");
69
+
68
70
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
69
71
 
70
72
  const logger = console;
@@ -242,7 +244,7 @@ const projectTypeInquirer = async options => {
242
244
  return Promise.resolve();
243
245
  };
244
246
 
245
- function initiate(options, pkg) {
247
+ async function initiate(options, pkg) {
246
248
  const welcomeMessage = 'sb init - the simplest way to add a Storybook to your project.';
247
249
  logger.log(_chalk.default.inverse(`\n ${welcomeMessage} \n`)); // Update notify code.
248
250
 
@@ -253,18 +255,18 @@ function initiate(options, pkg) {
253
255
  }).notify();
254
256
  let projectType;
255
257
  const projectTypeProvided = options.type;
256
- const infoText = projectTypeProvided ? 'Installing Storybook for user specified project type' : 'Detecting project type';
258
+ const infoText = projectTypeProvided ? `Installing Storybook for user specified project type: ${projectTypeProvided}` : 'Detecting project type';
257
259
  const done = (0, _helpers.commandLog)(infoText);
258
260
  const packageJson = (0, _jsPackageManager.readPackageJson)();
259
261
  const isEsm = packageJson && packageJson.type === 'module';
260
262
 
261
263
  try {
262
264
  if (projectTypeProvided) {
263
- if (_project_types.installableProjectTypes.includes(options.type)) {
265
+ if (_project_types.installableProjectTypes.includes(projectTypeProvided)) {
264
266
  const storybookInstalled = (0, _detect.isStorybookInstalled)(packageJson, options.force);
265
- projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : options.type.toUpperCase();
267
+ projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : projectTypeProvided.toUpperCase();
266
268
  } else {
267
- done(`The provided project type was not recognized by Storybook.`);
269
+ done(`The provided project type was not recognized by Storybook: ${projectTypeProvided}`);
268
270
  logger.log(`\nThe project types currently supported by Storybook are:\n`);
269
271
 
270
272
  _project_types.installableProjectTypes.sort().forEach(framework => (0, _helpers.paddedLog)(`- ${framework}`));
@@ -281,7 +283,8 @@ function initiate(options, pkg) {
281
283
  }
282
284
 
283
285
  done();
284
- return installStorybook(projectType, Object.assign({}, options, isEsm ? {
286
+ await installStorybook(projectType, Object.assign({}, options, isEsm ? {
285
287
  commonJs: true
286
288
  } : undefined));
289
+ return (0, _automigrate.automigrate)();
287
290
  }
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
6
+ exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular12 = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -74,6 +74,11 @@ const angular11 = Object.assign({}, baseAngular, {
74
74
  version: 'v11-lts'
75
75
  });
76
76
  exports.angular11 = angular11;
77
+ const angular12 = Object.assign({}, baseAngular, {
78
+ name: 'angular12',
79
+ version: 'v12-lts'
80
+ });
81
+ exports.angular12 = angular12;
77
82
  const angular = baseAngular; // #endregion
78
83
  // #region web components
79
84
 
@@ -1,59 +1,59 @@
1
1
  {
2
- "@storybook/addon-a11y": "6.4.0-beta.32",
3
- "@storybook/addon-actions": "6.4.0-beta.32",
4
- "@storybook/addon-backgrounds": "6.4.0-beta.32",
5
- "@storybook/addon-controls": "6.4.0-beta.32",
6
- "@storybook/addon-docs": "6.4.0-beta.32",
7
- "@storybook/addon-essentials": "6.4.0-beta.32",
8
- "@storybook/addon-interactions": "6.4.0-beta.32",
9
- "@storybook/addon-jest": "6.4.0-beta.32",
10
- "@storybook/addon-links": "6.4.0-beta.32",
11
- "@storybook/addon-storyshots": "6.4.0-beta.32",
12
- "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.32",
13
- "@storybook/addon-storysource": "6.4.0-beta.32",
14
- "@storybook/addon-toolbars": "6.4.0-beta.32",
15
- "@storybook/addon-viewport": "6.4.0-beta.32",
16
- "@storybook/addons": "6.4.0-beta.32",
17
- "@storybook/angular": "6.4.0-beta.32",
18
- "@storybook/api": "6.4.0-beta.32",
19
- "@storybook/aurelia": "6.4.0-beta.32",
20
- "@storybook/builder-webpack4": "6.4.0-beta.32",
21
- "@storybook/builder-webpack5": "6.4.0-beta.32",
22
- "@storybook/channel-postmessage": "6.4.0-beta.32",
23
- "@storybook/channel-websocket": "6.4.0-beta.32",
24
- "@storybook/channels": "6.4.0-beta.32",
25
- "@storybook/cli": "6.4.0-beta.32",
26
- "@storybook/client-api": "6.4.0-beta.32",
27
- "@storybook/client-logger": "6.4.0-beta.32",
28
- "@storybook/codemod": "6.4.0-beta.32",
29
- "@storybook/components": "6.4.0-beta.32",
30
- "@storybook/core": "6.4.0-beta.32",
31
- "@storybook/core-client": "6.4.0-beta.32",
32
- "@storybook/core-common": "6.4.0-beta.32",
33
- "@storybook/core-events": "6.4.0-beta.32",
34
- "@storybook/core-server": "6.4.0-beta.32",
35
- "@storybook/csf-tools": "6.4.0-beta.32",
36
- "@storybook/ember": "6.4.0-beta.32",
37
- "@storybook/html": "6.4.0-beta.32",
38
- "@storybook/instrumenter": "6.4.0-beta.32",
39
- "@storybook/manager-webpack4": "6.4.0-beta.32",
40
- "@storybook/manager-webpack5": "6.4.0-beta.32",
41
- "@storybook/marionette": "6.4.0-beta.32",
42
- "@storybook/marko": "6.4.0-beta.32",
43
- "@storybook/mithril": "6.4.0-beta.32",
44
- "@storybook/node-logger": "6.4.0-beta.32",
45
- "@storybook/postinstall": "6.4.0-beta.32",
46
- "@storybook/preact": "6.4.0-beta.32",
47
- "@storybook/rax": "6.4.0-beta.32",
48
- "@storybook/react": "6.4.0-beta.32",
49
- "@storybook/riot": "6.4.0-beta.32",
50
- "@storybook/router": "6.4.0-beta.32",
51
- "@storybook/server": "6.4.0-beta.32",
52
- "@storybook/source-loader": "6.4.0-beta.32",
53
- "@storybook/svelte": "6.4.0-beta.32",
54
- "@storybook/theming": "6.4.0-beta.32",
55
- "@storybook/ui": "6.4.0-beta.32",
56
- "@storybook/vue": "6.4.0-beta.32",
57
- "@storybook/vue3": "6.4.0-beta.32",
58
- "@storybook/web-components": "6.4.0-beta.32"
2
+ "@storybook/addon-a11y": "6.4.0-beta.33",
3
+ "@storybook/addon-actions": "6.4.0-beta.33",
4
+ "@storybook/addon-backgrounds": "6.4.0-beta.33",
5
+ "@storybook/addon-controls": "6.4.0-beta.33",
6
+ "@storybook/addon-docs": "6.4.0-beta.33",
7
+ "@storybook/addon-essentials": "6.4.0-beta.33",
8
+ "@storybook/addon-interactions": "6.4.0-beta.33",
9
+ "@storybook/addon-jest": "6.4.0-beta.33",
10
+ "@storybook/addon-links": "6.4.0-beta.33",
11
+ "@storybook/addon-storyshots": "6.4.0-beta.33",
12
+ "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.33",
13
+ "@storybook/addon-storysource": "6.4.0-beta.33",
14
+ "@storybook/addon-toolbars": "6.4.0-beta.33",
15
+ "@storybook/addon-viewport": "6.4.0-beta.33",
16
+ "@storybook/addons": "6.4.0-beta.33",
17
+ "@storybook/angular": "6.4.0-beta.33",
18
+ "@storybook/api": "6.4.0-beta.33",
19
+ "@storybook/aurelia": "6.4.0-beta.33",
20
+ "@storybook/builder-webpack4": "6.4.0-beta.33",
21
+ "@storybook/builder-webpack5": "6.4.0-beta.33",
22
+ "@storybook/channel-postmessage": "6.4.0-beta.33",
23
+ "@storybook/channel-websocket": "6.4.0-beta.33",
24
+ "@storybook/channels": "6.4.0-beta.33",
25
+ "@storybook/cli": "6.4.0-beta.33",
26
+ "@storybook/client-api": "6.4.0-beta.33",
27
+ "@storybook/client-logger": "6.4.0-beta.33",
28
+ "@storybook/codemod": "6.4.0-beta.33",
29
+ "@storybook/components": "6.4.0-beta.33",
30
+ "@storybook/core": "6.4.0-beta.33",
31
+ "@storybook/core-client": "6.4.0-beta.33",
32
+ "@storybook/core-common": "6.4.0-beta.33",
33
+ "@storybook/core-events": "6.4.0-beta.33",
34
+ "@storybook/core-server": "6.4.0-beta.33",
35
+ "@storybook/csf-tools": "6.4.0-beta.33",
36
+ "@storybook/ember": "6.4.0-beta.33",
37
+ "@storybook/html": "6.4.0-beta.33",
38
+ "@storybook/instrumenter": "6.4.0-beta.33",
39
+ "@storybook/manager-webpack4": "6.4.0-beta.33",
40
+ "@storybook/manager-webpack5": "6.4.0-beta.33",
41
+ "@storybook/marionette": "6.4.0-beta.33",
42
+ "@storybook/marko": "6.4.0-beta.33",
43
+ "@storybook/mithril": "6.4.0-beta.33",
44
+ "@storybook/node-logger": "6.4.0-beta.33",
45
+ "@storybook/postinstall": "6.4.0-beta.33",
46
+ "@storybook/preact": "6.4.0-beta.33",
47
+ "@storybook/rax": "6.4.0-beta.33",
48
+ "@storybook/react": "6.4.0-beta.33",
49
+ "@storybook/riot": "6.4.0-beta.33",
50
+ "@storybook/router": "6.4.0-beta.33",
51
+ "@storybook/server": "6.4.0-beta.33",
52
+ "@storybook/source-loader": "6.4.0-beta.33",
53
+ "@storybook/svelte": "6.4.0-beta.33",
54
+ "@storybook/theming": "6.4.0-beta.33",
55
+ "@storybook/ui": "6.4.0-beta.33",
56
+ "@storybook/vue": "6.4.0-beta.33",
57
+ "@storybook/vue3": "6.4.0-beta.33",
58
+ "@storybook/web-components": "6.4.0-beta.33"
59
59
  }
@@ -103,15 +103,14 @@ const eslintPlugin = {
103
103
  }, deps);
104
104
 
105
105
  if (!dryRun && unsupportedExtension) {
106
- logger.warn((0, _tsDedent.default)(`
107
- ⚠️ The plugin was successfuly installed but failed to configure.
108
-
109
- Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
- Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
-
112
- Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
- `));
114
- return;
106
+ throw new Error((0, _tsDedent.default)`
107
+ ⚠️ The plugin was successfuly installed but failed to configure.
108
+
109
+ Found an .eslintrc config file with an unsupported automigration format: ${unsupportedExtension}.
110
+ Supported formats for automigration are: ${_getEslintInfo.SUPPORTED_ESLINT_EXTENSIONS.join(', ')}.
111
+
112
+ Please refer to https://github.com/storybookjs/eslint-plugin-storybook#usage to finish setting up the plugin manually.
113
+ `);
115
114
  }
116
115
 
117
116
  const eslint = await (0, _csfTools.readConfig)(eslintFile);
@@ -26,7 +26,7 @@ const automigrate = async ({
26
26
  fixId,
27
27
  dryRun,
28
28
  yes
29
- }) => {
29
+ } = {}) => {
30
30
  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager();
31
31
 
32
32
  const filtered = fixId ? _fixes.fixes.filter(f => f.id === fixId) : _fixes.fixes;
@@ -54,12 +54,18 @@ const automigrate = async ({
54
54
  }]);
55
55
 
56
56
  if (runAnswer.fix) {
57
- await f.run({
58
- result,
59
- packageManager,
60
- dryRun
61
- });
62
- logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
57
+ try {
58
+ await f.run({
59
+ result,
60
+ packageManager,
61
+ dryRun
62
+ });
63
+ logger.info(`✅ fixed ${_chalk.default.cyan(f.id)}`);
64
+ } catch (error) {
65
+ logger.info(`❌ error in ${_chalk.default.cyan(f.id)}:`);
66
+ logger.info(error.message);
67
+ logger.info();
68
+ }
63
69
  } else {
64
70
  logger.info(`Skipping the ${_chalk.default.cyan(f.id)} fix.`);
65
71
  logger.info();
@@ -65,6 +65,8 @@ var _SERVER = _interopRequireDefault(require("./generators/SERVER"));
65
65
 
66
66
  var _jsPackageManager = require("./js-package-manager");
67
67
 
68
+ var _automigrate = require("./automigrate");
69
+
68
70
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
69
71
 
70
72
  const logger = console;
@@ -242,7 +244,7 @@ const projectTypeInquirer = async options => {
242
244
  return Promise.resolve();
243
245
  };
244
246
 
245
- function initiate(options, pkg) {
247
+ async function initiate(options, pkg) {
246
248
  const welcomeMessage = 'sb init - the simplest way to add a Storybook to your project.';
247
249
  logger.log(_chalk.default.inverse(`\n ${welcomeMessage} \n`)); // Update notify code.
248
250
 
@@ -253,18 +255,18 @@ function initiate(options, pkg) {
253
255
  }).notify();
254
256
  let projectType;
255
257
  const projectTypeProvided = options.type;
256
- const infoText = projectTypeProvided ? 'Installing Storybook for user specified project type' : 'Detecting project type';
258
+ const infoText = projectTypeProvided ? `Installing Storybook for user specified project type: ${projectTypeProvided}` : 'Detecting project type';
257
259
  const done = (0, _helpers.commandLog)(infoText);
258
260
  const packageJson = (0, _jsPackageManager.readPackageJson)();
259
261
  const isEsm = packageJson && packageJson.type === 'module';
260
262
 
261
263
  try {
262
264
  if (projectTypeProvided) {
263
- if (_project_types.installableProjectTypes.includes(options.type)) {
265
+ if (_project_types.installableProjectTypes.includes(projectTypeProvided)) {
264
266
  const storybookInstalled = (0, _detect.isStorybookInstalled)(packageJson, options.force);
265
- projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : options.type.toUpperCase();
267
+ projectType = storybookInstalled ? _project_types.ProjectType.ALREADY_HAS_STORYBOOK : projectTypeProvided.toUpperCase();
266
268
  } else {
267
- done(`The provided project type was not recognized by Storybook.`);
269
+ done(`The provided project type was not recognized by Storybook: ${projectTypeProvided}`);
268
270
  logger.log(`\nThe project types currently supported by Storybook are:\n`);
269
271
 
270
272
  _project_types.installableProjectTypes.sort().forEach(framework => (0, _helpers.paddedLog)(`- ${framework}`));
@@ -281,7 +283,8 @@ function initiate(options, pkg) {
281
283
  }
282
284
 
283
285
  done();
284
- return installStorybook(projectType, Object.assign({}, options, isEsm ? {
286
+ await installStorybook(projectType, Object.assign({}, options, isEsm ? {
285
287
  commonJs: true
286
288
  } : undefined));
289
+ return (0, _automigrate.automigrate)();
287
290
  }
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
6
+ exports.svelte = exports.sfcVue = exports.preact = exports.html = exports.vue3 = exports.vue = exports.web_components_lit2 = exports.web_components_typescript = exports.web_components = exports.angular = exports.angular12 = exports.angular11 = exports.angular10 = exports.react_in_yarn_workspace = exports.webpack_react = exports.react_typescript = exports.react = exports.cra_typescript = exports.cra = void 0;
7
7
 
8
8
  const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
9
9
  // and not look for a yarn workspace in parent directory
@@ -74,6 +74,11 @@ const angular11 = Object.assign({}, baseAngular, {
74
74
  version: 'v11-lts'
75
75
  });
76
76
  exports.angular11 = angular11;
77
+ const angular12 = Object.assign({}, baseAngular, {
78
+ name: 'angular12',
79
+ version: 'v12-lts'
80
+ });
81
+ exports.angular12 = angular12;
77
82
  const angular = baseAngular; // #endregion
78
83
  // #region web components
79
84
 
@@ -1,59 +1,59 @@
1
1
  {
2
- "@storybook/addon-a11y": "6.4.0-beta.32",
3
- "@storybook/addon-actions": "6.4.0-beta.32",
4
- "@storybook/addon-backgrounds": "6.4.0-beta.32",
5
- "@storybook/addon-controls": "6.4.0-beta.32",
6
- "@storybook/addon-docs": "6.4.0-beta.32",
7
- "@storybook/addon-essentials": "6.4.0-beta.32",
8
- "@storybook/addon-interactions": "6.4.0-beta.32",
9
- "@storybook/addon-jest": "6.4.0-beta.32",
10
- "@storybook/addon-links": "6.4.0-beta.32",
11
- "@storybook/addon-storyshots": "6.4.0-beta.32",
12
- "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.32",
13
- "@storybook/addon-storysource": "6.4.0-beta.32",
14
- "@storybook/addon-toolbars": "6.4.0-beta.32",
15
- "@storybook/addon-viewport": "6.4.0-beta.32",
16
- "@storybook/addons": "6.4.0-beta.32",
17
- "@storybook/angular": "6.4.0-beta.32",
18
- "@storybook/api": "6.4.0-beta.32",
19
- "@storybook/aurelia": "6.4.0-beta.32",
20
- "@storybook/builder-webpack4": "6.4.0-beta.32",
21
- "@storybook/builder-webpack5": "6.4.0-beta.32",
22
- "@storybook/channel-postmessage": "6.4.0-beta.32",
23
- "@storybook/channel-websocket": "6.4.0-beta.32",
24
- "@storybook/channels": "6.4.0-beta.32",
25
- "@storybook/cli": "6.4.0-beta.32",
26
- "@storybook/client-api": "6.4.0-beta.32",
27
- "@storybook/client-logger": "6.4.0-beta.32",
28
- "@storybook/codemod": "6.4.0-beta.32",
29
- "@storybook/components": "6.4.0-beta.32",
30
- "@storybook/core": "6.4.0-beta.32",
31
- "@storybook/core-client": "6.4.0-beta.32",
32
- "@storybook/core-common": "6.4.0-beta.32",
33
- "@storybook/core-events": "6.4.0-beta.32",
34
- "@storybook/core-server": "6.4.0-beta.32",
35
- "@storybook/csf-tools": "6.4.0-beta.32",
36
- "@storybook/ember": "6.4.0-beta.32",
37
- "@storybook/html": "6.4.0-beta.32",
38
- "@storybook/instrumenter": "6.4.0-beta.32",
39
- "@storybook/manager-webpack4": "6.4.0-beta.32",
40
- "@storybook/manager-webpack5": "6.4.0-beta.32",
41
- "@storybook/marionette": "6.4.0-beta.32",
42
- "@storybook/marko": "6.4.0-beta.32",
43
- "@storybook/mithril": "6.4.0-beta.32",
44
- "@storybook/node-logger": "6.4.0-beta.32",
45
- "@storybook/postinstall": "6.4.0-beta.32",
46
- "@storybook/preact": "6.4.0-beta.32",
47
- "@storybook/rax": "6.4.0-beta.32",
48
- "@storybook/react": "6.4.0-beta.32",
49
- "@storybook/riot": "6.4.0-beta.32",
50
- "@storybook/router": "6.4.0-beta.32",
51
- "@storybook/server": "6.4.0-beta.32",
52
- "@storybook/source-loader": "6.4.0-beta.32",
53
- "@storybook/svelte": "6.4.0-beta.32",
54
- "@storybook/theming": "6.4.0-beta.32",
55
- "@storybook/ui": "6.4.0-beta.32",
56
- "@storybook/vue": "6.4.0-beta.32",
57
- "@storybook/vue3": "6.4.0-beta.32",
58
- "@storybook/web-components": "6.4.0-beta.32"
2
+ "@storybook/addon-a11y": "6.4.0-beta.33",
3
+ "@storybook/addon-actions": "6.4.0-beta.33",
4
+ "@storybook/addon-backgrounds": "6.4.0-beta.33",
5
+ "@storybook/addon-controls": "6.4.0-beta.33",
6
+ "@storybook/addon-docs": "6.4.0-beta.33",
7
+ "@storybook/addon-essentials": "6.4.0-beta.33",
8
+ "@storybook/addon-interactions": "6.4.0-beta.33",
9
+ "@storybook/addon-jest": "6.4.0-beta.33",
10
+ "@storybook/addon-links": "6.4.0-beta.33",
11
+ "@storybook/addon-storyshots": "6.4.0-beta.33",
12
+ "@storybook/addon-storyshots-puppeteer": "6.4.0-beta.33",
13
+ "@storybook/addon-storysource": "6.4.0-beta.33",
14
+ "@storybook/addon-toolbars": "6.4.0-beta.33",
15
+ "@storybook/addon-viewport": "6.4.0-beta.33",
16
+ "@storybook/addons": "6.4.0-beta.33",
17
+ "@storybook/angular": "6.4.0-beta.33",
18
+ "@storybook/api": "6.4.0-beta.33",
19
+ "@storybook/aurelia": "6.4.0-beta.33",
20
+ "@storybook/builder-webpack4": "6.4.0-beta.33",
21
+ "@storybook/builder-webpack5": "6.4.0-beta.33",
22
+ "@storybook/channel-postmessage": "6.4.0-beta.33",
23
+ "@storybook/channel-websocket": "6.4.0-beta.33",
24
+ "@storybook/channels": "6.4.0-beta.33",
25
+ "@storybook/cli": "6.4.0-beta.33",
26
+ "@storybook/client-api": "6.4.0-beta.33",
27
+ "@storybook/client-logger": "6.4.0-beta.33",
28
+ "@storybook/codemod": "6.4.0-beta.33",
29
+ "@storybook/components": "6.4.0-beta.33",
30
+ "@storybook/core": "6.4.0-beta.33",
31
+ "@storybook/core-client": "6.4.0-beta.33",
32
+ "@storybook/core-common": "6.4.0-beta.33",
33
+ "@storybook/core-events": "6.4.0-beta.33",
34
+ "@storybook/core-server": "6.4.0-beta.33",
35
+ "@storybook/csf-tools": "6.4.0-beta.33",
36
+ "@storybook/ember": "6.4.0-beta.33",
37
+ "@storybook/html": "6.4.0-beta.33",
38
+ "@storybook/instrumenter": "6.4.0-beta.33",
39
+ "@storybook/manager-webpack4": "6.4.0-beta.33",
40
+ "@storybook/manager-webpack5": "6.4.0-beta.33",
41
+ "@storybook/marionette": "6.4.0-beta.33",
42
+ "@storybook/marko": "6.4.0-beta.33",
43
+ "@storybook/mithril": "6.4.0-beta.33",
44
+ "@storybook/node-logger": "6.4.0-beta.33",
45
+ "@storybook/postinstall": "6.4.0-beta.33",
46
+ "@storybook/preact": "6.4.0-beta.33",
47
+ "@storybook/rax": "6.4.0-beta.33",
48
+ "@storybook/react": "6.4.0-beta.33",
49
+ "@storybook/riot": "6.4.0-beta.33",
50
+ "@storybook/router": "6.4.0-beta.33",
51
+ "@storybook/server": "6.4.0-beta.33",
52
+ "@storybook/source-loader": "6.4.0-beta.33",
53
+ "@storybook/svelte": "6.4.0-beta.33",
54
+ "@storybook/theming": "6.4.0-beta.33",
55
+ "@storybook/ui": "6.4.0-beta.33",
56
+ "@storybook/vue": "6.4.0-beta.33",
57
+ "@storybook/vue3": "6.4.0-beta.33",
58
+ "@storybook/web-components": "6.4.0-beta.33"
59
59
  }
@@ -3,5 +3,5 @@ interface FixOptions {
3
3
  yes?: boolean;
4
4
  dryRun?: boolean;
5
5
  }
6
- export declare const automigrate: ({ fixId, dryRun, yes }: FixOptions) => Promise<void>;
6
+ export declare const automigrate: ({ fixId, dryRun, yes }?: FixOptions) => Promise<void>;
7
7
  export {};
@@ -22,6 +22,7 @@ export declare const webpack_react: Parameters;
22
22
  export declare const react_in_yarn_workspace: Parameters;
23
23
  export declare const angular10: Parameters;
24
24
  export declare const angular11: Parameters;
25
+ export declare const angular12: Parameters;
25
26
  export declare const angular: Parameters;
26
27
  export declare const web_components: Parameters;
27
28
  export declare const web_components_typescript: Parameters;
@@ -3,5 +3,5 @@ interface FixOptions {
3
3
  yes?: boolean;
4
4
  dryRun?: boolean;
5
5
  }
6
- export declare const automigrate: ({ fixId, dryRun, yes }: FixOptions) => Promise<void>;
6
+ export declare const automigrate: ({ fixId, dryRun, yes }?: FixOptions) => Promise<void>;
7
7
  export {};
@@ -22,6 +22,7 @@ export declare const webpack_react: Parameters;
22
22
  export declare const react_in_yarn_workspace: Parameters;
23
23
  export declare const angular10: Parameters;
24
24
  export declare const angular11: Parameters;
25
+ export declare const angular12: Parameters;
25
26
  export declare const angular: Parameters;
26
27
  export declare const web_components: Parameters;
27
28
  export declare const web_components_typescript: Parameters;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "6.4.0-beta.32",
3
+ "version": "6.4.0-beta.33",
4
4
  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
5
5
  "keywords": [
6
6
  "cli",
@@ -48,10 +48,10 @@
48
48
  "dependencies": {
49
49
  "@babel/core": "^7.12.10",
50
50
  "@babel/preset-env": "^7.12.11",
51
- "@storybook/codemod": "6.4.0-beta.32",
52
- "@storybook/core-common": "6.4.0-beta.32",
53
- "@storybook/csf-tools": "6.4.0-beta.32",
54
- "@storybook/node-logger": "6.4.0-beta.32",
51
+ "@storybook/codemod": "6.4.0-beta.33",
52
+ "@storybook/core-common": "6.4.0-beta.33",
53
+ "@storybook/csf-tools": "6.4.0-beta.33",
54
+ "@storybook/node-logger": "6.4.0-beta.33",
55
55
  "@storybook/semver": "^7.3.2",
56
56
  "boxen": "^5.1.2",
57
57
  "chalk": "^4.1.0",
@@ -76,7 +76,7 @@
76
76
  "update-notifier": "^5.0.1"
77
77
  },
78
78
  "devDependencies": {
79
- "@storybook/client-api": "6.4.0-beta.32",
79
+ "@storybook/client-api": "6.4.0-beta.33",
80
80
  "@types/cross-spawn": "^6.0.2",
81
81
  "@types/prompts": "^2.0.9",
82
82
  "@types/puppeteer-core": "^2.1.0",
@@ -92,5 +92,5 @@
92
92
  "publishConfig": {
93
93
  "access": "public"
94
94
  },
95
- "gitHead": "0f99f609b55928e48cca7c57f6e343d079bb94dd"
95
+ "gitHead": "c85171dc319d1d3a31eee1b762f01ba84ae45194"
96
96
  }