fix: deal with json file when use on-demand compile (#6548)

* fix: deal with json file when use on-demand compile * chore: changeset
alibaba · Sep 27, 2023 · 6f18c3d · 6f18c3d
1 parent 4d256e3
commit 6f18c3d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.changeset/long-mayflies-smoke.md b/.changeset/long-mayflies-smoke.md
@@ -0,0 +1,5 @@
+---
+'@ice/app': patch
+---
+
+fix: deal with json file when use on-demand compile
diff --git a/examples/csr-project/ice.config.mts b/examples/csr-project/ice.config.mts
@@ -10,6 +10,10 @@ export default defineConfig(() => ({
     }
     return webpackConfig;
   },
+  server: {
+    onDemand: true,
+    format: 'esm',
+  },
   dropLogLevel: 'warn',
   plugins: [
     auth(),

diff --git a/packages/ice/src/service/ServerRunner.ts b/packages/ice/src/service/ServerRunner.ts
@@ -34,6 +34,11 @@ interface InitOptions {
 type ResolveCallback = Parameters<PluginBuild['onResolve']>[1];
 type LoadCallback = Parameters<PluginBuild['onLoad']>[1];
 
+const FALLBACK_LOADERS = {
+  '.json': 'json',
+  '.txt': 'text',
+};
+
 function getPluginLifecycle(plugin: Plugin, compiler: 'onLoad'): [OnResolveOptions, LoadCallback][];
 function getPluginLifecycle(plugin: Plugin, compiler: 'onResolve'): [OnResolveOptions, ResolveCallback][];
 function getPluginLifecycle(plugin: Plugin, hookKey: 'onResolve' | 'onLoad') {
@@ -263,11 +268,21 @@ class ServerRunner extends Runner {
                     ...args,
                     path: formatedId,
                   });
-
+                  // If res is undefined, it means the plugin does not handle the file, fallback to default handler.
+                  if (!res && FALLBACK_LOADERS[path.extname(formatedId)]) {
+                    res = {
+                      loader: FALLBACK_LOADERS[path.extname(formatedId)],
+                    };
+                  }
                   if (res) {
                     const { contents, loader } = res;
                     if (['json', 'text'].includes(loader)) {
-                      code = `__ice_exports__.default = ${contents || JSON.stringify(await fse.readFile(formatedId, 'utf-8'))}`;
+                      if (contents) {
+                        code = `__ice_exports__.default = ${contents}`;
+                      } else {
+                        const contents = await fse.readFile(formatedId, 'utf-8');
+                        code = `__ice_exports__.default = ${loader === 'text' ? JSON.stringify(contents) : contents}`;
+                      }
                     } else {
                       code = typeof contents === 'string' ? contents : contents.toString();
                     }