diff --git a/packages/frontend/core/.webpack/webpack.config.ts b/packages/frontend/core/.webpack/webpack.config.ts index dfbcf38f61..b78b4545d7 100644 --- a/packages/frontend/core/.webpack/webpack.config.ts +++ b/packages/frontend/core/.webpack/webpack.config.ts @@ -19,26 +19,8 @@ export default async function (cli_env: any, _: any) { const config = createConfiguration(flags, runtimeConfig); return merge(config, { entry: { - 'polyfill/intl-segmenter': { - import: resolve(rootPath, 'src/polyfill/intl-segmenter.ts'), - }, - 'polyfill/ses': { - import: resolve(rootPath, 'src/polyfill/ses.ts'), - }, - plugin: { - dependOn: ['polyfill/intl-segmenter', 'polyfill/ses'], - import: resolve(rootPath, 'src/bootstrap/register-plugins.ts'), - }, - app: { - chunkLoading: 'import', - dependOn: ['polyfill/intl-segmenter', 'polyfill/ses', 'plugin'], - import: resolve(rootPath, 'src/index.tsx'), - }, - '_plugin/index.test': { - chunkLoading: 'import', - dependOn: ['polyfill/intl-segmenter', 'polyfill/ses', 'plugin'], - import: resolve(rootPath, 'src/_plugin/index.test.tsx'), - }, + app: resolve(rootPath, 'src/index.tsx'), + '_plugin/index.test': resolve(rootPath, 'src/_plugin/index.test.tsx'), }, plugins: [ new HTMLPlugin({ @@ -46,7 +28,7 @@ export default async function (cli_env: any, _: any) { inject: 'body', scriptLoading: 'module', minify: false, - chunks: ['app', 'plugin', 'polyfill/intl-segmenter', 'polyfill/ses'], + chunks: ['app'], filename: 'index.html', templateParameters: { GIT_SHORT_SHA: gitShortHash(), @@ -59,12 +41,7 @@ export default async function (cli_env: any, _: any) { scriptLoading: 'module', minify: false, publicPath: getPublicPath(flags), - chunks: [ - '_plugin/index.test', - 'plugin', - 'polyfill/intl-segmenter', - 'polyfill/ses', - ], + chunks: ['_plugin/index.test'], filename: '_plugin/index.html', templateParameters: { GIT_SHORT_SHA: gitShortHash(), diff --git a/packages/frontend/core/src/_plugin/index.test.tsx b/packages/frontend/core/src/_plugin/index.test.tsx index e1568cf9df..053afdca12 100644 --- a/packages/frontend/core/src/_plugin/index.test.tsx +++ b/packages/frontend/core/src/_plugin/index.test.tsx @@ -1,3 +1,6 @@ +import '../polyfill/ses-lockdown'; +import '../polyfill/intl-segmenter'; + import { assertExists } from '@blocksuite/global/utils'; import { getCurrentStore, diff --git a/packages/frontend/core/src/index.tsx b/packages/frontend/core/src/index.tsx index c75e392975..3667442d56 100644 --- a/packages/frontend/core/src/index.tsx +++ b/packages/frontend/core/src/index.tsx @@ -1,3 +1,6 @@ +import './polyfill/ses-lockdown'; +import './polyfill/intl-segmenter'; + import { WorkspaceFallback } from '@affine/component/workspace'; import { assertExists } from '@blocksuite/global/utils'; import { getCurrentStore } from '@toeverything/infra/atom'; @@ -36,4 +39,6 @@ async function main() { ); } -await main(); +main().catch(err => { + console.error('Failed to bootstrap app', err); +}); diff --git a/packages/frontend/core/src/polyfill/ses.ts b/packages/frontend/core/src/polyfill/ses-lockdown.ts similarity index 100% rename from packages/frontend/core/src/polyfill/ses.ts rename to packages/frontend/core/src/polyfill/ses-lockdown.ts