fix: remove duplicated slash for assetPrefix (#73)

rspack-contrib · Aug 13, 2024 · aa6a356 · aa6a356
1 parent 272b397
commit aa6a356
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 12 deletions.
diff --git a/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts b/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
@@ -230,6 +230,7 @@ export default async (
       publicDir: false,
     },
     dev: {
+      assetPrefix: '/',
       progressBar: !quiet,
     },
     source: {
@@ -291,12 +292,6 @@ export default async (
           ignored: /node_modules/,
         }
 
-        if (!isProd) {
-          // Using publicPath here to force drop slash in assetPrefix.
-          config.output = config.output || {}
-          config.output.publicPath = ''
-        }
-
         config.ignoreWarnings = [
           ...(config.ignoreWarnings || []),
           /export '\S+' was not found in 'global'/,

diff --git a/packages/builder-rsbuild/templates/preview.ejs b/packages/builder-rsbuild/templates/preview.ejs
@@ -10,11 +10,39 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <link rel="prefetch" href="./sb-common-assets/nunito-sans-regular.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="prefetch" href="./sb-common-assets/nunito-sans-italic.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="prefetch" href="./sb-common-assets/nunito-sans-bold.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="prefetch" href="./sb-common-assets/nunito-sans-bold-italic.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="stylesheet" href="./sb-common-assets/fonts.css" />
+    <style>
+      @font-face {
+        font-family: 'Nunito Sans';
+        font-style: normal;
+        font-weight: 400;
+        font-display: swap;
+        src: url('./sb-common-assets/nunito-sans-regular.woff2') format('woff2');
+      }
+
+      @font-face {
+        font-family: 'Nunito Sans';
+        font-style: italic;
+        font-weight: 400;
+        font-display: swap;
+        src: url('./sb-common-assets/nunito-sans-italic.woff2') format('woff2');
+      }
+
+      @font-face {
+        font-family: 'Nunito Sans';
+        font-style: normal;
+        font-weight: 700;
+        font-display: swap;
+        src: url('./sb-common-assets/nunito-sans-bold.woff2') format('woff2');
+      }
+
+      @font-face {
+        font-family: 'Nunito Sans';
+        font-style: italic;
+        font-weight: 700;
+        font-display: swap;
+        src: url('./sb-common-assets/nunito-sans-bold-italic.woff2') format('woff2');
+      }
+    </style>
 
     <% if (typeof headHtmlSnippet !== 'undefined') { %> <%= headHtmlSnippet %> <% } %> <%
     htmlWebpackPlugin.files.css.forEach(file => { %>
@@ -47,7 +75,11 @@
       import './sb-preview/runtime.js';
 
       <% htmlWebpackPlugin.files.js.forEach(file => { %>
-      import './<%= file %>';
+        <% if (file.startsWith('/')) { %>
+          import '.<%= file %>';
+        <% } else { %>
+          import './<%= file %>';
+        <% } %>
       <% }); %>
     </script>    
   </body>