From 3c6983ee49a112e09157c161a9b369ff1fb8b716 Mon Sep 17 00:00:00 2001 From: pengx17 Date: Sat, 23 Mar 2024 06:33:25 +0000 Subject: [PATCH] fix(core): storybook build issue (#6274) 1. es2022 is required and should be set separately in storybook. 2. @blocksuite/icons versions are not consistent across packages. --- packages/frontend/component/.storybook/main.ts | 3 +++ packages/frontend/component/.storybook/polyfill.ts | 2 ++ packages/frontend/component/.storybook/preview.tsx | 1 + packages/frontend/component/package.json | 2 +- tests/storybook/.storybook/main.ts | 7 +++++-- tests/storybook/.storybook/polyfill.ts | 2 ++ tests/storybook/.storybook/preview.tsx | 1 + tests/storybook/package.json | 2 +- yarn.lock | 14 ++------------ 9 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 packages/frontend/component/.storybook/polyfill.ts create mode 100644 tests/storybook/.storybook/polyfill.ts diff --git a/packages/frontend/component/.storybook/main.ts b/packages/frontend/component/.storybook/main.ts index 85ee4598c..72dddbf3c 100644 --- a/packages/frontend/component/.storybook/main.ts +++ b/packages/frontend/component/.storybook/main.ts @@ -25,6 +25,9 @@ export default { async viteFinal(config, _options) { return mergeConfig(config, { plugins: [vanillaExtractPlugin()], + esbuild: { + target: 'ES2022', + }, define: { 'process.env': {}, 'process.env.COVERAGE': JSON.stringify(!!process.env.COVERAGE), diff --git a/packages/frontend/component/.storybook/polyfill.ts b/packages/frontend/component/.storybook/polyfill.ts new file mode 100644 index 000000000..615ed233c --- /dev/null +++ b/packages/frontend/component/.storybook/polyfill.ts @@ -0,0 +1,2 @@ +import 'core-js/modules/esnext.symbol.async-dispose'; +import 'core-js/modules/esnext.symbol.dispose'; diff --git a/packages/frontend/component/.storybook/preview.tsx b/packages/frontend/component/.storybook/preview.tsx index f47232491..e255d0ea0 100644 --- a/packages/frontend/component/.storybook/preview.tsx +++ b/packages/frontend/component/.storybook/preview.tsx @@ -1,3 +1,4 @@ +import './polyfill'; import '../src/theme/global.css'; import './preview.css'; import { ThemeProvider, useTheme } from 'next-themes'; diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json index e0e7a475a..3128056d4 100644 --- a/packages/frontend/component/package.json +++ b/packages/frontend/component/package.json @@ -75,7 +75,7 @@ "devDependencies": { "@blocksuite/blocks": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/global": "0.13.0-canary-202403140735-2367cd5", - "@blocksuite/icons": "2.1.45", + "@blocksuite/icons": "2.1.46", "@blocksuite/lit": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/presets": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/store": "0.13.0-canary-202403140735-2367cd5", diff --git a/tests/storybook/.storybook/main.ts b/tests/storybook/.storybook/main.ts index 6f4dc03f7..0295db780 100644 --- a/tests/storybook/.storybook/main.ts +++ b/tests/storybook/.storybook/main.ts @@ -1,7 +1,7 @@ import { runCli } from '@magic-works/i18n-codegen'; import type { StorybookConfig } from '@storybook/react-vite'; import { fileURLToPath } from 'node:url'; -import { mergeConfig } from 'vite'; +import { mergeConfig, type InlineConfig } from 'vite'; import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin'; import { getRuntimeConfig } from '@affine/cli/src/webpack/runtime-config'; @@ -40,7 +40,7 @@ export default { }); // disable for storybook build runtimeConfig.enableCloud = false; - return mergeConfig(config, { + return mergeConfig(config, { assetsInclude: ['**/*.md'], resolve: { alias: { @@ -51,6 +51,9 @@ export default { ), }, }, + esbuild: { + target: 'ES2022', + }, plugins: [vanillaExtractPlugin()], define: { 'process.on': 'undefined', diff --git a/tests/storybook/.storybook/polyfill.ts b/tests/storybook/.storybook/polyfill.ts new file mode 100644 index 000000000..615ed233c --- /dev/null +++ b/tests/storybook/.storybook/polyfill.ts @@ -0,0 +1,2 @@ +import 'core-js/modules/esnext.symbol.async-dispose'; +import 'core-js/modules/esnext.symbol.dispose'; diff --git a/tests/storybook/.storybook/preview.tsx b/tests/storybook/.storybook/preview.tsx index 8d863c68d..b24433e6f 100644 --- a/tests/storybook/.storybook/preview.tsx +++ b/tests/storybook/.storybook/preview.tsx @@ -1,3 +1,4 @@ +import './polyfill'; import '@affine/component/theme/global.css'; import '@affine/component/theme/theme.css'; import { createI18n } from '@affine/i18n'; diff --git a/tests/storybook/package.json b/tests/storybook/package.json index 45ff53e11..72f9c5f02 100644 --- a/tests/storybook/package.json +++ b/tests/storybook/package.json @@ -26,7 +26,7 @@ "@blocksuite/block-std": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/blocks": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/global": "0.13.0-canary-202403140735-2367cd5", - "@blocksuite/icons": "2.1.45", + "@blocksuite/icons": "2.1.46", "@blocksuite/inline": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/lit": "0.13.0-canary-202403140735-2367cd5", "@blocksuite/presets": "0.13.0-canary-202403140735-2367cd5", diff --git a/yarn.lock b/yarn.lock index b22e2fd83..b8bfbb6a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -228,7 +228,7 @@ __metadata: "@affine/i18n": "workspace:*" "@blocksuite/blocks": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/global": "npm:0.13.0-canary-202403140735-2367cd5" - "@blocksuite/icons": "npm:2.1.45" + "@blocksuite/icons": "npm:2.1.46" "@blocksuite/lit": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/presets": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/store": "npm:0.13.0-canary-202403140735-2367cd5" @@ -762,7 +762,7 @@ __metadata: "@blocksuite/block-std": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/blocks": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/global": "npm:0.13.0-canary-202403140735-2367cd5" - "@blocksuite/icons": "npm:2.1.45" + "@blocksuite/icons": "npm:2.1.46" "@blocksuite/inline": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/lit": "npm:0.13.0-canary-202403140735-2367cd5" "@blocksuite/presets": "npm:0.13.0-canary-202403140735-2367cd5" @@ -3530,16 +3530,6 @@ __metadata: languageName: node linkType: hard -"@blocksuite/icons@npm:2.1.45": - version: 2.1.45 - resolution: "@blocksuite/icons@npm:2.1.45" - peerDependencies: - "@types/react": ^18.0.25 - react: ^18.2.0 - checksum: 10/a77b46ab6f2325005fb873f5d1e5982bcf01588fa1c03cebaf6f4c4a1cb380dfc39c60334ceb4a7fca9486cb9e4911c15f79e54da45ed87bcea6425b00cb20e5 - languageName: node - linkType: hard - "@blocksuite/icons@npm:2.1.46": version: 2.1.46 resolution: "@blocksuite/icons@npm:2.1.46"