From 2980c1afac8b1ea48426460f2254ce56842129bc Mon Sep 17 00:00:00 2001
From: Alex Yang <himself65@outlook.com>
Date: Thu, 27 Jul 2023 05:56:59 -0700
Subject: [PATCH] fix: plugin not found (#3415)

---
 apps/core/.webpack/config.ts                | 2 +-
 apps/core/src/bootstrap/register-plugins.ts | 6 +++---
 apps/electron/scripts/generate-assets.mjs   | 1 +
 packages/cli/src/bin/build-core.ts          | 2 --
 packages/cli/src/bin/dev-core.ts            | 2 --
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/core/.webpack/config.ts b/apps/core/.webpack/config.ts
index f3a1a0765a..ac2e2365c5 100644
--- a/apps/core/.webpack/config.ts
+++ b/apps/core/.webpack/config.ts
@@ -106,7 +106,7 @@ export const createConfiguration: (
     devtool:
       buildFlags.mode === 'production'
         ? buildFlags.distribution === 'desktop'
-          ? 'inline-cheap-source-map'
+          ? 'nosources-source-map'
           : 'source-map'
         : 'eval-cheap-module-source-map',
 
diff --git a/apps/core/src/bootstrap/register-plugins.ts b/apps/core/src/bootstrap/register-plugins.ts
index a4b85455db..ed6be96c49 100644
--- a/apps/core/src/bootstrap/register-plugins.ts
+++ b/apps/core/src/bootstrap/register-plugins.ts
@@ -6,7 +6,7 @@ import * as BlockSuiteBlocksStd from '@blocksuite/blocks/std';
 import { DisposableGroup } from '@blocksuite/global/utils';
 import * as BlockSuiteGlobalUtils from '@blocksuite/global/utils';
 import * as Icons from '@blocksuite/icons';
-import * as Manager from '@toeverything/plugin-infra/atom';
+import * as Atom from '@toeverything/plugin-infra/atom';
 import {
   editorItemsAtom,
   headerItemsAtom,
@@ -48,8 +48,8 @@ const PluginProvider = ({ children }: PropsWithChildren) =>
   );
 
 const customRequire = (id: string) => {
-  if (id === '@toeverything/plugin-infra/manager') {
-    return Manager;
+  if (id === '@toeverything/plugin-infra/atom') {
+    return Atom;
   }
   if (id === 'react') {
     return React;
diff --git a/apps/electron/scripts/generate-assets.mjs b/apps/electron/scripts/generate-assets.mjs
index a2dc2c86a3..db40b55f92 100755
--- a/apps/electron/scripts/generate-assets.mjs
+++ b/apps/electron/scripts/generate-assets.mjs
@@ -41,6 +41,7 @@ cd(repoRootDir);
 
 // step 1: build web (nextjs) dist
 if (!process.env.SKIP_WEB_BUILD) {
+  await $`yarn -T run build:plugins`;
   await $`DISTRIBUTION=desktop yarn nx build @affine/core`;
   await fs.move(affineCoreOutDir, publicAffineOutDir, { overwrite: true });
 }
diff --git a/packages/cli/src/bin/build-core.ts b/packages/cli/src/bin/build-core.ts
index c0c9d16c00..cff680a081 100644
--- a/packages/cli/src/bin/build-core.ts
+++ b/packages/cli/src/bin/build-core.ts
@@ -4,7 +4,6 @@ import path from 'node:path';
 import type { BuildFlags } from '../config/index.js';
 import { projectRoot } from '../config/index.js';
 import { buildI18N } from '../util/i18n.js';
-import { buildInfra } from '../util/infra.js';
 
 const cwd = path.resolve(projectRoot, 'apps', 'core');
 
@@ -46,7 +45,6 @@ const flags = {
 } satisfies BuildFlags;
 
 buildI18N();
-await buildInfra();
 spawn(
   'node',
   [
diff --git a/packages/cli/src/bin/dev-core.ts b/packages/cli/src/bin/dev-core.ts
index 0cd87dbbe8..6b5d8c3478 100644
--- a/packages/cli/src/bin/dev-core.ts
+++ b/packages/cli/src/bin/dev-core.ts
@@ -7,7 +7,6 @@ import { config } from 'dotenv';
 
 import { type BuildFlags, projectRoot } from '../config/index.js';
 import { watchI18N } from '../util/i18n.js';
-import { watchInfra } from '../util/infra.js';
 
 const files = ['.env', '.env.local'];
 
@@ -94,7 +93,6 @@ flags.channel = buildFlags.channel as any;
 flags.coverage = buildFlags.coverage;
 
 watchI18N();
-await watchInfra();
 spawn(
   'node',
   [