🐛 Fix loading assets in dev-middleware from deep paths

steelbrain · Sep 6, 2018 · d7d8972 · d7d8972
1 parent 0b60469
commit d7d8972
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/pundle-chunk-generator-js/src/wrapper/browser.js b/packages/pundle-chunk-generator-js/src/wrapper/browser.js
@@ -15,7 +15,7 @@ if (!global.sbPundle) {
 let sbPundleServer = ''
 if (typeof document !== 'undefined' && document.currentScript) {
   const parsed = new URL(document.currentScript.src)
-  sbPundleServer = `${parsed.protocol}//${parsed.host}/`
+  sbPundleServer = `${parsed.protocol}//${parsed.host}`
 }
 
 const sbPundleCache = sbPundle.cache

diff --git a/packages/pundle-dev-middleware/src/helpers.js b/packages/pundle-dev-middleware/src/helpers.js
@@ -6,12 +6,14 @@ import { getPundleConfig } from 'pundle-core'
 import { getFileKey, type Job, type Chunk, type ImportResolved } from 'pundle-api'
 
 export async function getOutputFormats(pundleOptions: Object, publicPath: string): { [string]: string | false } {
+  invariant(publicPath.length, 'publicPath must never be empty')
+
   const pundleConfig = await getPundleConfig(pundleOptions)
   const { formats } = pundleConfig.output
 
   const newFormats = {}
   Object.keys(formats).forEach(function(key) {
-    const value = formats[key]
+    const value: string | false = formats[key]
     if (value) {
       newFormats[key] = path.join(publicPath, value)
     } else {

diff --git a/packages/pundle-dev-middleware/src/index.js b/packages/pundle-dev-middleware/src/index.js
@@ -39,7 +39,7 @@ async function getPundleDevMiddleware(options: Payload) {
   const router = new Router()
 
   let { publicPath = '/' } = options
-  if (publicPath.endsWith('/')) {
+  if (publicPath.length > 1 && publicPath.endsWith('/')) {
     publicPath = publicPath.slice(0, -1)
   }
   const pundleOptions = pick(options, PUNDLE_OPTIONS)
@@ -225,10 +225,6 @@ async function getPundleDevMiddleware(options: Payload) {
 
       if (!pathname) return
 
-      if (pathname.startsWith('/')) {
-        pathname = pathname.slice(1)
-      }
-
       if (pathname.endsWith('.pundle.hmr')) {
         res.write(JSON.stringify({ type: 'status', enabled: !!options.hmr }))
         if (!options.hmr) {
@@ -244,7 +240,7 @@ async function getPundleDevMiddleware(options: Payload) {
         return
       }
 
-      if (pathname.endsWith('/') || pathname === '') {
+      if (pathname.endsWith('/')) {
         pathname = `${pathname}index`
       }