From 0b99e256bddea4d9e497d23f960e46d5fa6789ab Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Fri, 23 Jun 2023 16:51:24 +0200 Subject: [PATCH] use fileURLToPath --- packages/playground/start.js | 6 ++---- sites/svelte.dev/scripts/generate_examples.js | 10 ++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/playground/start.js b/packages/playground/start.js index af2ed10a54..af37a40e26 100644 --- a/packages/playground/start.js +++ b/packages/playground/start.js @@ -1,13 +1,11 @@ import { readFileSync, writeFileSync } from 'node:fs'; import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import { watch } from 'rollup'; import serve from 'rollup-plugin-serve'; import * as svelte from '../svelte/src/compiler/index.js'; -let __dirname = new URL('.', import.meta.url).pathname; -if (process.platform === 'win32') { - __dirname = __dirname.slice(1); // else path.resolve fucks up -} +const __dirname = fileURLToPath(new URL('.', import.meta.url)); /** @returns {import('rollup').Plugin}*/ function create_plugin(ssr = false) { diff --git a/sites/svelte.dev/scripts/generate_examples.js b/sites/svelte.dev/scripts/generate_examples.js index 507396e31b..bbdf05fae2 100644 --- a/sites/svelte.dev/scripts/generate_examples.js +++ b/sites/svelte.dev/scripts/generate_examples.js @@ -1,12 +1,10 @@ +import { fileURLToPath } from 'node:url'; import { get_examples_data } from '../src/lib/server/examples/index.js'; import fs from 'node:fs'; -let examples_path = new URL('../../../documentation/examples', import.meta.url).pathname; -if (process.platform === 'win32') { - examples_path = examples_path.slice(1); // remove leading slash -} - -const examples_data = get_examples_data(examples_path); +const examples_data = get_examples_data( + fileURLToPath(new URL('../../../documentation/examples', import.meta.url)) +); try { fs.mkdirSync(new URL('../src/lib/generated/', import.meta.url), { recursive: true });