fix path format on windows

SpiriitLabs · Jan 20, 2024 · 493891e · 493891e
1 parent 5d4e059
commit 493891e
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 98 deletions.
diff --git a/demo/sveltekit/package.json b/demo/sveltekit/package.json
@@ -12,8 +12,8 @@
   },
   "devDependencies": {
     "@spiriit/vite-plugin-svg-spritemap": "workspace:*",
-    "@sveltejs/adapter-auto": "^3.1.0",
-    "@sveltejs/kit": "^2.4.0",
+    "@sveltejs/adapter-auto": "^3.1.1",
+    "@sveltejs/kit": "^2.4.1",
     "@sveltejs/vite-plugin-svelte": "^3.0.1",
     "sass": "^1.70.0",
     "svelte": "^4.2.9",

diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "@vitest/coverage-v8": "^1.2.1",
     "c8": "^9.1.0",
     "eslint": "^8.56.0",
-    "playwright": "^1.41.0",
+    "playwright": "^1.41.1",
     "rollup": "^4.9.5",
     "svg-element-attributes": "^2.1.0",
     "tsup": "^8.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
diff --git a/src/plugins/build.ts b/src/plugins/build.ts
@@ -1,10 +1,9 @@
-import path from 'node:path'
+import { posix as path } from 'node:path'
 import type { ExternalOption } from 'rollup'
 import type { Plugin, ResolvedConfig } from 'vite'
 import type { Options, Pattern } from '../types'
 import { SVGManager } from '../svgManager'
 import { getFileName } from '../helpers/filename'
-import { joinUrlSegments } from '../helpers/utils'
 
 export default function BuildPlugin(iconsPattern: Pattern, options: Options): Plugin {
   let config: ResolvedConfig
@@ -82,7 +81,7 @@ export default function BuildPlugin(iconsPattern: Pattern, options: Options): Pl
       return {
         code: code.replace(
           spritemapFilter,
-          joinUrlSegments(base, this.getFileName(fileRef)),
+          path.join(base, this.getFileName(fileRef)),
         ),
         map: null,
       }

diff --git a/test/external.test.ts b/test/external.test.ts
@@ -3,26 +3,27 @@ import type { ExternalOption } from 'rollup'
 import { buildVite } from './helper/build'
 
 const configs: Record<string, ExternalOption | undefined> = {
-  'no external': undefined,
-  'external string': 'jquery',
-  'external array': ['jquery'],
-  'external function': (source) => {
+  no_external: undefined,
+  external_string: 'jquery',
+  external_array: ['jquery'],
+  external_function: (source) => {
     if (source.includes('jquery'))
       return true
   },
 }
 
-describe('output manifest generation', () => {
+describe('external', () => {
   for (const key in configs) {
     if (Object.prototype.hasOwnProperty.call(configs, key)) {
       it(key, async () => {
         const config = configs[key]
-        await buildVite(
+        await buildVite({
+          name: `external_${key}`,
+          options:
           {
             output: true,
           },
-          null,
-          {
+          viteConfig: {
             build: {
               rollupOptions: {
                 external: config,
@@ -58,7 +59,7 @@ describe('output manifest generation', () => {
               },
             ],
           },
-        )
+        })
       })
     }
   }

diff --git a/test/helper/build.ts b/test/helper/build.ts
@@ -4,13 +4,18 @@ import VitePluginSvgSpritemap from '../../src'
 import type { UserOptions } from '../../src/types'
 import { getPath } from './path'
 
-export async function buildVite(
-  options: UserOptions,
-  path: string | null = null,
-  config: InlineConfig = {},
-) {
+export async function buildVite(obj: {
+  name: string
+  options?: UserOptions
+  path?: string
+  viteConfig?: InlineConfig
+}) {
+  const { name, options, path, viteConfig } = obj
   const defaultConfig: InlineConfig = {
     root: getPath('./fixtures/basic'),
+    build: {
+      outDir: getPath(`./fixtures/basic/dist/${name}`),
+    },
     plugins: [
       VitePluginSvgSpritemap(
         getPath(path || './fixtures/basic/svg/*.svg'),
@@ -19,5 +24,5 @@ export async function buildVite(
     ],
   }
 
-  return await build(mergeConfig(defaultConfig, config))
+  return await build(mergeConfig(defaultConfig, viteConfig || {}))
 }
diff --git a/test/idify.test.ts b/test/idify.test.ts
@@ -11,7 +11,7 @@ describe('idefy', () => {
     if (Object.prototype.hasOwnProperty.call(idifyConfigs, key)) {
       it(key, async () => {
         const idify = idifyConfigs[key]
-        const result = await buildVite({ idify })
+        const result = await buildVite({ name: `idify_${key}`, options: { idify } })
         if (!('output' in result))
           return
         const asset = result.output.find(