diff --git a/.eslintignore b/.eslintignore
index 1bf59375c8..25ce62734d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -24,6 +24,7 @@ packages/core/src/Site/*.js
 packages/core/src/utils/*.js
 packages/core/src/variables/*.js
 packages/core/test/unit/**/*.js
+packages/core/index.js
 
 # Rules for pure JS files
 packages/core/src/lib/markdown-it/patches/*
diff --git a/.gitignore b/.gitignore
index ff59cd5fff..1162c69117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,5 +89,6 @@ packages/core/src/Site/*.js
 packages/core/src/utils/*.js
 packages/core/src/variables/*.js
 packages/core/test/unit/**/*.js
+packages/core/index.js
 
 # --- packages/core end ---
diff --git a/packages/cli/src/cmd/build.js b/packages/cli/src/cmd/build.js
index 6c73ac863d..3f6f54bde9 100755
--- a/packages/cli/src/cmd/build.js
+++ b/packages/cli/src/cmd/build.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const { Site } = require('@markbind/core').Site;
+const { Site } = require('@markbind/core');
 
 const cliUtil = require('../util/cliUtil');
 const logger = require('../util/logger');
diff --git a/packages/cli/src/cmd/deploy.js b/packages/cli/src/cmd/deploy.js
index 475fed36cf..f38c79ade9 100755
--- a/packages/cli/src/cmd/deploy.js
+++ b/packages/cli/src/cmd/deploy.js
@@ -1,6 +1,6 @@
 const path = require('path');
 
-const { Site } = require('@markbind/core').Site;
+const { Site } = require('@markbind/core');
 
 const cliUtil = require('../util/cliUtil');
 const logger = require('../util/logger');
diff --git a/packages/cli/src/cmd/serve.js b/packages/cli/src/cmd/serve.js
index a43f33187e..21ff8e65dc 100755
--- a/packages/cli/src/cmd/serve.js
+++ b/packages/cli/src/cmd/serve.js
@@ -2,7 +2,7 @@ const chokidar = require('chokidar');
 const path = require('path');
 const readline = require('readline');
 
-const { Site } = require('@markbind/core').Site;
+const { Site } = require('@markbind/core');
 const { pageVueServerRenderer } = require('@markbind/core/src/Page/PageVueServerRenderer');
 
 const fsUtil = require('@markbind/core/src/utils/fsUtil');
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 6aac50828f..fdcba93a6d 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -1,7 +1,4 @@
-const Site = require('./src/Site');
-const { Template } = require('./src/Site/template');
+import { Site } from './src/Site';
+import { Template } from './src/Site/template';
 
-module.exports = {
-  Site,
-  Template,
-};
+export { Site, Template };