Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade emotion deps again #19054

Merged
merged 4 commits into from
Sep 8, 2022
Merged

Upgrade emotion deps again #19054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35d00a0
Upgrade Emotion deps
Andarist Aug 30, 2022
b433471
Revert temporary workarounds for a bundling issue
Andarist Aug 30, 2022
72f2ab1
Add the emotion package to themind deps instead of adding it to all e…
Andarist Aug 30, 2022
f11a6ed
Merge branch 'next' into upgrade-emotion-deps-again
ndelangen Sep 8, 2022
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
2 changes: 1 addition & 1 deletion code/addons/storyshots/storyshots-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"devDependencies": {
"@angular/core": "^13.3.6",
"@angular/platform-browser-dynamic": "^13.3.6",
"@emotion/jest": "^11.8.0",
"@emotion/jest": "^11.10.0",
"@storybook/addon-docs": "7.0.0-alpha.26",
"@storybook/angular": "7.0.0-alpha.26",
"@storybook/react": "7.0.0-alpha.26",
Expand Down
2 changes: 1 addition & 1 deletion code/examples/official-storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"storyshots-puppeteer": "storybook build && yarn run do-storyshots-puppeteer"
},
"devDependencies": {
"@emotion/jest": "^11.8.0",
"@emotion/jest": "^11.10.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
"@storybook/addon-a11y": "7.0.0-alpha.26",
"@storybook/addon-actions": "7.0.0-alpha.26",
Expand Down
4 changes: 0 additions & 4 deletions code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,6 @@ export default async (
{
message: /export '\S+' was not found in 'global'/,
},
{
message:
/require function is used in a way in which dependencies cannot be statically extracted/,
},
],
plugins: [
Object.keys(virtualModuleMapping).length > 0
Expand Down
8 changes: 4 additions & 4 deletions code/lib/theming/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"memoizerific": "^1.11.3"
},
"devDependencies": {
"@emotion/cache": "^11.7.1",
"@emotion/is-prop-valid": "^1.1.2",
"@emotion/react": "^11.8.1",
"@emotion/styled": "^11.8.1",
"@emotion/cache": "^11.10.3",
"@emotion/is-prop-valid": "^1.2.0",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@types/fs-extra": "^9.0.6",
"@types/node": "^14.14.20 || ^16.0.0",
"deep-object-diff": "^1.1.0",
Expand Down
16 changes: 1 addition & 15 deletions code/lib/theming/scripts/fix-theme-type-export.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { readFile, writeFile } from 'fs-extra';
import { dedent } from 'ts-dedent';
import { join } from 'path';

async function editIndexTypeDefinitionsFile() {
const run = async () => {
const target = join(process.cwd(), 'dist', 'index.d.ts');
const contents = await readFile(target, 'utf8');

Expand All @@ -20,20 +20,6 @@ async function editIndexTypeDefinitionsFile() {
`;

await writeFile(target, newContents);
}

async function editIndexESMFile() {
const target = join(process.cwd(), 'dist', 'index.mjs');
const contents = await readFile(target, 'utf8');

const newContents = contents.replace(/\.useInsertionEffect/g, `['useInsertion'+'Effect']`);

await writeFile(target, newContents);
}

const run = async () => {
await editIndexTypeDefinitionsFile();
await editIndexESMFile();
};

run().catch((e) => {
Expand Down
4 changes: 2 additions & 2 deletions code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
"@babel/preset-typescript": "^7.16.7",
"@babel/runtime": "^7.17.2",
"@compodoc/compodoc": "^1.1.18",
"@emotion/babel-plugin": "^11.7.2",
"@emotion/jest": "^11.8.0",
"@emotion/babel-plugin": "^11.10.2",
"@emotion/jest": "^11.10.0",
"@linear/sdk": "^1.21.0",
"@nicolo-ribaudo/chokidar-2": "^2.1.8",
"@nrwl/cli": "12.3.4",
Expand Down
51 changes: 31 additions & 20 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2811,7 +2811,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/babel-plugin@npm:^11.10.0, @emotion/babel-plugin@npm:^11.7.2":
"@emotion/babel-plugin@npm:^11.10.0, @emotion/babel-plugin@npm:^11.10.2":
version: 11.10.2
resolution: "@emotion/babel-plugin@npm:11.10.2"
dependencies:
Expand All @@ -2833,7 +2833,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/cache@npm:^11.10.0, @emotion/cache@npm:^11.7.1":
"@emotion/cache@npm:^11.10.0, @emotion/cache@npm:^11.10.3":
version: 11.10.3
resolution: "@emotion/cache@npm:11.10.3"
dependencies:
Expand Down Expand Up @@ -2872,7 +2872,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/is-prop-valid@npm:^1.1.2, @emotion/is-prop-valid@npm:^1.2.0":
"@emotion/is-prop-valid@npm:^1.2.0":
version: 1.2.0
resolution: "@emotion/is-prop-valid@npm:1.2.0"
dependencies:
Expand All @@ -2881,7 +2881,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/jest@npm:^11.8.0":
"@emotion/jest@npm:^11.10.0":
version: 11.10.0
resolution: "@emotion/jest@npm:11.10.0"
dependencies:
Expand Down Expand Up @@ -2916,14 +2916,15 @@ __metadata:
languageName: node
linkType: hard

"@emotion/react@npm:^11.8.1":
version: 11.10.0
resolution: "@emotion/react@npm:11.10.0"
"@emotion/react@npm:^11.10.4":
version: 11.10.4
resolution: "@emotion/react@npm:11.10.4"
dependencies:
"@babel/runtime": ^7.18.3
"@emotion/babel-plugin": ^11.10.0
"@emotion/cache": ^11.10.0
"@emotion/serialize": ^1.1.0
"@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
"@emotion/utils": ^1.2.0
"@emotion/weak-memoize": ^0.3.0
hoist-non-react-statics: ^3.3.1
Expand All @@ -2935,7 +2936,7 @@ __metadata:
optional: true
"@types/react":
optional: true
checksum: 51c30698a2f81a541ec6f474665906906d9eb718a5d25567d00b24511701c1bb6563b203370f47adc65ee312591ad3366a214bae565bc386f15a5eebfd1ac967
checksum: da447676d10050b14534f9e903d8a058d4cdfa82f58caf4da5c150a55b2019a8b45187989085faa4b075db92f7df7abe188eb76fe5377a57516631ccf299367b
languageName: node
linkType: hard

Expand All @@ -2959,14 +2960,15 @@ __metadata:
languageName: node
linkType: hard

"@emotion/styled@npm:^11.8.1":
version: 11.10.0
resolution: "@emotion/styled@npm:11.10.0"
"@emotion/styled@npm:^11.10.4":
version: 11.10.4
resolution: "@emotion/styled@npm:11.10.4"
dependencies:
"@babel/runtime": ^7.18.3
"@emotion/babel-plugin": ^11.10.0
"@emotion/is-prop-valid": ^1.2.0
"@emotion/serialize": ^1.1.0
"@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
"@emotion/utils": ^1.2.0
peerDependencies:
"@babel/core": ^7.0.0
Expand All @@ -2977,7 +2979,7 @@ __metadata:
optional: true
"@types/react":
optional: true
checksum: 3ba6c5d79b4ba7f4bfdb84bb2a824f00186922995479b6cfe62aaee03d1464c7e8c923d38be7085be5ac074b71338b59fc1bea6ff64e85a9101f3b10a87c68cf
checksum: 8067243991d31025967e993410298ca4c558e05e3b99e319d2734b022478001ac5b0fae7a010ba7fd5a74b762d264a17e5bddffbe09841c19857ab9b077077f3
languageName: node
linkType: hard

Expand All @@ -2995,6 +2997,15 @@ __metadata:
languageName: node
linkType: hard

"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.0":
version: 1.0.0
resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.0"
peerDependencies:
react: ">=16.8.0"
checksum: 0c5fbd36a4f416a5abaf428ba3dca6e79018c4c74016ecb4e3991a11cf8b5dbd306d7770fee09692971335e33f97e3b555deda595e5ae7831841505078bd07d7
languageName: node
linkType: hard

"@emotion/utils@npm:^1.2.0":
version: 1.2.0
resolution: "@emotion/utils@npm:1.2.0"
Expand Down Expand Up @@ -7274,7 +7285,7 @@ __metadata:
dependencies:
"@angular/core": ^13.3.6
"@angular/platform-browser-dynamic": ^13.3.6
"@emotion/jest": ^11.8.0
"@emotion/jest": ^11.10.0
"@jest/transform": ^26.6.2
"@storybook/addon-docs": 7.0.0-alpha.26
"@storybook/addons": 7.0.0-alpha.26
Expand Down Expand Up @@ -9063,8 +9074,8 @@ __metadata:
"@compodoc/compodoc": ^1.1.18
"@cypress/skip-test": ^2.6.1
"@cypress/webpack-preprocessor": ^5.9.1
"@emotion/babel-plugin": ^11.7.2
"@emotion/jest": ^11.8.0
"@emotion/babel-plugin": ^11.10.2
"@emotion/jest": ^11.10.0
"@linear/sdk": ^1.21.0
"@nicolo-ribaudo/chokidar-2": ^2.1.8
"@nrwl/cli": 12.3.4
Expand Down Expand Up @@ -9562,10 +9573,10 @@ __metadata:
version: 0.0.0-use.local
resolution: "@storybook/theming@workspace:lib/theming"
dependencies:
"@emotion/cache": ^11.7.1
"@emotion/is-prop-valid": ^1.1.2
"@emotion/react": ^11.8.1
"@emotion/styled": ^11.8.1
"@emotion/cache": ^11.10.3
"@emotion/is-prop-valid": ^1.2.0
"@emotion/react": ^11.10.4
"@emotion/styled": ^11.10.4
"@storybook/client-logger": 7.0.0-alpha.26
"@types/fs-extra": ^9.0.6
"@types/node": ^14.14.20 || ^16.0.0
Expand Down Expand Up @@ -33525,7 +33536,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "official-storybook@workspace:examples/official-storybook"
dependencies:
"@emotion/jest": ^11.8.0
"@emotion/jest": ^11.10.0
"@pmmmwh/react-refresh-webpack-plugin": ^0.5.5
"@storybook/addon-a11y": 7.0.0-alpha.26
"@storybook/addon-actions": 7.0.0-alpha.26
Expand Down
4 changes: 2 additions & 2 deletions scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@babel/preset-typescript": "^7.16.7",
"@babel/runtime": "^7.17.2",
"@compodoc/compodoc": "^1.1.18",
"@emotion/babel-plugin": "^11.7.2",
"@emotion/jest": "^11.8.0",
"@emotion/babel-plugin": "^11.10.2",
"@emotion/jest": "^11.10.0",
"@jest/globals": "^26.6.2",
"@linear/sdk": "^1.21.0",
"@nicolo-ribaudo/chokidar-2": "^2.1.8",
Expand Down
11 changes: 10 additions & 1 deletion scripts/prepare/bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,16 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => {
util: path.resolve('../node_modules/util/util.js'),
}),
],
external: [name, ...Object.keys(dependencies || {}), ...Object.keys(peerDependencies || {})],
external: [
name,
...Object.keys(dependencies || {}),
...Object.keys(peerDependencies || {}),
// it's a transitive dependency of `@storybook/theming` that we want to keep external
// because it uses `React.insertionEffect` conditionally in a way that doesn't conflict with bundlers
// the bundled version gets changed though and creates problems when a bundle gets consumed later
// while this is only a dep of `@storybook/theming`, it should be safe to just add this here, for all packages
'@emotion/use-insertion-effect-with-fallbacks',
],

dts:
optimized && tsConfigExists
Expand Down
Loading