@storybook/cli 6.5.0-beta.1 → 6.5.0-beta.4
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/builder-vite.js +2 -2
- package/dist/cjs/automigrate/fixes/eslint-plugin.js +3 -3
- package/dist/cjs/automigrate/fixes/mainjsFramework.js +2 -2
- package/dist/cjs/automigrate/fixes/webpack5.js +2 -2
- package/dist/cjs/detect.js +14 -2
- package/dist/cjs/generate.js +5 -0
- package/dist/cjs/initiate.js +17 -10
- package/dist/cjs/js-package-manager/JsPackageManager.js +6 -6
- package/dist/cjs/js-package-manager/PackageJson.js +5 -1
- package/dist/cjs/js-package-manager/PackageJsonHelper.js +1 -1
- package/dist/cjs/upgrade.js +24 -8
- package/dist/cjs/versions.js +57 -56
- package/dist/esm/automigrate/fixes/builder-vite.js +2 -2
- package/dist/esm/automigrate/fixes/eslint-plugin.js +3 -3
- package/dist/esm/automigrate/fixes/mainjsFramework.js +2 -2
- package/dist/esm/automigrate/fixes/webpack5.js +2 -2
- package/dist/esm/detect.js +14 -2
- package/dist/esm/generate.js +5 -0
- package/dist/esm/initiate.js +17 -10
- package/dist/esm/js-package-manager/JsPackageManager.js +6 -6
- package/dist/esm/js-package-manager/PackageJson.js +5 -1
- package/dist/esm/js-package-manager/PackageJsonHelper.js +1 -1
- package/dist/esm/upgrade.js +24 -8
- package/dist/esm/versions.js +57 -56
- package/dist/modern/automigrate/fixes/builder-vite.js +2 -2
- package/dist/modern/automigrate/fixes/eslint-plugin.js +3 -3
- package/dist/modern/automigrate/fixes/mainjsFramework.js +2 -2
- package/dist/modern/automigrate/fixes/webpack5.js +2 -2
- package/dist/modern/detect.js +14 -2
- package/dist/modern/generate.js +5 -0
- package/dist/modern/initiate.js +17 -10
- package/dist/modern/js-package-manager/JsPackageManager.js +6 -6
- package/dist/modern/js-package-manager/PackageJson.js +5 -1
- package/dist/modern/js-package-manager/PackageJsonHelper.js +1 -1
- package/dist/modern/upgrade.js +24 -8
- package/dist/modern/versions.js +57 -56
- package/dist/ts3.4/detect.d.ts +1 -1
- package/dist/ts3.4/initiate.d.ts +1 -0
- package/dist/ts3.4/js-package-manager/PackageJson.d.ts +2 -8
- package/dist/ts3.4/js-package-manager/PackageJsonHelper.d.ts +2 -2
- package/dist/ts3.4/upgrade.d.ts +2 -1
- package/dist/ts3.4/versions.d.ts +1 -0
- package/dist/ts3.9/detect.d.ts +1 -1
- package/dist/ts3.9/initiate.d.ts +1 -0
- package/dist/ts3.9/js-package-manager/PackageJson.d.ts +2 -8
- package/dist/ts3.9/js-package-manager/PackageJsonHelper.d.ts +2 -2
- package/dist/ts3.9/upgrade.d.ts +2 -1
- package/dist/ts3.9/versions.d.ts +1 -0
- package/package.json +8 -7
- package/dist/cjs/automigrate/helpers/getStorybookConfiguration.js +0 -27
- package/dist/cjs/automigrate/helpers/getStorybookInfo.js +0 -94
- package/dist/esm/automigrate/helpers/getStorybookConfiguration.js +0 -27
- package/dist/esm/automigrate/helpers/getStorybookInfo.js +0 -94
- package/dist/modern/automigrate/helpers/getStorybookConfiguration.js +0 -27
- package/dist/modern/automigrate/helpers/getStorybookInfo.js +0 -94
- package/dist/ts3.4/automigrate/helpers/getStorybookConfiguration.d.ts +0 -1
- package/dist/ts3.4/automigrate/helpers/getStorybookInfo.d.ts +0 -11
- package/dist/ts3.9/automigrate/helpers/getStorybookConfiguration.d.ts +0 -1
- package/dist/ts3.9/automigrate/helpers/getStorybookInfo.d.ts +0 -11
|
@@ -74,13 +74,13 @@ class JsPackageManager {
|
|
|
74
74
|
|
|
75
75
|
|
|
76
76
|
retrievePackageJson() {
|
|
77
|
-
let packageJson
|
|
77
|
+
let packageJson;
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
packageJson = (0, _PackageJsonHelper.readPackageJson)()
|
|
79
|
+
try {
|
|
80
|
+
packageJson = (0, _PackageJsonHelper.readPackageJson)();
|
|
81
|
+
} catch (err) {
|
|
82
|
+
this.initPackageJson();
|
|
83
|
+
packageJson = (0, _PackageJsonHelper.readPackageJson)();
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
return Object.assign({}, packageJson, {
|
|
@@ -16,7 +16,7 @@ function readPackageJson() {
|
|
|
16
16
|
const packageJsonPath = _path.default.resolve('package.json');
|
|
17
17
|
|
|
18
18
|
if (!_fs.default.existsSync(packageJsonPath)) {
|
|
19
|
-
|
|
19
|
+
throw new Error(`Could not read package.json file at ${packageJsonPath}`);
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
const jsonContent = _fs.default.readFileSync(packageJsonPath, 'utf8');
|
package/dist/esm/upgrade.js
CHANGED
|
@@ -11,6 +11,8 @@ require("core-js/modules/es.promise.js");
|
|
|
11
11
|
|
|
12
12
|
var _crossSpawn = require("cross-spawn");
|
|
13
13
|
|
|
14
|
+
var _telemetry = require("@storybook/telemetry");
|
|
15
|
+
|
|
14
16
|
var _semver = _interopRequireDefault(require("@storybook/semver"));
|
|
15
17
|
|
|
16
18
|
var _nodeLogger = require("@storybook/node-logger");
|
|
@@ -21,8 +23,12 @@ var _helpers = require("./helpers");
|
|
|
21
23
|
|
|
22
24
|
var _automigrate = require("./automigrate");
|
|
23
25
|
|
|
26
|
+
const _excluded = ["prerelease", "skipCheck", "useNpm", "dryRun", "yes"];
|
|
27
|
+
|
|
24
28
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
25
29
|
|
|
30
|
+
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; }
|
|
31
|
+
|
|
26
32
|
const versionRegex = /(@storybook\/[^@]+)@(\S+)/;
|
|
27
33
|
|
|
28
34
|
const getStorybookVersion = line => {
|
|
@@ -36,7 +42,7 @@ const getStorybookVersion = line => {
|
|
|
36
42
|
};
|
|
37
43
|
|
|
38
44
|
exports.getStorybookVersion = getStorybookVersion;
|
|
39
|
-
const excludeList = ['@storybook/linter-config', '@storybook/design-system', '@storybook/ember-cli-storybook', '@storybook/semver', '@storybook/eslint-config-storybook', '@storybook/bench', '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', '@storybook/storybook-deployer', '@storybook/addon-postcss', '@storybook/react-docgen-typescript-plugin', '@storybook/babel-plugin-require-context-hook', '@storybook/builder-vite', '@storybook/mdx1-csf', '@storybook/mdx2-csf'];
|
|
45
|
+
const excludeList = ['@storybook/linter-config', '@storybook/design-system', '@storybook/ember-cli-storybook', '@storybook/semver', '@storybook/eslint-config-storybook', '@storybook/bench', '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', '@storybook/storybook-deployer', '@storybook/addon-postcss', '@storybook/react-docgen-typescript-plugin', '@storybook/babel-plugin-require-context-hook', '@storybook/builder-vite', '@storybook/mdx1-csf', '@storybook/mdx2-csf', '@storybook/expect', '@storybook/jest', '@storybook/test-runner', '@storybook/testing-library'];
|
|
40
46
|
|
|
41
47
|
const isCorePackage = pkg => pkg.startsWith('@storybook/') && !pkg.startsWith('@storybook/preset-') && !excludeList.includes(pkg);
|
|
42
48
|
|
|
@@ -120,16 +126,26 @@ const addExtraFlags = (extraFlags, flags, {
|
|
|
120
126
|
|
|
121
127
|
exports.addExtraFlags = addExtraFlags;
|
|
122
128
|
|
|
123
|
-
const upgrade = async
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
129
|
+
const upgrade = async _ref => {
|
|
130
|
+
let {
|
|
131
|
+
prerelease,
|
|
132
|
+
skipCheck,
|
|
133
|
+
useNpm,
|
|
134
|
+
dryRun,
|
|
135
|
+
yes
|
|
136
|
+
} = _ref,
|
|
137
|
+
options = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
138
|
+
|
|
130
139
|
const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(useNpm);
|
|
131
140
|
|
|
132
141
|
(0, _helpers.commandLog)(`Checking for latest versions of '@storybook/*' packages`);
|
|
142
|
+
|
|
143
|
+
if (!options.disableTelemetry) {
|
|
144
|
+
(0, _telemetry.telemetry)('upgrade', {
|
|
145
|
+
prerelease
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
|
|
133
149
|
let flags = [];
|
|
134
150
|
if (!dryRun) flags.push('--upgrade');
|
|
135
151
|
flags.push('--target');
|
package/dist/esm/versions.js
CHANGED
|
@@ -6,61 +6,62 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
// auto generated file, do not edit
|
|
8
8
|
var _default = {
|
|
9
|
-
'@storybook/addon-a11y': '6.5.0-beta.
|
|
10
|
-
'@storybook/addon-actions': '6.5.0-beta.
|
|
11
|
-
'@storybook/addon-backgrounds': '6.5.0-beta.
|
|
12
|
-
'@storybook/addon-controls': '6.5.0-beta.
|
|
13
|
-
'@storybook/addon-docs': '6.5.0-beta.
|
|
14
|
-
'@storybook/addon-essentials': '6.5.0-beta.
|
|
15
|
-
'@storybook/addon-interactions': '6.5.0-beta.
|
|
16
|
-
'@storybook/addon-jest': '6.5.0-beta.
|
|
17
|
-
'@storybook/addon-links': '6.5.0-beta.
|
|
18
|
-
'@storybook/addon-measure': '6.5.0-beta.
|
|
19
|
-
'@storybook/addon-outline': '6.5.0-beta.
|
|
20
|
-
'@storybook/addon-storyshots': '6.5.0-beta.
|
|
21
|
-
'@storybook/addon-storyshots-puppeteer': '6.5.0-beta.
|
|
22
|
-
'@storybook/addon-storysource': '6.5.0-beta.
|
|
23
|
-
'@storybook/addon-toolbars': '6.5.0-beta.
|
|
24
|
-
'@storybook/addon-viewport': '6.5.0-beta.
|
|
25
|
-
'@storybook/addons': '6.5.0-beta.
|
|
26
|
-
'@storybook/angular': '6.5.0-beta.
|
|
27
|
-
'@storybook/api': '6.5.0-beta.
|
|
28
|
-
'@storybook/builder-webpack4': '6.5.0-beta.
|
|
29
|
-
'@storybook/builder-webpack5': '6.5.0-beta.
|
|
30
|
-
'@storybook/channel-postmessage': '6.5.0-beta.
|
|
31
|
-
'@storybook/channel-websocket': '6.5.0-beta.
|
|
32
|
-
'@storybook/channels': '6.5.0-beta.
|
|
33
|
-
'@storybook/cli': '6.5.0-beta.
|
|
34
|
-
'@storybook/client-api': '6.5.0-beta.
|
|
35
|
-
'@storybook/client-logger': '6.5.0-beta.
|
|
36
|
-
'@storybook/codemod': '6.5.0-beta.
|
|
37
|
-
'@storybook/components': '6.5.0-beta.
|
|
38
|
-
'@storybook/core': '6.5.0-beta.
|
|
39
|
-
'@storybook/core-client': '6.5.0-beta.
|
|
40
|
-
'@storybook/core-common': '6.5.0-beta.
|
|
41
|
-
'@storybook/core-events': '6.5.0-beta.
|
|
42
|
-
'@storybook/core-server': '6.5.0-beta.
|
|
43
|
-
'@storybook/csf-tools': '6.5.0-beta.
|
|
44
|
-
'@storybook/docs-tools': '6.5.0-beta.
|
|
45
|
-
'@storybook/ember': '6.5.0-beta.
|
|
46
|
-
'@storybook/html': '6.5.0-beta.
|
|
47
|
-
'@storybook/instrumenter': '6.5.0-beta.
|
|
48
|
-
'@storybook/manager-webpack4': '6.5.0-beta.
|
|
49
|
-
'@storybook/manager-webpack5': '6.5.0-beta.
|
|
50
|
-
'@storybook/node-logger': '6.5.0-beta.
|
|
51
|
-
'@storybook/postinstall': '6.5.0-beta.
|
|
52
|
-
'@storybook/preact': '6.5.0-beta.
|
|
53
|
-
'@storybook/preview-web': '6.5.0-beta.
|
|
54
|
-
'@storybook/react': '6.5.0-beta.
|
|
55
|
-
'@storybook/router': '6.5.0-beta.
|
|
56
|
-
'@storybook/server': '6.5.0-beta.
|
|
57
|
-
'@storybook/source-loader': '6.5.0-beta.
|
|
58
|
-
'@storybook/store': '6.5.0-beta.
|
|
59
|
-
'@storybook/svelte': '6.5.0-beta.
|
|
60
|
-
'@storybook/
|
|
61
|
-
'@storybook/
|
|
62
|
-
'@storybook/
|
|
63
|
-
'@storybook/
|
|
64
|
-
'@storybook/
|
|
9
|
+
'@storybook/addon-a11y': '6.5.0-beta.4',
|
|
10
|
+
'@storybook/addon-actions': '6.5.0-beta.4',
|
|
11
|
+
'@storybook/addon-backgrounds': '6.5.0-beta.4',
|
|
12
|
+
'@storybook/addon-controls': '6.5.0-beta.4',
|
|
13
|
+
'@storybook/addon-docs': '6.5.0-beta.4',
|
|
14
|
+
'@storybook/addon-essentials': '6.5.0-beta.4',
|
|
15
|
+
'@storybook/addon-interactions': '6.5.0-beta.4',
|
|
16
|
+
'@storybook/addon-jest': '6.5.0-beta.4',
|
|
17
|
+
'@storybook/addon-links': '6.5.0-beta.4',
|
|
18
|
+
'@storybook/addon-measure': '6.5.0-beta.4',
|
|
19
|
+
'@storybook/addon-outline': '6.5.0-beta.4',
|
|
20
|
+
'@storybook/addon-storyshots': '6.5.0-beta.4',
|
|
21
|
+
'@storybook/addon-storyshots-puppeteer': '6.5.0-beta.4',
|
|
22
|
+
'@storybook/addon-storysource': '6.5.0-beta.4',
|
|
23
|
+
'@storybook/addon-toolbars': '6.5.0-beta.4',
|
|
24
|
+
'@storybook/addon-viewport': '6.5.0-beta.4',
|
|
25
|
+
'@storybook/addons': '6.5.0-beta.4',
|
|
26
|
+
'@storybook/angular': '6.5.0-beta.4',
|
|
27
|
+
'@storybook/api': '6.5.0-beta.4',
|
|
28
|
+
'@storybook/builder-webpack4': '6.5.0-beta.4',
|
|
29
|
+
'@storybook/builder-webpack5': '6.5.0-beta.4',
|
|
30
|
+
'@storybook/channel-postmessage': '6.5.0-beta.4',
|
|
31
|
+
'@storybook/channel-websocket': '6.5.0-beta.4',
|
|
32
|
+
'@storybook/channels': '6.5.0-beta.4',
|
|
33
|
+
'@storybook/cli': '6.5.0-beta.4',
|
|
34
|
+
'@storybook/client-api': '6.5.0-beta.4',
|
|
35
|
+
'@storybook/client-logger': '6.5.0-beta.4',
|
|
36
|
+
'@storybook/codemod': '6.5.0-beta.4',
|
|
37
|
+
'@storybook/components': '6.5.0-beta.4',
|
|
38
|
+
'@storybook/core': '6.5.0-beta.4',
|
|
39
|
+
'@storybook/core-client': '6.5.0-beta.4',
|
|
40
|
+
'@storybook/core-common': '6.5.0-beta.4',
|
|
41
|
+
'@storybook/core-events': '6.5.0-beta.4',
|
|
42
|
+
'@storybook/core-server': '6.5.0-beta.4',
|
|
43
|
+
'@storybook/csf-tools': '6.5.0-beta.4',
|
|
44
|
+
'@storybook/docs-tools': '6.5.0-beta.4',
|
|
45
|
+
'@storybook/ember': '6.5.0-beta.4',
|
|
46
|
+
'@storybook/html': '6.5.0-beta.4',
|
|
47
|
+
'@storybook/instrumenter': '6.5.0-beta.4',
|
|
48
|
+
'@storybook/manager-webpack4': '6.5.0-beta.4',
|
|
49
|
+
'@storybook/manager-webpack5': '6.5.0-beta.4',
|
|
50
|
+
'@storybook/node-logger': '6.5.0-beta.4',
|
|
51
|
+
'@storybook/postinstall': '6.5.0-beta.4',
|
|
52
|
+
'@storybook/preact': '6.5.0-beta.4',
|
|
53
|
+
'@storybook/preview-web': '6.5.0-beta.4',
|
|
54
|
+
'@storybook/react': '6.5.0-beta.4',
|
|
55
|
+
'@storybook/router': '6.5.0-beta.4',
|
|
56
|
+
'@storybook/server': '6.5.0-beta.4',
|
|
57
|
+
'@storybook/source-loader': '6.5.0-beta.4',
|
|
58
|
+
'@storybook/store': '6.5.0-beta.4',
|
|
59
|
+
'@storybook/svelte': '6.5.0-beta.4',
|
|
60
|
+
'@storybook/telemetry': '6.5.0-beta.4',
|
|
61
|
+
'@storybook/theming': '6.5.0-beta.4',
|
|
62
|
+
'@storybook/ui': '6.5.0-beta.4',
|
|
63
|
+
'@storybook/vue': '6.5.0-beta.4',
|
|
64
|
+
'@storybook/vue3': '6.5.0-beta.4',
|
|
65
|
+
'@storybook/web-components': '6.5.0-beta.4'
|
|
65
66
|
};
|
|
66
67
|
exports.default = _default;
|
|
@@ -13,7 +13,7 @@ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
|
|
|
13
13
|
|
|
14
14
|
var _csfTools = require("@storybook/csf-tools");
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _coreCommon = require("@storybook/core-common");
|
|
17
17
|
|
|
18
18
|
var _jsPackageManager = require("../../js-package-manager");
|
|
19
19
|
|
|
@@ -39,7 +39,7 @@ const builderVite = {
|
|
|
39
39
|
const packageJson = packageManager.retrievePackageJson();
|
|
40
40
|
const {
|
|
41
41
|
mainConfig
|
|
42
|
-
} = (0,
|
|
42
|
+
} = (0, _coreCommon.getStorybookInfo)(packageJson);
|
|
43
43
|
|
|
44
44
|
if (!mainConfig) {
|
|
45
45
|
logger.warn('Unable to find storybook main.js config');
|
|
@@ -13,9 +13,9 @@ var _tsDedent = _interopRequireDefault(require("ts-dedent"));
|
|
|
13
13
|
|
|
14
14
|
var _csfTools = require("@storybook/csf-tools");
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _coreCommon = require("@storybook/core-common");
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _getEslintInfo = require("../helpers/getEslintInfo");
|
|
19
19
|
|
|
20
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
21
|
|
|
@@ -45,7 +45,7 @@ const eslintPlugin = {
|
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
const config = (0,
|
|
48
|
+
const config = (0, _coreCommon.getStorybookInfo)(packageJson);
|
|
49
49
|
const {
|
|
50
50
|
mainConfig
|
|
51
51
|
} = config;
|
|
@@ -15,7 +15,7 @@ var _semver = _interopRequireDefault(require("@storybook/semver"));
|
|
|
15
15
|
|
|
16
16
|
var _csfTools = require("@storybook/csf-tools");
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _coreCommon = require("@storybook/core-common");
|
|
19
19
|
|
|
20
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
21
|
|
|
@@ -33,7 +33,7 @@ const mainjsFramework = {
|
|
|
33
33
|
mainConfig,
|
|
34
34
|
framework,
|
|
35
35
|
version: storybookVersion
|
|
36
|
-
} = (0,
|
|
36
|
+
} = (0, _coreCommon.getStorybookInfo)(packageJson);
|
|
37
37
|
|
|
38
38
|
if (!mainConfig) {
|
|
39
39
|
logger.warn('Unable to find storybook main.js config, skipping');
|
|
@@ -15,7 +15,7 @@ var _semver = _interopRequireDefault(require("@storybook/semver"));
|
|
|
15
15
|
|
|
16
16
|
var _csfTools = require("@storybook/csf-tools");
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _coreCommon = require("@storybook/core-common");
|
|
19
19
|
|
|
20
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
21
|
|
|
@@ -40,7 +40,7 @@ const webpack5 = {
|
|
|
40
40
|
const {
|
|
41
41
|
mainConfig,
|
|
42
42
|
version: storybookVersion
|
|
43
|
-
} = (0,
|
|
43
|
+
} = (0, _coreCommon.getStorybookInfo)(packageJson);
|
|
44
44
|
const storybookCoerced = storybookVersion && ((_semver$coerce = _semver.default.coerce(storybookVersion)) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version);
|
|
45
45
|
|
|
46
46
|
if (!storybookCoerced) {
|
package/dist/modern/detect.js
CHANGED
|
@@ -168,7 +168,13 @@ function isStorybookInstalled(dependencies, force) {
|
|
|
168
168
|
|
|
169
169
|
function detectLanguage() {
|
|
170
170
|
let language = _project_types.SupportedLanguage.JAVASCRIPT;
|
|
171
|
-
|
|
171
|
+
let packageJson;
|
|
172
|
+
|
|
173
|
+
try {
|
|
174
|
+
packageJson = (0, _jsPackageManager.readPackageJson)();
|
|
175
|
+
} catch (err) {//
|
|
176
|
+
}
|
|
177
|
+
|
|
172
178
|
const bowerJson = (0, _helpers.getBowerJson)();
|
|
173
179
|
|
|
174
180
|
if (!packageJson && !bowerJson) {
|
|
@@ -183,7 +189,13 @@ function detectLanguage() {
|
|
|
183
189
|
}
|
|
184
190
|
|
|
185
191
|
function detect(options = {}) {
|
|
186
|
-
|
|
192
|
+
let packageJson;
|
|
193
|
+
|
|
194
|
+
try {
|
|
195
|
+
packageJson = (0, _jsPackageManager.readPackageJson)();
|
|
196
|
+
} catch (err) {//
|
|
197
|
+
}
|
|
198
|
+
|
|
187
199
|
const bowerJson = (0, _helpers.getBowerJson)();
|
|
188
200
|
|
|
189
201
|
if (!packageJson && !bowerJson) {
|
package/dist/modern/generate.js
CHANGED
|
@@ -39,6 +39,11 @@ const pkg = (0, _readPkgUp.sync)({
|
|
|
39
39
|
}).packageJson;
|
|
40
40
|
const logger = console;
|
|
41
41
|
|
|
42
|
+
_commander.default.option('--disable-telemetry', 'disable sending telemetry data', // default value is false, but if the user sets STORYBOOK_DISABLE_TELEMETRY, it can be true
|
|
43
|
+
process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMETRY !== 'false');
|
|
44
|
+
|
|
45
|
+
_commander.default.option('--enable-crash-reports', 'enable sending crash reports to telemetry data');
|
|
46
|
+
|
|
42
47
|
_commander.default.command('init').description('Initialize Storybook into your project.').option('-f --force', 'Force add Storybook').option('-s --skip-install', 'Skip installing deps').option('-N --use-npm', 'Use npm to install deps').option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser').option('-t --type <type>', 'Add Storybook for a specific project type').option('-y --yes', 'Answer yes to all prompts').option('-b --builder <builder>', 'Builder library').option('-l --linkable', 'Prepare installation for link (contributor helper)').action(options => (0, _initiate.initiate)(options, pkg));
|
|
43
48
|
|
|
44
49
|
_commander.default.command('add <addon>').description('Add an addon to your Storybook').option('-N --use-npm', 'Use NPM to build the Storybook server').option('-s --skip-postinstall', 'Skip package specific postinstall config modifications').action((addonName, options) => (0, _add.add)(addonName, options));
|
package/dist/modern/initiate.js
CHANGED
|
@@ -15,10 +15,12 @@ var _chalk = _interopRequireDefault(require("chalk"));
|
|
|
15
15
|
|
|
16
16
|
var _prompts = _interopRequireDefault(require("prompts"));
|
|
17
17
|
|
|
18
|
-
var
|
|
18
|
+
var _telemetry = require("@storybook/telemetry");
|
|
19
19
|
|
|
20
20
|
var _project_types = require("./project_types");
|
|
21
21
|
|
|
22
|
+
var _detect = require("./detect");
|
|
23
|
+
|
|
22
24
|
var _helpers = require("./helpers");
|
|
23
25
|
|
|
24
26
|
var _ANGULAR = _interopRequireDefault(require("./generators/ANGULAR"));
|
|
@@ -73,9 +75,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
73
75
|
|
|
74
76
|
const logger = console;
|
|
75
77
|
|
|
76
|
-
const installStorybook = (projectType, options) => {
|
|
77
|
-
const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(options.useNpm);
|
|
78
|
-
|
|
78
|
+
const installStorybook = (projectType, packageManager, options) => {
|
|
79
79
|
const npmOptions = {
|
|
80
80
|
installAsDevDependencies: true,
|
|
81
81
|
skipInstall: options.skipInstall
|
|
@@ -213,7 +213,7 @@ const installStorybook = (projectType, options) => {
|
|
|
213
213
|
(0, _helpers.paddedLog)('You can specify a project type explicitly via `sb init --type <type>`, see our docs on how to configure Storybook for your framework: https://storybook.js.org/docs/react/get-started/install'); // Add a new line for the clear visibility.
|
|
214
214
|
|
|
215
215
|
logger.log();
|
|
216
|
-
return projectTypeInquirer(options);
|
|
216
|
+
return projectTypeInquirer(options, packageManager);
|
|
217
217
|
}
|
|
218
218
|
};
|
|
219
219
|
|
|
@@ -223,7 +223,7 @@ const installStorybook = (projectType, options) => {
|
|
|
223
223
|
});
|
|
224
224
|
};
|
|
225
225
|
|
|
226
|
-
const projectTypeInquirer = async options => {
|
|
226
|
+
const projectTypeInquirer = async (options, packageManager) => {
|
|
227
227
|
const manualAnswer = options.yes ? true : await (0, _prompts.default)([{
|
|
228
228
|
type: 'confirm',
|
|
229
229
|
name: 'manual',
|
|
@@ -240,15 +240,22 @@ const projectTypeInquirer = async options => {
|
|
|
240
240
|
value: type.toUpperCase()
|
|
241
241
|
}))
|
|
242
242
|
}]);
|
|
243
|
-
return installStorybook(frameworkAnswer.manualFramework, options);
|
|
243
|
+
return installStorybook(frameworkAnswer.manualFramework, packageManager, options);
|
|
244
244
|
}
|
|
245
245
|
|
|
246
246
|
return Promise.resolve();
|
|
247
247
|
};
|
|
248
248
|
|
|
249
249
|
async function initiate(options, pkg) {
|
|
250
|
+
const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(options.useNpm);
|
|
251
|
+
|
|
250
252
|
const welcomeMessage = 'sb init - the simplest way to add a Storybook to your project.';
|
|
251
|
-
logger.log(_chalk.default.inverse(`\n ${welcomeMessage} \n`));
|
|
253
|
+
logger.log(_chalk.default.inverse(`\n ${welcomeMessage} \n`));
|
|
254
|
+
|
|
255
|
+
if (!options.disableTelemetry) {
|
|
256
|
+
(0, _telemetry.telemetry)('init');
|
|
257
|
+
} // Update notify code.
|
|
258
|
+
|
|
252
259
|
|
|
253
260
|
new _updateNotifier.UpdateNotifier({
|
|
254
261
|
pkg,
|
|
@@ -259,7 +266,7 @@ async function initiate(options, pkg) {
|
|
|
259
266
|
const projectTypeProvided = options.type;
|
|
260
267
|
const infoText = projectTypeProvided ? `Installing Storybook for user specified project type: ${projectTypeProvided}` : 'Detecting project type';
|
|
261
268
|
const done = (0, _helpers.commandLog)(infoText);
|
|
262
|
-
const packageJson =
|
|
269
|
+
const packageJson = packageManager.retrievePackageJson();
|
|
263
270
|
const isEsm = packageJson && packageJson.type === 'module';
|
|
264
271
|
|
|
265
272
|
try {
|
|
@@ -286,7 +293,7 @@ async function initiate(options, pkg) {
|
|
|
286
293
|
}
|
|
287
294
|
|
|
288
295
|
done();
|
|
289
|
-
await installStorybook(projectType, Object.assign({}, options, isEsm ? {
|
|
296
|
+
await installStorybook(projectType, packageManager, Object.assign({}, options, isEsm ? {
|
|
290
297
|
commonJs: true
|
|
291
298
|
} : undefined));
|
|
292
299
|
await (0, _automigrate.automigrate)();
|
|
@@ -74,13 +74,13 @@ class JsPackageManager {
|
|
|
74
74
|
|
|
75
75
|
|
|
76
76
|
retrievePackageJson() {
|
|
77
|
-
let packageJson
|
|
77
|
+
let packageJson;
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
packageJson = (0, _PackageJsonHelper.readPackageJson)()
|
|
79
|
+
try {
|
|
80
|
+
packageJson = (0, _PackageJsonHelper.readPackageJson)();
|
|
81
|
+
} catch (err) {
|
|
82
|
+
this.initPackageJson();
|
|
83
|
+
packageJson = (0, _PackageJsonHelper.readPackageJson)();
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
return Object.assign({}, packageJson, {
|
|
@@ -16,7 +16,7 @@ function readPackageJson() {
|
|
|
16
16
|
const packageJsonPath = _path.default.resolve('package.json');
|
|
17
17
|
|
|
18
18
|
if (!_fs.default.existsSync(packageJsonPath)) {
|
|
19
|
-
|
|
19
|
+
throw new Error(`Could not read package.json file at ${packageJsonPath}`);
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
const jsonContent = _fs.default.readFileSync(packageJsonPath, 'utf8');
|
package/dist/modern/upgrade.js
CHANGED
|
@@ -11,6 +11,8 @@ require("core-js/modules/es.promise.js");
|
|
|
11
11
|
|
|
12
12
|
var _crossSpawn = require("cross-spawn");
|
|
13
13
|
|
|
14
|
+
var _telemetry = require("@storybook/telemetry");
|
|
15
|
+
|
|
14
16
|
var _semver = _interopRequireDefault(require("@storybook/semver"));
|
|
15
17
|
|
|
16
18
|
var _nodeLogger = require("@storybook/node-logger");
|
|
@@ -21,8 +23,12 @@ var _helpers = require("./helpers");
|
|
|
21
23
|
|
|
22
24
|
var _automigrate = require("./automigrate");
|
|
23
25
|
|
|
26
|
+
const _excluded = ["prerelease", "skipCheck", "useNpm", "dryRun", "yes"];
|
|
27
|
+
|
|
24
28
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
25
29
|
|
|
30
|
+
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; }
|
|
31
|
+
|
|
26
32
|
const versionRegex = /(@storybook\/[^@]+)@(\S+)/;
|
|
27
33
|
|
|
28
34
|
const getStorybookVersion = line => {
|
|
@@ -36,7 +42,7 @@ const getStorybookVersion = line => {
|
|
|
36
42
|
};
|
|
37
43
|
|
|
38
44
|
exports.getStorybookVersion = getStorybookVersion;
|
|
39
|
-
const excludeList = ['@storybook/linter-config', '@storybook/design-system', '@storybook/ember-cli-storybook', '@storybook/semver', '@storybook/eslint-config-storybook', '@storybook/bench', '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', '@storybook/storybook-deployer', '@storybook/addon-postcss', '@storybook/react-docgen-typescript-plugin', '@storybook/babel-plugin-require-context-hook', '@storybook/builder-vite', '@storybook/mdx1-csf', '@storybook/mdx2-csf'];
|
|
45
|
+
const excludeList = ['@storybook/linter-config', '@storybook/design-system', '@storybook/ember-cli-storybook', '@storybook/semver', '@storybook/eslint-config-storybook', '@storybook/bench', '@storybook/addon-bench', '@storybook/addon-console', '@storybook/csf', '@storybook/storybook-deployer', '@storybook/addon-postcss', '@storybook/react-docgen-typescript-plugin', '@storybook/babel-plugin-require-context-hook', '@storybook/builder-vite', '@storybook/mdx1-csf', '@storybook/mdx2-csf', '@storybook/expect', '@storybook/jest', '@storybook/test-runner', '@storybook/testing-library'];
|
|
40
46
|
|
|
41
47
|
const isCorePackage = pkg => pkg.startsWith('@storybook/') && !pkg.startsWith('@storybook/preset-') && !excludeList.includes(pkg);
|
|
42
48
|
|
|
@@ -120,16 +126,26 @@ const addExtraFlags = (extraFlags, flags, {
|
|
|
120
126
|
|
|
121
127
|
exports.addExtraFlags = addExtraFlags;
|
|
122
128
|
|
|
123
|
-
const upgrade = async
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
129
|
+
const upgrade = async _ref => {
|
|
130
|
+
let {
|
|
131
|
+
prerelease,
|
|
132
|
+
skipCheck,
|
|
133
|
+
useNpm,
|
|
134
|
+
dryRun,
|
|
135
|
+
yes
|
|
136
|
+
} = _ref,
|
|
137
|
+
options = _objectWithoutPropertiesLoose(_ref, _excluded);
|
|
138
|
+
|
|
130
139
|
const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(useNpm);
|
|
131
140
|
|
|
132
141
|
(0, _helpers.commandLog)(`Checking for latest versions of '@storybook/*' packages`);
|
|
142
|
+
|
|
143
|
+
if (!options.disableTelemetry) {
|
|
144
|
+
(0, _telemetry.telemetry)('upgrade', {
|
|
145
|
+
prerelease
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
|
|
133
149
|
let flags = [];
|
|
134
150
|
if (!dryRun) flags.push('--upgrade');
|
|
135
151
|
flags.push('--target');
|