fix:windows system should format slash

nonzzz · Jan 9, 2024 · cdf96d3 · cdf96d3
1 parent 54cf9de
commit cdf96d3
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/e2e/fixtures/open-props/index.html b/e2e/fixtures/open-props/index.html
@@ -7,6 +7,6 @@
 </head>
 <body>
     <div id="app"></div>
-    <script type="module" src="./main.tsx"></script>
+    <script type="module" src="./src/main.tsx"></script>
 </body>
 </html>
diff --git a/e2e/fixtures/open-props/app.tsx → e2e/fixtures/open-props/src/app.tsx b/e2e/fixtures/open-props/app.tsx → e2e/fixtures/open-props/src/app.tsx
diff --git a/e2e/fixtures/open-props/main.tsx → e2e/fixtures/open-props/src/main.tsx b/e2e/fixtures/open-props/main.tsx → e2e/fixtures/open-props/src/main.tsx
diff --git a/e2e/fixtures/path-alias/src/app.tsx b/e2e/fixtures/path-alias/src/app.tsx
@@ -2,14 +2,15 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 import * as stylex from '@stylexjs/stylex'
 import { useState } from 'react'
+import { colors } from '@/themes/color.stylex'
 
 const styles = stylex.create({
   text: { fontSize: '20px', cursor: 'pointer' },
   blue: {
-    color: 'blue'
+    color: colors.blue
   },
   red: {
-    color: 'red'
+    color: colors.red
   }
 })
 

diff --git a/e2e/fixtures/path-alias/src/themes/color.stylex.ts b/e2e/fixtures/path-alias/src/themes/color.stylex.ts
@@ -0,0 +1,6 @@
+import { defineVars } from '@stylexjs/stylex'
+
+export const colors = defineVars({
+  blue: 'blue',
+  red: 'red'
+})
diff --git a/package.json b/package.json
@@ -16,11 +16,6 @@
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
     },
-    "./url.js": {
-      "types": "./dist/url.d.ts",
-      "import": "./dist/url.mjs",
-      "require": "./dist/url.js"
-    },
     "./*": "./*"
   },
   "files": [

diff --git a/src/patch-alias.ts b/src/patch-alias.ts
@@ -9,6 +9,7 @@
 // convert:
 // import { kind } from './x.stylex'
 import path from 'path'
+import { normalizePath } from 'vite'
 import MagicString from 'magic-string'
 import type { ImportSpecifier } from 'es-module-lexer'
 import type { Alias, AliasOptions, Plugin } from 'vite'
@@ -22,9 +23,8 @@ interface PatchAliasOptions {
 type AliasPath = ImportSpecifier & { relative: string }
 
 function handleRelativePath(from: string, to: string) {
-  let relativePath = path.relative(path.dirname(from), to).replace(/\.\w+$/, '')
-  relativePath = `./${relativePath}`
-  return relativePath
+  const relativePath = path.relative(path.dirname(from), to).replace(/\.\w+$/, '')
+  return `./${normalizePath(relativePath)}`
 }
 
 export function createPatchAlias(alias: AliasOptions & Alias[], opts: PatchAliasOptions) {