do not include public_url in dev

FredKSchott · Aug 28, 2020 · 5462a92 · 5462a92
1 parent 843cf9e
commit 5462a92
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/snowpack/src/build/build-import-proxy.ts b/snowpack/src/build/build-import-proxy.ts
@@ -46,16 +46,18 @@ export function wrapImportMeta({
 export function wrapHtmlResponse({
   code,
   hmr,
+  isDev,
   config,
   mode,
 }: {
   code: string;
   hmr: boolean;
+  isDev: boolean;
   config: SnowpackConfig;
   mode: 'development' | 'production';
 }) {
   // replace %PUBLIC_URL% (along with surrounding slashes, if any)
-  code = code.replace(/\/?%PUBLIC_URL%\/?/g, config.buildOptions.baseUrl);
+  code = code.replace(/\/?%PUBLIC_URL%\/?/g, isDev ? '/' : config.buildOptions.baseUrl);
 
   // replace %MODE%
   code = code.replace(/%MODE%/g, mode);

diff --git a/snowpack/src/commands/build.ts b/snowpack/src/commands/build.ts
@@ -134,6 +134,7 @@ class FileBuilder {
             code = wrapHtmlResponse({
               code,
               hmr: false,
+              isDev: false,
               config: this.config,
               mode: 'production',
             });
@@ -292,6 +293,7 @@ export async function command(commandOptions: CommandOptions) {
   async function installDependencies() {
     const scannedFiles = Object.values(buildPipelineFiles)
       .map((f) => Object.values(f.filesToResolve))
+      .filter(Boolean)
       .reduce((flat, item) => flat.concat(item), []);
     const installDest = path.join(buildDirectoryLoc, config.buildOptions.webModulesUrl);
     const installResult = await installOptimizedDependencies(scannedFiles, installDest, {
@@ -477,4 +479,6 @@ export async function command(commandOptions: CommandOptions) {
   watcher.on('add', (fileLoc) => onWatchEvent(fileLoc));
   watcher.on('change', (fileLoc) => onWatchEvent(fileLoc));
   watcher.on('unlink', (fileLoc) => onDeleteEvent(fileLoc));
+
+  return new Promise(() => {});
 }
diff --git a/snowpack/src/commands/dev.ts b/snowpack/src/commands/dev.ts
@@ -498,7 +498,13 @@ export async function command(commandOptions: CommandOptions) {
     ) {
       // transform special requests
       if (isRoute) {
-        code = wrapHtmlResponse({code: code as string, hmr: isHmr, config, mode: 'development'});
+        code = wrapHtmlResponse({
+          code: code as string,
+          hmr: isHmr,
+          isDev: true,
+          config,
+          mode: 'development',
+        });
       } else if (isProxyModule) {
         responseFileExt = '.js';
       } else if (isSourceMap && sourceMap) {