feat: support cli code hmr

sanyuan0704 · Sep 20, 2022 · f071dd2 · f071dd2
1 parent a96a3aa
commit f071dd2
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 20 deletions.
diff --git a/bin/island.js b/bin/island.js
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import('../dist/cli.js');
+import('../dist/node/cli.js');
diff --git a/docs/.island/config.ts b/docs/.island/config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from '../../dist';
+import { defineConfig } from '../../dist/node';
 
 export default defineConfig({
   lang: 'en-US',

diff --git a/src/node/cli.ts b/src/node/cli.ts
@@ -1,7 +1,6 @@
 import { resolve } from 'path';
 import { cac } from 'cac';
 import { build } from './build';
-import { createDevServer } from './dev';
 import { serve } from './serve';
 
 const cli = cac('island').version('0.0.0').help();
@@ -12,6 +11,7 @@ cli
   .action(async (root: string) => {
     try {
       const createServer = async () => {
+        const { createDevServer } = await import(`./dev.js?t=${Date.now()}`);
         const server = await createDevServer(root, async () => {
           await server.close();
           await createServer();

diff --git a/src/node/constants/index.ts b/src/node/constants/index.ts
@@ -4,7 +4,10 @@ export const isProduction = () => process.env.NODE_ENV === 'production';
 
 export const TS_REGEX = /(c|m)?tsx?$/;
 
-export const PACKAGE_ROOT_PATH = join(fileURLToPath(import.meta.url), '../..');
+export const PACKAGE_ROOT_PATH = join(
+  fileURLToPath(import.meta.url),
+  '../../..'
+);
 
 export const CLIENT_RUNTIME_PATH = join(PACKAGE_ROOT_PATH, 'src/runtime');
 
@@ -39,10 +42,12 @@ export const DEFAULT_EXTERNALS: string[] = [
   'react/jsx-runtime'
 ];
 
-export const CLI_BUNDLE_OUTDIR = join(PACKAGE_ROOT_PATH, 'dist');
+export const CLI_BUNDLE_OUTDIR = join(PACKAGE_ROOT_PATH, 'dist', 'node');
 
-export const ISLAND_JSX_RUNTIME_PATH = CLI_BUNDLE_OUTDIR;
+export const RUNTIME_BUNDLE_OUTDIR = join(PACKAGE_ROOT_PATH, 'dist', 'runtime');
 
-export const ISLAND_CLI_PATH = join(PACKAGE_ROOT_PATH, DIST_PATH, 'cli.js');
+export const ISLAND_JSX_RUNTIME_PATH = RUNTIME_BUNDLE_OUTDIR;
+
+export const ISLAND_CLI_PATH = join(CLI_BUNDLE_OUTDIR, 'cli.js');
 
 export const VENDOR_PATH = join(PACKAGE_ROOT_PATH, 'vendors');
diff --git a/src/node/plugin-island/config.ts b/src/node/plugin-island/config.ts
@@ -6,7 +6,6 @@ import {
   ISLAND_CLI_PATH,
   ISLAND_JSX_RUNTIME_PATH,
   isProduction,
-  PACKAGE_ROOT_PATH,
   ROUTE_PATH
 } from '../constants';
 import { Plugin } from 'vite';
@@ -82,9 +81,9 @@ export function pluginConfig(
     // Restart when config file changes
     async handleHotUpdate(ctx) {
       const customWatchedFiles = [
-        ...(config.configDeps || []),
+        ISLAND_CLI_PATH,
         config.configPath,
-        ISLAND_CLI_PATH
+        ...(config.configDeps || [])
       ];
       if (customWatchedFiles.includes(ctx.file)) {
         console.log(

diff --git a/src/node/plugin-mdx/rehypePlugins/preWrapper.ts b/src/node/plugin-mdx/rehypePlugins/preWrapper.ts
@@ -16,7 +16,6 @@ export const rehypePluginPreWrapper: Plugin<[], import('hast').Root> = () => {
         const codeNode = node.children[0];
         const codeClassName = codeNode.properties?.className?.toString() || '';
         const lang = codeClassName.split('-')[1];
-
         if (!codeClassName || !lang) {
           return;
         }

diff --git a/src/node/plugin-mdx/remarkPlugins/toc.ts b/src/node/plugin-mdx/remarkPlugins/toc.ts
@@ -30,13 +30,11 @@ export const remarkPluginToc: Plugin = () => {
         toc.push({ id, text: originText, depth });
       }
     })(tree);
-
     const insertedTocCode = `export const toc = ${JSON.stringify(
       toc,
       null,
       2
     )}`;
-
     // Add toc ast to current ast tree
     tree.children.push({
       type: 'mdxjsEsm',

diff --git a/src/node/plugin-routes/RouteService.ts b/src/node/plugin-routes/RouteService.ts
@@ -1,6 +1,6 @@
 import fastGlob from 'fast-glob';
 import fs from 'fs-extra';
-import { CLI_BUNDLE_OUTDIR } from '../constants';
+import { RUNTIME_BUNDLE_OUTDIR } from '../constants';
 import path from 'path';
 
 export interface RouteMeta {
@@ -19,7 +19,7 @@ export const normalizeRoutePath = (routePath: string) => {
 };
 
 const lazyWithPreloadRuntimeCode = fs.readFileSync(
-  path.join(CLI_BUNDLE_OUTDIR, 'lazyWithPreload.js'),
+  path.join(RUNTIME_BUNDLE_OUTDIR, 'lazyWithPreload.js'),
   'utf-8'
 );
 

diff --git a/src/runtime/app.tsx b/src/runtime/app.tsx
@@ -16,7 +16,6 @@ export async function waitForApp(path: string): Promise<PageData> {
     const mod = await (matched[0].route as Route).preload();
     const pagePath = cleanUrl((matched[0].route as Route).filePath);
     const relativePagePath = getRelativePagePath(path, pagePath, siteData.base);
-    console.log('relativePagePath', relativePagePath);
     return {
       siteData,
       pagePath,

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -3,8 +3,8 @@ import { defineConfig } from 'tsup';
 export default defineConfig([
   {
     entry: {
-      'jsx-runtime': 'src/runtime/island-jsx-runtime.js',
       cli: 'src/node/cli.ts',
+      dev: 'src/node/dev.ts',
       index: 'src/node/index.ts'
     },
     minifyIdentifiers: false,
@@ -13,17 +13,22 @@ export default defineConfig([
     format: 'esm',
     dts: true,
     sourcemap: true,
-    splitting: false,
+    splitting: true,
     keepNames: true,
     minify: process.env.NODE_ENV === 'production',
-    skipNodeModulesBundle: true
+    skipNodeModulesBundle: true,
+    outDir: 'dist/node',
+    clean: true
   },
   {
     entry: {
+      'jsx-runtime': 'src/runtime/island-jsx-runtime.js',
       lazyWithPreload: 'src/runtime/lazyWithPreload.tsx'
     },
     format: 'esm',
     dts: false,
-    minify: false
+    minify: false,
+    outDir: 'dist/runtime',
+    clean: true
   }
 ]);