From 92d7f318ba24df1edee9d69fc1004fe40bfc6cca Mon Sep 17 00:00:00 2001
From: liuyi <forehalo@gmail.com>
Date: Mon, 18 Mar 2024 11:40:14 +0800
Subject: [PATCH 1/2] fix(server): ensure selfhost admin created after all data
 migrated (#6163)

fix #6154

cp to canary
---
 packages/backend/server/src/data/commands/run.ts                | 2 ++
 ...053000403-self-host-admin.ts => 99999999-self-host-admin.ts} | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename packages/backend/server/src/data/migrations/{1605053000403-self-host-admin.ts => 99999999-self-host-admin.ts} (96%)

diff --git a/packages/backend/server/src/data/commands/run.ts b/packages/backend/server/src/data/commands/run.ts
index 7d4df391f5..33b4482b02 100644
--- a/packages/backend/server/src/data/commands/run.ts
+++ b/packages/backend/server/src/data/commands/run.ts
@@ -23,6 +23,8 @@ export async function collectMigrations(): Promise<Migration[]> {
     )
     .map(desc => join(folder, desc));
 
+  migrationFiles.sort((a, b) => a.localeCompare(b));
+
   const migrations: Migration[] = await Promise.all(
     migrationFiles.map(async file => {
       return import(pathToFileURL(file).href).then(mod => {
diff --git a/packages/backend/server/src/data/migrations/1605053000403-self-host-admin.ts b/packages/backend/server/src/data/migrations/99999999-self-host-admin.ts
similarity index 96%
rename from packages/backend/server/src/data/migrations/1605053000403-self-host-admin.ts
rename to packages/backend/server/src/data/migrations/99999999-self-host-admin.ts
index 0d13b0724d..11c791f2fd 100644
--- a/packages/backend/server/src/data/migrations/1605053000403-self-host-admin.ts
+++ b/packages/backend/server/src/data/migrations/99999999-self-host-admin.ts
@@ -4,7 +4,7 @@ import { PrismaClient } from '@prisma/client';
 import { UserService } from '../../core/user';
 import { Config, CryptoHelper } from '../../fundamentals';
 
-export class SelfHostAdmin1605053000403 {
+export class SelfHostAdmin99999999 {
   // do the migration
   static async up(_db: PrismaClient, ref: ModuleRef) {
     const config = ref.get(Config, { strict: false });

From c00cddfad73a7a02d06de4029b93e44255baf0db Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Fri, 15 Mar 2024 09:37:48 +0000
Subject: [PATCH 2/2] build(core): add source-map-loader for blocksuite codes
 (#6137)

---
 packages/frontend/core/.webpack/config.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/frontend/core/.webpack/config.ts b/packages/frontend/core/.webpack/config.ts
index 4432eb69b5..42fb5acace 100644
--- a/packages/frontend/core/.webpack/config.ts
+++ b/packages/frontend/core/.webpack/config.ts
@@ -242,6 +242,12 @@ export const createConfiguration: (
             fullySpecified: false,
           },
         },
+        {
+          test: /\.js$/,
+          enforce: 'pre',
+          include: /@blocksuite/,
+          use: ['source-map-loader'],
+        },
         {
           oneOf: [
             {