use src code locally, dist in CI

sveltejs · Jul 5, 2022 · 12a03e2 · 12a03e2
1 parent abd327e
commit 12a03e2
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 32 deletions.
diff --git a/packages/kit/src/core/sync/copy_assets.js b/packages/kit/src/core/sync/copy_assets.js
@@ -3,8 +3,8 @@ import path from 'path';
 import { copy } from '../../utils/filesystem.js';
 import { fileURLToPath } from 'url';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
 
 /** @param {string} dest */
 export function copy_assets(dest) {
@@ -13,7 +13,7 @@ export function copy_assets(dest) {
  do {
  // we jump through these hoops so that this function
  // works whether or not it's been bundled
- const resolved = path.resolve(__dirname, `${prefix}/assets`);
+ const resolved = path.resolve(dirname, `${prefix}/assets`);
 
  if (fs.existsSync(resolved)) {
  copy(resolved, dest);

diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run test:dev && npm run test:build",
  "test:dev": "cross-env DEV=true playwright test",

diff --git a/packages/kit/test/apps/amp/vite.config.js b/packages/kit/test/apps/amp/vite.config.js
@@ -1,9 +1,9 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run test:dev && npm run test:build",
  "test:dev": "rimraf test/errors.json && cross-env DEV=true playwright test",

diff --git a/packages/kit/test/apps/basics/vite.config.js b/packages/kit/test/apps/basics/vite.config.js
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
@@ -12,7 +12,7 @@ const config = {
  // the reload confuses Playwright
  include: ['cookie', 'marked']
  },
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run test:dev && npm run test:build",
  "test:dev": "cross-env DEV=true playwright test",

diff --git a/packages/kit/test/apps/options-2/vite.config.js b/packages/kit/test/apps/options-2/vite.config.js
@@ -1,9 +1,9 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run test:dev && npm run test:build",
  "test:dev": "cross-env DEV=true playwright test",

diff --git a/packages/kit/test/apps/options/vite.config.js b/packages/kit/test/apps/options/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run build && uvu test"
  },

diff --git a/packages/kit/test/prerendering/basics/vite.config.js b/packages/kit/test/prerendering/basics/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/prerendering/disabled/package.json b/packages/kit/test/prerendering/disabled/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run build"
  },

diff --git a/packages/kit/test/prerendering/disabled/vite.config.js b/packages/kit/test/prerendering/disabled/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run build && uvu test"
  },

diff --git a/packages/kit/test/prerendering/options/vite.config.js b/packages/kit/test/prerendering/options/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check",
  "test": "npm run build && uvu test"
  },

diff --git a/packages/kit/test/prerendering/paths-base/vite.config.js b/packages/kit/test/prerendering/paths-base/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/prerendering/trailing-slash/package.json b/packages/kit/test/prerendering/trailing-slash/package.json
@@ -6,7 +6,7 @@
  "dev": "vite dev",
  "build": "vite build",
  "preview": "vite preview",
- "sync": "node ../../cli.js sync",
+ "prepare": "node ../../cli.js sync",
  "check": "tsc && svelte-check"
  },
  "devDependencies": {

diff --git a/packages/kit/test/prerendering/trailing-slash/vite.config.js b/packages/kit/test/prerendering/trailing-slash/vite.config.js
@@ -1,13 +1,13 @@
 import * as path from 'path';
-import { sveltekit } from '@sveltejs/kit/vite';
+import { plugin } from '../../utils.js';
 
 /** @type {import('vite').UserConfig} */
 const config = {
  build: {
  minify: false
  },
  clearScreen: false,
- plugins: [sveltekit()],
+ plugins: [plugin()],
  server: {
  // TODO: required to support ipv6, remove on vite 3
  // https://github.com/vitejs/vite/issues/7075

diff --git a/packages/kit/test/tsconfig.json b/packages/kit/test/tsconfig.json
@@ -0,0 +1,17 @@
+{
+ "compilerOptions": {
+ "allowJs": true,
+ "checkJs": true,
+ "noEmit": true,
+ "strict": true,
+ "target": "esnext",
+ "module": "esnext",
+ "moduleResolution": "node",
+ "allowSyntheticDefaultImports": true,
+ "paths": {
+ "@sveltejs/kit": ["../types/index"],
+ // internal use only
+ "types": ["../types/internal"]
+ }
+ }
+}
diff --git a/packages/kit/test/utils.d.ts b/packages/kit/test/utils.d.ts
@@ -7,6 +7,7 @@ import {
  TestType
 } from '@playwright/test';
 import { IncomingMessage, ServerResponse } from 'http';
+import { Plugin } from 'vite';
 
 export const test: TestType<
  PlaywrightTestArgs &
@@ -36,3 +37,5 @@ export const start_server: (
  port: number;
  close: () => Promise<void>;
 }>;
+
+export const plugin: () => Plugin;
diff --git a/packages/kit/test/utils.js b/packages/kit/test/utils.js
@@ -199,3 +199,7 @@ export async function start_server(handler, start = 4000) {
  }
  };
 }
+
+export const plugin = process.env.CI
+ ? (await import('../dist/vite.js')).sveltekit
+ : (await import('../src/vite/index.js')).sveltekit;
diff --git a/turbo.json b/turbo.json
@@ -23,7 +23,7 @@
  ]
  },
  "check": {
- "dependsOn": ["sync"],
+ "dependsOn": ["prepare"],
  "inputs": [
  "src/**",
  "types/**",
@@ -34,7 +34,7 @@
  "outputs": []
  },
  "format": {},
- "sync": {
+ "prepare": {
  "outputs": [
  ".svelte-kit/types/**",
  ".svelte-kit/tsconfig.json",