From 357ae9add56955f3321b4b0cc24799f9e5cf5e76 Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Fri, 28 Apr 2023 21:41:47 +0200 Subject: [PATCH] support Vercel's Edge Runtime (#828) --- pnpm-lock.yaml | 8 ++++++-- .../importUserCode/v1-design/transpileAndLoadPlusFile.ts | 2 +- vite-plugin-ssr/node/plugin/shared/addSsrMiddleware.ts | 2 +- vite-plugin-ssr/node/prerender/runPrerender.ts | 2 +- vite-plugin-ssr/node/runtime/index-common.ts | 2 +- vite-plugin-ssr/node/runtime/index-deprecated.ts | 2 +- vite-plugin-ssr/node/runtime/renderPage/debugPageFiles.ts | 2 +- .../runtime/renderPage/handleErrorWithoutErrorPage.ts | 2 +- vite-plugin-ssr/node/runtime/renderPage/log404.ts | 2 +- vite-plugin-ssr/node/runtime/shared/logTranspileError.ts | 2 +- vite-plugin-ssr/package.json | 8 +++++--- 11 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1338b9e843..cdd85e81cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1764,6 +1764,7 @@ importers: '@brillout/import': 0.2.3 '@brillout/json-serializer': ^0.5.3 '@brillout/part-regex': ^0.1.2 + '@brillout/picocolors': ^1.0.2 '@brillout/release-me': ^0.1.3 '@brillout/vite-plugin-import-build': ^0.2.16 '@types/estree': ^1.0.0 @@ -1775,7 +1776,6 @@ importers: es-module-lexer: ^0.10.0 esbuild: ^0.17.0 fast-glob: ^3.0.0 - picocolors: ^1.0.0 rimraf: ^3.0.2 sirv: ^2.0.0 typescript: ^5.0.2 @@ -1783,13 +1783,13 @@ importers: 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.8.2 cac: 6.7.12 es-module-lexer: 0.10.5 esbuild: 0.17.10 fast-glob: 3.2.12 - picocolors: 1.0.0 sirv: 2.0.2 devDependencies: '@brillout/part-regex': 0.1.2 @@ -2727,6 +2727,10 @@ packages: resolution: {integrity: sha512-3b/5PLhJ4xMF/cyY1aJXIMQT0TONFFgUX3tH2wfdrHe78OYe8igl0iaHkJ3kzgN0V+x562Of2AoMwThtLaAj5Q==} dev: true + /@brillout/picocolors/1.0.2: + resolution: {integrity: sha512-3nLSibUNMs6ou0A4p9X6kFnDTbfvcj8nPJuQCsD7hz9cws6IbIhLBoZ08u3c0EztyYbIi+pD2MGHCDU9N+VhWQ==} + dev: false + /@brillout/release-me/0.0.8: resolution: {integrity: sha512-sZUjOMkcQ2Eq3tDiL24t4Mgt93tMAs7oeNy/LHqPBlWGO+db8U+ZSpdAhae7rIyse53fBuXV9KLH0DdDkFkLGA==} hasBin: true 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 index f14a8a4013..d93e8ceee9 100644 --- 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 index 6eb4a2b791..6a344ee8af 100644 --- 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 index f13d217a09..06ece68fe7 100644 --- 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 index 0ccfa01ab1..7c5f9c8fb1 100644 --- 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 index 0c9d7c3320..22ba68bd2d 100644 --- 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 index 1699f15fb4..cf6a87590a 100644 --- 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 index 07edb4529a..6dba7b2a07 100644 --- 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 index eabe7258d6..c949cc788f 100644 --- 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 index ecc3b78320..74ff9fc204 100644 --- 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 index 20985d2719..4fd0693b86 100644 --- 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": {