cleanup

Author: dazuaz

src/interpolateName.ts

@@ -28,7 +28,7 @@ export default function interpolateName(
     let resourcePath = loaderResourcePath
 
     if (parsed.ext) {
-      ext = parsed.ext.substr(1)
+      ext = parsed.ext.slice(1)
     }
 
     if (parsed.dir) {
@@ -41,7 +41,7 @@ export default function interpolateName(
         .relative(context, resourcePath + '_')
         .replace(/\\/g, '/')
         .replace(/\.\.(\/)?/g, '_$1')
-      directory = directory.substr(0, directory.length - 1)
+      directory = directory.slice(0, directory.length - 1)
     } else {
       directory = resourcePath.replace(/\\/g, '/').replace(/\.\.(\/)?/g, '_$1')
     }
@@ -59,7 +59,7 @@ export default function interpolateName(
     const hashIdx = query.indexOf('#')
 
     if (hashIdx >= 0) {
-      query = query.substr(0, hashIdx)
+      query = query.slice(0, hashIdx)
     }
   }
 

src/utils.ts

@@ -154,12 +154,9 @@ const getOutputAndPublicPath: GetOutputAndPublicPath = (
   if (configPublicPath) {
     if (typeof configPublicPath === 'function') {
       publicPath = configPublicPath(fileName)
-    } else if (configPublicPath.endsWith('/')) {
-      publicPath = configPublicPath + fileName
     } else {
-      publicPath = `${configPublicPath}/${fileName}`
+      publicPath = path.posix.join(configPublicPath, fileName)
     }
-
     publicPath = JSON.stringify(publicPath)
   }
 

test/utils.test.js

@@ -0,0 +1,12 @@
+import { getOutputAndPublicPath } from '../lib/utils'
+
+describe('Utils package', () => {
+  it('should create both paths', () => {
+    const { outputPath, publicPath } = getOutputAndPublicPath('file.png', {
+      outputPath: '/dist/img/',
+      publicPath: '/img',
+    })
+    expect(outputPath).toBe('/dist/img/file.png')
+    expect(publicPath).toBe('"/img/file.png"')
+  })
+})