From f4be15baec9042881fc0a5c4e4653deee8f6d8c7 Mon Sep 17 00:00:00 2001
From: Himself65 <himself65@outlook.com>
Date: Wed, 7 Jun 2023 16:31:05 +0800
Subject: [PATCH] fix: package `affine/env` modules (#2707)

---
 packages/env/package.json                  |  3 ++-
 packages/env/{ => src}/blocksuite/index.ts | 10 ++--------
 packages/env/tsconfig.blocksuite.json      | 11 -----------
 packages/env/tsconfig.json                 |  2 +-
 tsconfig.json                              |  3 ---
 yarn.lock                                  |  1 +
 6 files changed, 6 insertions(+), 24 deletions(-)
 rename packages/env/{ => src}/blocksuite/index.ts (84%)
 delete mode 100644 packages/env/tsconfig.blocksuite.json

diff --git a/packages/env/package.json b/packages/env/package.json
index b95395cf0..3443ecc55 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -4,6 +4,7 @@
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "devDependencies": {
+    "@affine/templates": "workspace:*",
     "@blocksuite/global": "0.0.0-20230601122821-16196c35-nightly",
     "next": "=13.4.2",
     "react": "18.3.0-canary-16d053d59-20230506",
@@ -14,7 +15,7 @@
     ".": "./src/index.ts",
     "./config": "./src/config.ts",
     "./constant": "./src/constant.ts",
-    "./blocksuite": "./blocksuite/index.ts"
+    "./blocksuite": "./src/blocksuite/index.ts"
   },
   "peerDependencies": {
     "@blocksuite/global": "0.0.0-20230409084303-221991d4-nightly"
diff --git a/packages/env/blocksuite/index.ts b/packages/env/src/blocksuite/index.ts
similarity index 84%
rename from packages/env/blocksuite/index.ts
rename to packages/env/src/blocksuite/index.ts
index 4f12dc358..f34e1cba6 100644
--- a/packages/env/blocksuite/index.ts
+++ b/packages/env/src/blocksuite/index.ts
@@ -1,7 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../env.d.ts" />
-
-import { DebugLogger } from '@affine/debug';
 import markdownTemplate from '@affine/templates/AFFiNE-beta-0.5.4.md';
 import { ContentParser } from '@blocksuite/blocks/content-parser';
 import type { Page } from '@blocksuite/store';
@@ -23,10 +19,8 @@ const demoTitle = markdown
 
 const demoText = markdown.split('\n').slice(1).join('\n');
 
-const logger = new DebugLogger('init-page');
-
 export function initPage(page: Page): void {
-  logger.debug('initEmptyPage', page.id);
+  console.debug('initEmptyPage', page.id);
   // Add page block and surface block at root level
   const isFirstPage = page.meta.init === true;
   if (isFirstPage) {
@@ -50,7 +44,7 @@ export function _initEmptyPage(page: Page, title?: string): void {
 }
 
 export function _initPageWithDemoMarkdown(page: Page): void {
-  logger.debug('initPageWithDefaultMarkdown', page.id);
+  console.debug('initPageWithDefaultMarkdown', page.id);
   const pageBlockId = page.addBlock('affine:page', {
     title: new page.Text(demoTitle),
   });
diff --git a/packages/env/tsconfig.blocksuite.json b/packages/env/tsconfig.blocksuite.json
deleted file mode 100644
index a18b66827..000000000
--- a/packages/env/tsconfig.blocksuite.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "composite": true,
-    "noEmit": false,
-    "outDir": "lib/blocksuite",
-    "target": "ESNext"
-  },
-  "include": ["./blocksuite/*.ts", "src/types.d.ts", "env.d.ts"],
-  "references": [{ "path": "../debug" }]
-}
diff --git a/packages/env/tsconfig.json b/packages/env/tsconfig.json
index 1aba8b2f5..74e63c8de 100644
--- a/packages/env/tsconfig.json
+++ b/packages/env/tsconfig.json
@@ -6,5 +6,5 @@
     "outDir": "lib"
   },
   "include": ["./src", "env.d.ts", "./src/global.d.ts"],
-  "exclude": ["blocksuite", "lib"]
+  "exclude": ["lib"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 6d3872e2a..77330656b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -76,9 +76,6 @@
     {
       "path": "./packages/env"
     },
-    {
-      "path": "./packages/env/tsconfig.blocksuite.json"
-    },
     {
       "path": "./packages/graphql"
     },
diff --git a/yarn.lock b/yarn.lock
index 216ce4e69..e1f8f0d6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -208,6 +208,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@affine/env@workspace:packages/env"
   dependencies:
+    "@affine/templates": "workspace:*"
     "@blocksuite/global": 0.0.0-20230601122821-16196c35-nightly
     lit: ^2.7.5
     next: =13.4.2