From 35568fb0bc3e071fa413cc8558a8c21c6f7e80b1 Mon Sep 17 00:00:00 2001 From: JYC Date: Tue, 16 Apr 2024 19:41:05 +0200 Subject: [PATCH] fix relative path on windows (using posix) (Fix #643) (#644) * fix relative path on windows (using posix) (Fix #643) * fix playwright version --- .changeset/strong-ligers-shake.md | 5 +++++ .github/workflows/ci.yml | 2 +- packages/vite-plugin-kit-routes/src/lib/plugin.ts | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .changeset/strong-ligers-shake.md diff --git a/.changeset/strong-ligers-shake.md b/.changeset/strong-ligers-shake.md new file mode 100644 index 00000000..fa73b130 --- /dev/null +++ b/.changeset/strong-ligers-shake.md @@ -0,0 +1,5 @@ +--- +'vite-plugin-kit-routes': patch +--- + +fix relative path on windows (using posix) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29908141..e2031302 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: cd packages/create-kitql && pnpm dev test-${{ matrix.template }} -t ${{ matrix.template }} - name: 🧑‍💻 Install playwright - run: cd packages/create-kitql/test-${{ matrix.template }} && npx playwright install + run: cd packages/create-kitql/test-${{ matrix.template }} && npx playwright@1.42.1 install - name: 🛠️ e2e install run: cd packages/create-kitql/test-${{ matrix.template }} && pnpm i --no-frozen-lockfile diff --git a/packages/vite-plugin-kit-routes/src/lib/plugin.ts b/packages/vite-plugin-kit-routes/src/lib/plugin.ts index cf5b298d..bdc9e458 100644 --- a/packages/vite-plugin-kit-routes/src/lib/plugin.ts +++ b/packages/vite-plugin-kit-routes/src/lib/plugin.ts @@ -4,7 +4,7 @@ import type { PluginOption } from 'vite' import { watchAndRun } from 'vite-plugin-watch-and-run' import { cyan, gray, green, italic, Log, red, stry0, yellow } from '@kitql/helpers' -import { dirname, getFilesUnder, read, relative, write } from '@kitql/internals' +import { dirname, getFilesUnder, read, write } from '@kitql/internals' import { getActionsOfServerPages, getMethodsOfServerFiles } from './ast.js' import { appendSp, format, routeFn } from './format.js' @@ -683,7 +683,7 @@ export function extractParamsFromPath(path: string, o: Options): Param[] { const paramPattern = /\[+([^\]]+)]+/g const params: Param[] = [] - const relToParams = relative(dirname(options.generated_file_path), options.path_params) + const relToParams = posix.relative(dirname(options.generated_file_path), options.path_params) let match while ((match = paramPattern.exec(path)) !== null) {