Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5b050f7
step6 use an addon-builder
ndelangen Jul 17, 2023
156f6c6
fixes
ndelangen Jul 17, 2023
2b13f01
linting config changes
ndelangen Jul 17, 2023
2f9d1f6
peer deps where they make sense
ndelangen Jul 18, 2023
014a426
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 18, 2023
cf35f92
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 18, 2023
bc48c89
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 18, 2023
2cb9b56
make check possible with linking
ndelangen Jul 18, 2023
b42bfd7
fix
ndelangen Jul 18, 2023
1f9d61b
cleanup
ndelangen Jul 18, 2023
b51c07d
wip
ndelangen Jul 18, 2023
f70f050
remove react as peerDep of builder-webpack
ndelangen Jul 18, 2023
fb22d76
fix lockfile
ndelangen Jul 18, 2023
f7000c2
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 18, 2023
3164cb0
Merge branch 'norbert/react-peerdep-webpack-builder-removal' into nor…
ndelangen Jul 18, 2023
c217251
lockfile regen
ndelangen Jul 19, 2023
7d300ad
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 19, 2023
0871e71
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 19, 2023
26a01aa
fix typing in angular test
ndelangen Jul 19, 2023
9dcbc5c
fix test
ndelangen Jul 19, 2023
8a5948c
fix imports
ndelangen Jul 19, 2023
51f25e6
fix incorrect entry-category placement
ndelangen Jul 19, 2023
8fde681
make manager-ui ish packages have an optional peerDependency on `react`
ndelangen Jul 19, 2023
165c43e
break up instrumenter so preview code won't be injected into the manager
ndelangen Jul 19, 2023
0af3f5c
rename globalized packages so naming convention-wise are in sync betw…
ndelangen Jul 19, 2023
38b9552
split the addon bundle script into preview and manager
ndelangen Jul 19, 2023
471bd2c
add react as a optional peerDependency to addon-links
ndelangen Jul 19, 2023
f68ac78
use addon-bundler for docs
ndelangen Jul 19, 2023
f509295
Merge branch 'norbert/no-docs-addon-in-essentials-no-mdx-less-react' …
ndelangen Jul 19, 2023
431af43
fix linting
ndelangen Jul 19, 2023
7d2a08a
Merge branch 'norbert/no-docs-no-react-peers' of github.com:storybook…
ndelangen Jul 19, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 48 additions & 21 deletions code/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
const path = require('path');
const fs = require('fs');
const { join } = require('path');

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

const addonsPackages = fs
.readdirSync(path.join(__dirname, 'addons'))
.filter((p) => fs.statSync(join(__dirname, 'addons', p)).isDirectory());
const libPackages = fs
.readdirSync(path.join(__dirname, 'lib'))
.filter((p) => fs.statSync(join(__dirname, 'lib', p)).isDirectory());
const uiPackages = fs
.readdirSync(path.join(__dirname, 'ui'))
.filter((p) => fs.statSync(join(__dirname, 'ui', p)).isDirectory())
.filter((p) => !p.startsWith('.'));

module.exports = {
root: true,
extends: [path.join(scriptPath, '.eslintrc.js')],
Expand Down Expand Up @@ -52,32 +65,15 @@ module.exports = {
project: null,
},
rules: {
// '@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/dot-notation': 'off',
'@typescript-eslint/no-implied-eval': 'off',
'@typescript-eslint/no-throw-literal': 'off',
'@typescript-eslint/return-await': 'off',
},
},
{
// this package depends on a lot of peerDependencies we don't want to specify, because npm would install them
files: ['**/*.ts', '**/*.tsx'],
rules: {
'no-shadow': 'off',
'@typescript-eslint/ban-types': 'warn', // should become error, in the future
},
},
{
// these packages use pre-bundling, dependencies will be bundled, and will be in devDepenencies
files: [
'addons/**/*',
'frameworks/**/*',
'lib/**/*',
'builders/**/*',
'deprecated/**/*',
'renderers/**/*',
'ui/**/*',
],
files: ['frameworks/**/*', 'builders/**/*', 'deprecated/**/*', 'renderers/**/*'],
excludedFiles: ['frameworks/angular/**/*', 'frameworks/ember/**/*', 'lib/core-server/**/*'],
rules: {
'import/no-extraneous-dependencies': [
Expand All @@ -87,11 +83,41 @@ module.exports = {
},
},
{
files: ['**/ui/*', '**/ui/.storybook/*'],
files: ['**/ui/.storybook/**'],
rules: {
'import/no-extraneous-dependencies': ['error', { packageDir: __dirname }],
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname], devDependencies: true },
],
},
},
...addonsPackages.map((directory) => ({
files: [join('**', 'addons', directory, '**', '*.*')],
rules: {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, 'addons', directory)], devDependencies: true },
],
},
})),
...uiPackages.map((directory) => ({
files: [join('**', 'ui', directory, '**', '*.*')],
rules: {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, 'ui', directory)], devDependencies: true },
],
},
})),
...libPackages.map((directory) => ({
files: [join('**', 'lib', directory, '**', '*.*')],
rules: {
'import/no-extraneous-dependencies': [
'error',
{ packageDir: [__dirname, join(__dirname, 'lib', directory)], devDependencies: true },
],
},
})),
{
files: [
'**/__tests__/**',
Expand All @@ -113,7 +139,6 @@ module.exports = {
'react/require-default-props': 'off',
},
},
{ files: '**/.storybook/config.js', rules: { 'global-require': 'off' } },
{
files: ['**/*.stories.*'],
rules: {
Expand All @@ -123,6 +148,8 @@ module.exports = {
{
files: ['**/*.tsx', '**/*.ts'],
rules: {
'no-shadow': 'off',
'@typescript-eslint/ban-types': 'warn', // should become error, in the future
'react/require-default-props': 'off',
'react/prop-types': 'off', // we should use types
'react/forbid-prop-types': 'off', // we should use types
Expand Down
54 changes: 17 additions & 37 deletions code/addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,9 @@
"require": "./dist/index.js",
"import": "./dist/index.mjs"
},
"./manager": {
"types": "./dist/manager.d.ts",
"require": "./dist/manager.js",
"import": "./dist/manager.mjs"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
},
"./register": {
"types": "./dist/manager.d.ts",
"require": "./dist/manager.js",
"import": "./dist/manager.mjs"
},
"./manager": "./dist/manager.js",
"./preview": "./dist/preview.js",
"./register": "./dist/manager.js",
"./package.json": "./package.json"
},
"main": "dist/index.js",
Expand All @@ -60,10 +48,14 @@
],
"scripts": {
"check": "../../../scripts/prepare/check.ts",
"prep": "../../../scripts/prepare/bundle.ts"
"prep": "../../../scripts/prepare/addon-bundle.ts"
},
"dependencies": {
"@storybook/addon-highlight": "7.1.0",
"@storybook/types": "7.1.0",
"axe-core": "^4.2.0"
},
"devDependencies": {
"@storybook/channels": "7.1.0",
"@storybook/client-logger": "7.1.0",
"@storybook/components": "7.1.0",
Expand All @@ -72,35 +64,23 @@
"@storybook/manager-api": "7.1.0",
"@storybook/preview-api": "7.1.0",
"@storybook/theming": "7.1.0",
"@storybook/types": "7.1.0",
"axe-core": "^4.2.0",
"lodash": "^4.17.21",
"react-resize-detector": "^7.1.2"
},
"devDependencies": {
"@testing-library/react": "^11.2.2",
"lodash": "^4.17.21",
"react-resize-detector": "^7.1.2",
"resize-observer-polyfill": "^1.5.1",
"typescript": "~4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
"peerDependenciesMeta": {
"react": {
"optional": true
},
"react-dom": {
"optional": true
}
},
"publishConfig": {
"access": "public"
},
"bundler": {
"entries": [
"./src/index.ts",
"./src/manager.tsx",
"interfaceEntries": [
"./src/index.ts"
],
"managerEntries": [
"./src/manager.tsx"
],
"previewEntries": [
"./src/preview.tsx"
]
},
Expand Down
68 changes: 19 additions & 49 deletions code/addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,9 @@
"require": "./dist/decorator.js",
"import": "./dist/decorator.mjs"
},
"./manager": {
"types": "./dist/manager.d.ts",
"require": "./dist/manager.js",
"import": "./dist/manager.mjs"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
},
"./register.js": {
"types": "./dist/manager.d.ts",
"require": "./dist/manager.js",
"import": "./dist/manager.mjs"
},
"./manager": "./dist/manager.js",
"./preview": "./dist/preview.js",
"./register.js": "./dist/manager.js",
"./package.json": "./package.json"
},
"main": "dist/index.js",
Expand All @@ -58,14 +46,8 @@
"*": [
"dist/index.d.ts"
],
"manager": [
"dist/manager.d.ts"
],
"decorator": [
"dist/decorator.d.ts"
],
"preview": [
"dist/preview.d.ts"
]
}
},
Expand All @@ -77,51 +59,39 @@
],
"scripts": {
"check": "../../../scripts/prepare/check.ts",
"prep": "../../../scripts/prepare/bundle.ts"
"prep": "../../../scripts/prepare/addon-bundle.ts"
},
"dependencies": {
"@storybook/global": "^5.0.0",
"@storybook/types": "7.1.0",
"polished": "^4.2.2",
"telejson": "^7.0.3"
},
"devDependencies": {
"@storybook/client-logger": "7.1.0",
"@storybook/components": "7.1.0",
"@storybook/core-events": "7.1.0",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0",
"@storybook/preview-api": "7.1.0",
"@storybook/theming": "7.1.0",
"@storybook/types": "7.1.0",
"@types/uuid": "^9.0.1",
"dequal": "^2.0.2",
"lodash": "^4.17.21",
"polished": "^4.2.2",
"prop-types": "^15.7.2",
"react-inspector": "^6.0.0",
"telejson": "^7.0.3",
"ts-dedent": "^2.0.0",
"typescript": "~4.9.3",
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/lodash": "^4.14.167",
"@types/uuid": "^9.0.1",
"typescript": "~4.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
"peerDependenciesMeta": {
"react": {
"optional": true
},
"react-dom": {
"optional": true
}
},
"publishConfig": {
"access": "public"
},
"bundler": {
"entries": [
"./src/index.ts",
"interfaceEntries": [
"./src/decorator.ts",
"./src/manager.tsx",
"./src/index.ts"
],
"managerEntries": [
"./src/manager.tsx"
],
"previewEntries": [
"./src/preview.ts"
]
},
Expand Down
Loading