support Vercel's Edge Runtime (#828)

vikejs · Apr 28, 2023 · 357ae9a · 357ae9a
1 parent c4e6f67
commit 357ae9a
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 14 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/vite-plugin-ssr/node/plugin/plugins/importUserCode/v1-design/transpileAndLoadPlusFile.ts b/vite-plugin-ssr/node/plugin/plugins/importUserCode/v1-design/transpileAndLoadPlusFile.ts
@@ -4,7 +4,7 @@ export { transpileAndLoadConfigValueFile }
 import esbuild, { type BuildResult, type BuildOptions } from 'esbuild'
 import fs from 'fs'
 import path from 'path'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 import { import_ } from '@brillout/import'
 import {
   assertPosixPath,

diff --git a/vite-plugin-ssr/node/plugin/shared/addSsrMiddleware.ts b/vite-plugin-ssr/node/plugin/shared/addSsrMiddleware.ts
@@ -3,7 +3,7 @@ export { addSsrMiddleware }
 import { renderPage } from '../../runtime/renderPage'
 import type { OnRenderResult } from '../../runtime/renderPage/onRenderResult'
 import type { ViteDevServer } from 'vite'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 import { assert, projectInfo } from '../utils'
 
 type ConnectServer = ViteDevServer['middlewares']

diff --git a/vite-plugin-ssr/node/prerender/runPrerender.ts b/vite-plugin-ssr/node/prerender/runPrerender.ts
@@ -32,7 +32,7 @@ import {
   prerender404Page,
   initPageContext
 } from '../runtime/renderPage/renderPageContext'
-import { blue, green, gray, cyan } from 'picocolors'
+import { blue, green, gray, cyan } from '@brillout/picocolors'
 import { cpus } from 'os'
 import type { PageFile } from '../../shared/getPageFiles'
 import { getGlobalContext, initGlobalContext } from '../runtime/globalContext'

diff --git a/vite-plugin-ssr/node/runtime/index-common.ts b/vite-plugin-ssr/node/runtime/index-common.ts
@@ -14,7 +14,7 @@ export { createPageRenderer } from '../createPageRenderer'
 // TODO/v1-release: remove
 import { assertWarning } from './utils'
 import { RenderErrorPage as RenderErrorPage_ } from '../../shared/route/RenderErrorPage'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 export const RenderErrorPage: typeof RenderErrorPage_ = (...args) => {
   assertWarning(
     false,

diff --git a/vite-plugin-ssr/node/runtime/index-deprecated.ts b/vite-plugin-ssr/node/runtime/index-deprecated.ts
@@ -4,7 +4,7 @@ export * from './index-common'
 export * from '../../types/index-dreprecated'
 
 import { assertWarning } from './utils'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 assertWarning(
   false,
   [

diff --git a/vite-plugin-ssr/node/runtime/renderPage/debugPageFiles.ts b/vite-plugin-ssr/node/runtime/renderPage/debugPageFiles.ts
@@ -4,7 +4,7 @@ export type { PageContextDebug }
 import { RouteMatches } from '../../../shared/route'
 import type { ClientDependency } from '../../../shared/getPageFiles/analyzePageClientSide/ClientDependency'
 import type { PageFile } from '../../../shared/getPageFiles'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 import { assert, makeFirst, createDebugger } from '../utils'
 import type { PageConfig } from '../../../shared/page-configs/PageConfig'
 

diff --git a/vite-plugin-ssr/node/runtime/renderPage/handleErrorWithoutErrorPage.ts b/vite-plugin-ssr/node/runtime/renderPage/handleErrorWithoutErrorPage.ts
@@ -5,7 +5,7 @@ import { stringify } from '@brillout/json-serializer/stringify'
 import { getGlobalContext } from '../globalContext'
 import { assert, assertWarning, objectAssign } from '../utils'
 import { createHttpResponseObject } from './createHttpResponseObject'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 import type { GetPageAssets } from './getPageAssets'
 import type { PageContextAfterRender } from './renderPageContext'
 import type { PageConfig } from '../../../shared/page-configs/PageConfig'

diff --git a/vite-plugin-ssr/node/runtime/renderPage/log404.ts b/vite-plugin-ssr/node/runtime/renderPage/log404.ts
@@ -4,7 +4,7 @@ import { PageFile } from '../../../shared/getPageFiles'
 import { PageRoutes, loadPageRoutes } from '../../../shared/route'
 import { getGlobalContext } from '../globalContext'
 import { assert, assertUsage, assertInfo, compareString } from '../utils'
-import pc from 'picocolors'
+import pc from '@brillout/picocolors'
 import { isRenderErrorPageException } from '../../../shared/route/RenderErrorPage'
 import type { PageConfig, PageConfigGlobal } from '../../../shared/page-configs/PageConfig'
 

diff --git a/vite-plugin-ssr/node/runtime/shared/logTranspileError.ts b/vite-plugin-ssr/node/runtime/shared/logTranspileError.ts
@@ -4,7 +4,7 @@ export { isTranspileError }
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 
 // import strip from 'strip-ansi'
-import colors from 'picocolors'
+import colors from '@brillout/picocolors'
 import { isObject } from '../utils'
 import type { ViteDevServer, Rollup } from 'vite'
 type RollupError = Rollup.RollupError

diff --git a/vite-plugin-ssr/package.json b/vite-plugin-ssr/package.json
@@ -15,26 +15,28 @@
   "dependencies": {
     "@brillout/import": "0.2.3",
     "@brillout/json-serializer": "^0.5.3",
+    "@brillout/picocolors": "^1.0.2",
     "@brillout/vite-plugin-import-build": "^0.2.16",
     "acorn": "^8.0.0",
     "cac": "^6.0.0",
     "es-module-lexer": "^0.10.0",
     "esbuild": "^0.17.0",
     "fast-glob": "^3.0.0",
-    "picocolors": "^1.0.0",
     "sirv": "^2.0.0"
   },
   "exports": {
     ".": {
       "worker": "./dist/cjs/node/runtime/index-deprecated.js",
       "node": "./dist/cjs/node/runtime/index-deprecated.js",
-      "browser": "./dist/esm/client/node.js",
+      "edge": "./dist/cjs/node/runtime/index-deprecated.js",
+      "edge-light": "./dist/cjs/node/runtime/index-deprecated.js",
       "types": "./dist/types/node/runtime/index-deprecated.d.ts"
     },
     "./server": {
       "worker": "./dist/cjs/node/runtime/index.js",
       "node": "./dist/cjs/node/runtime/index.js",
-      "browser": "./dist/esm/client/node.js",
+      "edge": "./dist/cjs/node/runtime/index.js",
+      "edge-light": "./dist/cjs/node/runtime/index.js",
       "types": "./dist/types/node/runtime/index.d.ts"
     },
     "./client": {