Skip to content

Commit 7a561f4

Browse files
valentinpalkovicvalentinpalkovic
authored
Merge branch 'next' into valentin/introduce-skip-compiler-typescript-option
2 parents 217b11e + df35702 commit 7a561f4

File tree

159 files changed

+1195
-1429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1195
-1429
lines changed

‎.github/workflows/generate-sandboxes-main.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ jobs:
3030
git config --global user.name "Storybook Bot"
3131
git config --global user.email "[email protected]"
3232
- name: Install dependencies
33-
run: node ./scripts/check-dependencies.js
33+
run: |
34+
cd ./scripts
35+
node --loader esbuild-register/loader -r esbuild-register ./check-dependencies.ts
36+
cd ..
3437
- name: Compile Storybook libraries
3538
run: yarn task --task compile --start-from=auto --no-link
3639
- name: Publishing to local registry

‎.github/workflows/generate-sandboxes-next.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ jobs:
3030
git config --global user.name "Storybook Bot"
3131
git config --global user.email "[email protected]"
3232
- name: Install dependencies
33-
run: node ./scripts/check-dependencies.js
33+
run: |
34+
cd ./scripts
35+
node --loader esbuild-register/loader -r esbuild-register ./check-dependencies.ts
36+
cd ..
3437
- name: Compile Storybook libraries
3538
run: yarn task --task compile --start-from=auto --no-link
3639
- name: Publishing to local registry

‎CHANGELOG.prerelease.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 7.6.0-alpha.6
2+
3+
- Addon: Move Visual Test addon to the code directory - [#24771](https://github.com/storybookjs/storybook/pull/24771), thanks [@cdedreuille](https://github.com/cdedreuille)!
4+
- FastBuild: Improve config loading & naming - [#24837](https://github.com/storybookjs/storybook/pull/24837), thanks [@ndelangen](https://github.com/ndelangen)!
5+
- TestBuild: Revert defaulting to SWC in test build, but keep using esbuild for minification - [#24843](https://github.com/storybookjs/storybook/pull/24843), thanks [@kasperpeulen](https://github.com/kasperpeulen)!
6+
- Viewport: Add newer device viewports - [#24777](https://github.com/storybookjs/storybook/pull/24777), thanks [@Tomo5524](https://github.com/Tomo5524)!
7+
- Vite: Prevent non-deterministic build output - [#24833](https://github.com/storybookjs/storybook/pull/24833), thanks [@henkerik](https://github.com/henkerik)!
8+
19
## 7.6.0-alpha.5
210

311
- Addons, core: Make `react` and Storybook packages `devDependencies` where possible - [#24676](https://github.com/storybookjs/storybook/pull/24676), thanks [@JReinhold](https://github.com/JReinhold)!

‎code/.eslintrc.js

+60-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
const path = require('path');
2+
const fs = require('fs');
23

34
const scriptPath = path.join(__dirname, '..', 'scripts');
45

6+
const addonsPackages = fs
7+
.readdirSync(path.join(__dirname, 'addons'))
8+
.filter((p) => fs.statSync(path.join(__dirname, 'addons', p)).isDirectory());
9+
const libPackages = fs
10+
.readdirSync(path.join(__dirname, 'lib'))
11+
.filter((p) => fs.statSync(path.join(__dirname, 'lib', p)).isDirectory());
12+
const uiPackages = fs
13+
.readdirSync(path.join(__dirname, 'ui'))
14+
.filter((p) => fs.statSync(path.join(__dirname, 'ui', p)).isDirectory())
15+
.filter((p) => !p.startsWith('.'));
16+
517
module.exports = {
618
root: true,
719
extends: [path.join(scriptPath, '.eslintrc.cjs')],
@@ -53,7 +65,6 @@ module.exports = {
5365
project: null,
5466
},
5567
rules: {
56-
// '@typescript-eslint/no-var-requires': 'off',
5768
'@typescript-eslint/dot-notation': 'off',
5869
'@typescript-eslint/no-implied-eval': 'off',
5970
'@typescript-eslint/no-throw-literal': 'off',
@@ -77,15 +88,7 @@ module.exports = {
7788
},
7889
{
7990
// these packages use pre-bundling, dependencies will be bundled, and will be in devDepenencies
80-
files: [
81-
'addons/**/*',
82-
'frameworks/**/*',
83-
'lib/**/*',
84-
'builders/**/*',
85-
'deprecated/**/*',
86-
'renderers/**/*',
87-
'ui/**/*',
88-
],
91+
files: ['frameworks/**/*', 'builders/**/*', 'deprecated/**/*', 'renderers/**/*'],
8992
excludedFiles: ['frameworks/angular/**/*', 'frameworks/ember/**/*', 'lib/core-server/**/*'],
9093
rules: {
9194
'import/no-extraneous-dependencies': [
@@ -95,11 +98,47 @@ module.exports = {
9598
},
9699
},
97100
{
98-
files: ['**/ui/*', '**/ui/.storybook/*'],
101+
files: ['**/ui/.storybook/**'],
99102
rules: {
100-
'import/no-extraneous-dependencies': ['error', { packageDir: __dirname }],
103+
'import/no-extraneous-dependencies': [
104+
'error',
105+
{ packageDir: [__dirname], devDependencies: true },
106+
],
101107
},
102108
},
109+
...addonsPackages.map((directory) => ({
110+
files: [path.join('**', 'addons', directory, '**', '*.*')],
111+
rules: {
112+
'import/no-extraneous-dependencies': [
113+
'error',
114+
{
115+
packageDir: [__dirname, path.join(__dirname, 'addons', directory)],
116+
devDependencies: true,
117+
},
118+
],
119+
},
120+
})),
121+
...uiPackages.map((directory) => ({
122+
files: [path.join('**', 'ui', directory, '**', '*.*')],
123+
rules: {
124+
'import/no-extraneous-dependencies': [
125+
'error',
126+
{ packageDir: [__dirname, path.join(__dirname, 'ui', directory)], devDependencies: true },
127+
],
128+
},
129+
})),
130+
...libPackages.map((directory) => ({
131+
files: [path.join('**', 'lib', directory, '**', '*.*')],
132+
rules: {
133+
'import/no-extraneous-dependencies': [
134+
'error',
135+
{
136+
packageDir: [__dirname, path.join(__dirname, 'lib', directory)],
137+
devDependencies: true,
138+
},
139+
],
140+
},
141+
})),
103142
{
104143
files: [
105144
'**/__tests__/**',
@@ -121,16 +160,24 @@ module.exports = {
121160
'react/require-default-props': 'off',
122161
},
123162
},
124-
{ files: '**/.storybook/config.js', rules: { 'global-require': 'off' } },
125163
{
126164
files: ['**/*.stories.*'],
127165
rules: {
128166
'no-console': 'off',
129167
},
130168
},
169+
{
170+
files: ['**/renderers/preact/**/*'],
171+
rules: {
172+
'react/react-in-jsx-scope': 'off',
173+
'react/prop-types': 'off',
174+
},
175+
},
131176
{
132177
files: ['**/*.tsx', '**/*.ts'],
133178
rules: {
179+
'no-shadow': 'off',
180+
'@typescript-eslint/ban-types': 'warn', // should become error, in the future
134181
'react/require-default-props': 'off',
135182
'react/prop-types': 'off', // we should use types
136183
'react/forbid-prop-types': 'off', // we should use types

‎code/addons/a11y/package.json

+19-38
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-a11y",
3-
"version": "7.6.0-alpha.5",
3+
"version": "7.6.0-alpha.6",
44
"description": "Test component compliance with web accessibility standards",
55
"keywords": [
66
"a11y",
@@ -32,21 +32,9 @@
3232
"require": "./dist/index.js",
3333
"import": "./dist/index.mjs"
3434
},
35-
"./manager": {
36-
"types": "./dist/manager.d.ts",
37-
"require": "./dist/manager.js",
38-
"import": "./dist/manager.mjs"
39-
},
40-
"./preview": {
41-
"types": "./dist/preview.d.ts",
42-
"require": "./dist/preview.js",
43-
"import": "./dist/preview.mjs"
44-
},
45-
"./register": {
46-
"types": "./dist/manager.d.ts",
47-
"require": "./dist/manager.js",
48-
"import": "./dist/manager.mjs"
49-
},
35+
"./manager": "./dist/manager.js",
36+
"./preview": "./dist/preview.js",
37+
"./register": "./dist/manager.js",
5038
"./package.json": "./package.json"
5139
},
5240
"main": "dist/index.js",
@@ -61,47 +49,40 @@
6149
],
6250
"scripts": {
6351
"check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts",
64-
"prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
52+
"prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/addon-bundle.ts"
6553
},
6654
"dependencies": {
6755
"@storybook/addon-highlight": "workspace:*",
56+
"axe-core": "^4.2.0"
57+
},
58+
"devDependencies": {
6859
"@storybook/channels": "workspace:*",
6960
"@storybook/client-logger": "workspace:*",
7061
"@storybook/components": "workspace:*",
71-
"@storybook/core-events": "workspace:*",
7262
"@storybook/global": "^5.0.0",
7363
"@storybook/manager-api": "workspace:*",
7464
"@storybook/preview-api": "workspace:*",
7565
"@storybook/theming": "workspace:*",
7666
"@storybook/types": "workspace:*",
77-
"axe-core": "^4.2.0",
78-
"lodash": "^4.17.21",
79-
"react-resize-detector": "^7.1.2"
80-
},
81-
"devDependencies": {
8267
"@testing-library/react": "^11.2.2",
68+
"lodash": "^4.17.21",
69+
"react": "^16.8.0",
70+
"react-dom": "^16.8.0",
71+
"react-resize-detector": "^7.1.2",
8372
"resize-observer-polyfill": "^1.5.1",
8473
"typescript": "~4.9.3"
8574
},
86-
"peerDependencies": {
87-
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
88-
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
89-
},
90-
"peerDependenciesMeta": {
91-
"react": {
92-
"optional": true
93-
},
94-
"react-dom": {
95-
"optional": true
96-
}
97-
},
9875
"publishConfig": {
9976
"access": "public"
10077
},
10178
"bundler": {
102-
"entries": [
103-
"./src/index.ts",
104-
"./src/manager.tsx",
79+
"exportEntries": [
80+
"./src/index.ts"
81+
],
82+
"managerEntries": [
83+
"./src/manager.tsx"
84+
],
85+
"previewEntries": [
10586
"./src/preview.tsx"
10687
]
10788
},

‎code/addons/actions/package.json

+21-49
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-actions",
3-
"version": "7.6.0-alpha.5",
3+
"version": "7.6.0-alpha.6",
44
"description": "Get UI feedback when an action is performed on an interactive element",
55
"keywords": [
66
"storybook",
@@ -33,21 +33,9 @@
3333
"require": "./dist/decorator.js",
3434
"import": "./dist/decorator.mjs"
3535
},
36-
"./manager": {
37-
"types": "./dist/manager.d.ts",
38-
"require": "./dist/manager.js",
39-
"import": "./dist/manager.mjs"
40-
},
41-
"./preview": {
42-
"types": "./dist/preview.d.ts",
43-
"require": "./dist/preview.js",
44-
"import": "./dist/preview.mjs"
45-
},
46-
"./register.js": {
47-
"types": "./dist/manager.d.ts",
48-
"require": "./dist/manager.js",
49-
"import": "./dist/manager.mjs"
50-
},
36+
"./manager": "./dist/manager.js",
37+
"./preview": "./dist/preview.js",
38+
"./register.js": "./dist/manager.js",
5139
"./package.json": "./package.json"
5240
},
5341
"main": "dist/index.js",
@@ -58,14 +46,8 @@
5846
"*": [
5947
"dist/index.d.ts"
6048
],
61-
"manager": [
62-
"dist/manager.d.ts"
63-
],
6449
"decorator": [
6550
"dist/decorator.d.ts"
66-
],
67-
"preview": [
68-
"dist/preview.d.ts"
6951
]
7052
}
7153
},
@@ -78,51 +60,41 @@
7860
],
7961
"scripts": {
8062
"check": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/check.ts",
81-
"prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
63+
"prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/addon-bundle.ts"
8264
},
8365
"dependencies": {
66+
"@storybook/global": "^5.0.0",
67+
"@types/uuid": "^9.0.1",
68+
"dequal": "^2.0.2",
69+
"polished": "^4.2.2",
70+
"uuid": "^9.0.0"
71+
},
72+
"devDependencies": {
8473
"@storybook/client-logger": "workspace:*",
8574
"@storybook/components": "workspace:*",
8675
"@storybook/core-events": "workspace:*",
87-
"@storybook/global": "^5.0.0",
8876
"@storybook/manager-api": "workspace:*",
8977
"@storybook/preview-api": "workspace:*",
9078
"@storybook/theming": "workspace:*",
9179
"@storybook/types": "workspace:*",
92-
"dequal": "^2.0.2",
93-
"lodash": "^4.17.21",
94-
"polished": "^4.2.2",
95-
"prop-types": "^15.7.2",
80+
"react": "^16.8.0",
81+
"react-dom": "^16.8.0",
9682
"react-inspector": "^6.0.0",
9783
"telejson": "^7.2.0",
98-
"ts-dedent": "^2.0.0",
99-
"uuid": "^9.0.0"
100-
},
101-
"devDependencies": {
102-
"@types/lodash": "^4.14.167",
103-
"@types/uuid": "^9.0.1",
10484
"typescript": "~4.9.3"
10585
},
106-
"peerDependencies": {
107-
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
108-
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
109-
},
110-
"peerDependenciesMeta": {
111-
"react": {
112-
"optional": true
113-
},
114-
"react-dom": {
115-
"optional": true
116-
}
117-
},
11886
"publishConfig": {
11987
"access": "public"
12088
},
12189
"bundler": {
122-
"entries": [
123-
"./src/index.ts",
90+
"exportEntries": [
12491
"./src/decorator.ts",
125-
"./src/manager.tsx",
92+
"./src/index.ts"
93+
],
94+
"managerEntries": [
95+
"./src/manager.tsx"
96+
],
97+
"previewEntries": [
12698
"./src/preview.ts"
12799
]
128100
},

0 commit comments

Comments
 (0)