From 8f9e77a83acf5a694d427431136437cd37f2d0ce Mon Sep 17 00:00:00 2001 From: Romuald Brillout Date: Sun, 7 Jan 2024 18:59:25 +0100 Subject: [PATCH] fix: update @brillout/vite-plugin-import-build -> @brillout/vite-plugin-server-entry --- pnpm-lock.yaml | 12 +++++++++--- telefunc/node/vite/loadTelefuncFilesWithVite.ts | 4 ++-- telefunc/node/vite/plugins/importBuild/index.ts | 4 ++-- telefunc/package.json | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4acb762c..97872f45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -366,9 +366,9 @@ importers: '@brillout/picocolors': specifier: ^1.0.10 version: 1.0.10 - '@brillout/vite-plugin-import-build': - specifier: ^0.3.1 - version: 0.3.1 + '@brillout/vite-plugin-server-entry': + specifier: ^0.4.1 + version: 0.4.1 es-module-lexer: specifier: ^0.7.1 version: 0.7.1 @@ -3044,6 +3044,12 @@ packages: '@brillout/import': 0.2.3 dev: false + /@brillout/vite-plugin-server-entry@0.4.1: + resolution: {integrity: sha512-WN45/rSp0mwMUdtueWbHVhnxecQnPJiYjh9864yijJlDYZo4g+sW0alcE7DTvsGXDrMYB5nQJSDHDqm2gepGQQ==} + dependencies: + '@brillout/import': 0.2.3 + dev: false + /@cloudflare/kv-asset-handler@0.2.0: resolution: {integrity: sha512-MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A==} dependencies: diff --git a/telefunc/node/vite/loadTelefuncFilesWithVite.ts b/telefunc/node/vite/loadTelefuncFilesWithVite.ts index 2843d5dc..9b8fc651 100644 --- a/telefunc/node/vite/loadTelefuncFilesWithVite.ts +++ b/telefunc/node/vite/loadTelefuncFilesWithVite.ts @@ -1,6 +1,6 @@ export { loadTelefuncFilesWithVite } -import { loadServerBuild } from '@brillout/vite-plugin-import-build/loadServerBuild' +import { importServerEntry } from '@brillout/vite-plugin-server-entry/importServerEntry' import { assert, assertWarning, getNodeEnv, hasProp, isObject, isProduction, isTelefuncFilePath } from '../utils' import { telefuncFilesGlobFilePath } from './importGlob/telefuncFilesGlobPath' import { loadTelefuncFilesWithImportBuild } from './plugins/importBuild/loadBuild' @@ -36,7 +36,7 @@ async function loadGlobImporter() { let moduleExports: unknown moduleExports = await loadTelefuncFilesWithImportBuild() if (moduleExports === null) { - await loadServerBuild() + await importServerEntry() moduleExports = await loadTelefuncFilesWithImportBuild() assert(moduleExports) } else { diff --git a/telefunc/node/vite/plugins/importBuild/index.ts b/telefunc/node/vite/plugins/importBuild/index.ts index e870adb7..4c51de25 100644 --- a/telefunc/node/vite/plugins/importBuild/index.ts +++ b/telefunc/node/vite/plugins/importBuild/index.ts @@ -1,6 +1,6 @@ export { importBuild } -import { importBuild as importBuild_ } from '@brillout/vite-plugin-import-build/plugin' +import { serverEntryPlugin } from '@brillout/vite-plugin-server-entry/plugin' import type { Plugin, ResolvedConfig } from 'vite' import { assert, assertPosixPath, getOutDirAbsolute, projectInfo, toPosixPath } from '../../utils' import path from 'path' @@ -17,7 +17,7 @@ function importBuild(): Plugin[] { config = config_ } }, - importBuild_({ + serverEntryPlugin({ getImporterCode: () => { return getImporterCode(config) }, diff --git a/telefunc/package.json b/telefunc/package.json index 37519f5d..555f69c4 100644 --- a/telefunc/package.json +++ b/telefunc/package.json @@ -16,7 +16,7 @@ "@brillout/import": "^0.2.3", "@brillout/json-serializer": "^0.5.6", "@brillout/picocolors": "^1.0.10", - "@brillout/vite-plugin-import-build": "^0.3.1", + "@brillout/vite-plugin-server-entry": "^0.4.1", "es-module-lexer": "^0.7.1", "picocolors": "^1.0.0", "ts-morph": "^19.0.0"