Skip to content

Commit

Permalink
Merge pull request #27730 from storybookjs/kasper/change-exports-order
Browse files Browse the repository at this point in the history 
Build: Change require/import order, so that import has higher prio if both are specified
  • Loading branch information
@kasperpeulen
kasperpeulen authored Jun 5, 2024
2 parents 68809b6 + d6c4aff commit b43f792
Show file tree
Hide file tree
Showing 68 changed files with 246 additions and 246 deletions.
8 changes: 4 additions & 4 deletions code/addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
12 changes: 6 additions & 6 deletions code/addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./decorator": {
"types": "./dist/decorator.d.ts",
"require": "./dist/decorator.js",
"import": "./dist/decorator.mjs"
"import": "./dist/decorator.mjs",
"require": "./dist/decorator.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register.js": "./dist/manager.js",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/controls/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
30 changes: 15 additions & 15 deletions code/addons/docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,44 @@
"license": "MIT",
"exports": {
".": {
"node": "./dist/index.js",
"types": "./dist/index.d.ts",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"node": "./dist/index.js",
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./preset": {
"types": "./dist/preset.d.ts",
"require": "./dist/preset.js",
"import": "./dist/preset.js"
"import": "./dist/preset.js",
"require": "./dist/preset.js"
},
"./blocks": {
"types": "./dist/blocks.d.ts",
"require": "./dist/blocks.js",
"import": "./dist/blocks.mjs"
"import": "./dist/blocks.mjs",
"require": "./dist/blocks.js"
},
"./dist/preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./dist/preset": {
"types": "./dist/preset.d.ts",
"require": "./dist/preset.js"
},
"./dist/shims/mdx-react-shim": {
"types": "./dist/shims/mdx-react-shim.d.ts",
"require": "./dist/shims/mdx-react-shim.js",
"import": "./dist/shims/mdx-react-shim.mjs"
"import": "./dist/shims/mdx-react-shim.mjs",
"require": "./dist/shims/mdx-react-shim.js"
},
"./mdx-react-shim": {
"types": "./dist/shims/mdx-react-shim.d.ts",
"require": "./dist/shims/mdx-react-shim.js",
"import": "./dist/shims/mdx-react-shim.mjs"
"import": "./dist/shims/mdx-react-shim.mjs",
"require": "./dist/shims/mdx-react-shim.js"
},
"./mdx-loader": "./dist/mdx-loader.js",
"./svelte/HOC.svelte": "./svelte/HOC.svelte",
Expand Down
6 changes: 3 additions & 3 deletions code/addons/essentials/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"license": "MIT",
"exports": {
".": {
"node": "./dist/index.js",
"types": "./dist/index.d.ts",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"node": "./dist/index.js",
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./actions/preview": {
"types": "./dist/actions/preview.d.ts",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/highlight/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./package.json": "./package.json"
},
Expand Down
8 changes: 4 additions & 4 deletions code/addons/interactions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./preset": "./dist/preset.js",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/jest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
12 changes: 6 additions & 6 deletions code/addons/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./react": {
"types": "./dist/react/index.d.ts",
"require": "./dist/react/index.js",
"import": "./dist/react/index.mjs"
"import": "./dist/react/index.mjs",
"require": "./dist/react/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/measure/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/onboarding/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./manager": "./dist/manager.js",
"./preset": "./dist/preset.js",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/outline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/storysource/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preset": "./dist/preset.js",
"./manager": "./dist/manager.js",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/themes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./package.json": "./package.json",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/toolbars/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./manager": "./dist/manager.js",
"./register": "./dist/manager.js",
Expand Down
8 changes: 4 additions & 4 deletions code/addons/viewport/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./manager": "./dist/manager.js",
"./package.json": "./package.json"
Expand Down
4 changes: 2 additions & 2 deletions code/builders/builder-manager/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./package.json": "./package.json"
},
Expand Down
4 changes: 2 additions & 2 deletions code/builders/builder-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./input/iframe.html": "./input/iframe.html",
"./package.json": "./package.json"
Expand Down
4 changes: 2 additions & 2 deletions code/builders/builder-webpack5/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./presets/custom-webpack-preset": {
"types": "./dist/presets/custom-webpack-preset.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/html-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preset": {
"types": "./dist/preset.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions code/frameworks/html-webpack5/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
".": {
"types": "./dist/index.d.ts",
"node": "./dist/index.js",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./preset": {
"types": "./dist/preset.d.ts",
Expand Down
Loading

0 comments on commit b43f792

Please sign in to comment.