From 788e294bc93cd88f9ed4036a0dfa22cb4fcf6fd3 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 23 May 2022 15:39:21 -0700 Subject: [PATCH] [chore] remove cwd as a method parameter --- packages/kit/src/cli.js | 6 +----- packages/kit/src/core/dev/index.js | 7 ++++--- packages/kit/src/core/dev/plugin.js | 5 +++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/kit/src/cli.js b/packages/kit/src/cli.js index 9f9e34e467d0..4451b1343f0d 100755 --- a/packages/kit/src/cli.js +++ b/packages/kit/src/cli.js @@ -65,10 +65,7 @@ prog async function start(config) { const { dev } = await import('./core/dev/index.js'); - const cwd = process.cwd(); - const { address_info, server_config, close } = await dev({ - cwd, port, host, https, @@ -82,8 +79,7 @@ prog open: first && (open || !!server_config.open), base: config.kit.paths.base, loose: server_config.fs.strict === false, - allow: server_config.fs.allow, - cwd + allow: server_config.fs.allow }); first = false; diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js index 4931a485ecc8..fa5f7d013d61 100644 --- a/packages/kit/src/core/dev/index.js +++ b/packages/kit/src/core/dev/index.js @@ -7,9 +7,10 @@ import { get_aliases, get_runtime_path } from '../utils.js'; import { create_plugin } from './plugin.js'; import * as sync from '../sync/sync.js'; +const cwd = process.cwd(); + /** * @typedef {{ - * cwd: string, * port: number, * host?: string, * https: boolean, @@ -19,7 +20,7 @@ import * as sync from '../sync/sync.js'; */ /** @param {Options} opts */ -export async function dev({ cwd, port, host, https, config }) { +export async function dev({ port, host, https, config }) { sync.init(config); const [vite_config] = deep_merge( @@ -71,7 +72,7 @@ export async function dev({ cwd, port, host, https, config }) { }, configFile: false }), - await create_plugin(config, cwd) + await create_plugin(config) ], base: '/' }); diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js index 02e3a6301ec4..875767eb800b 100644 --- a/packages/kit/src/core/dev/plugin.js +++ b/packages/kit/src/core/dev/plugin.js @@ -17,12 +17,13 @@ import { parse_route_id } from '../../utils/routing.js'; // https://github.com/vitejs/vite/blob/3edd1af56e980aef56641a5a51cf2932bb580d41/packages/vite/src/node/plugins/css.ts#L96 const style_pattern = /\.(css|less|sass|scss|styl|stylus|pcss|postcss)$/; +const cwd = process.cwd(); + /** * @param {import('types').ValidatedConfig} config - * @param {string} cwd * @returns {Promise} */ -export async function create_plugin(config, cwd) { +export async function create_plugin(config) { const runtime = get_runtime_path(config); process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = '0';