@analogjs/vite-plugin-nitro 3.0.0-alpha.3 → 3.0.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@analogjs/vite-plugin-nitro",
|
|
3
|
-
"version": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.5",
|
|
4
4
|
"description": "A Vite plugin for adding a nitro API server",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "Brandon Roberts <robertsbt@gmail.com>",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"nitro": "3.0.260311-beta",
|
|
34
34
|
"ofetch": "2.0.0-alpha.3",
|
|
35
35
|
"xmlbuilder2": "^4.0.3",
|
|
36
|
-
"
|
|
36
|
+
"oxc-parser": "^0.119.0",
|
|
37
37
|
"radix3": "^1.1.2",
|
|
38
38
|
"defu": "^6.1.4"
|
|
39
39
|
},
|
package/src/lib/build-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { build, copyPublicAssets, createNitro, prepare, prerender, } from 'nitro/builder';
|
|
2
|
-
import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
|
|
3
3
|
import { dirname, join } from 'node:path';
|
|
4
4
|
import { addPostRenderingHooks } from './hooks/post-rendering-hook.js';
|
|
5
5
|
/**
|
|
@@ -36,6 +36,30 @@ function ensureSsrTsconfig(nitroConfig) {
|
|
|
36
36
|
export function isVercelPreset(preset) {
|
|
37
37
|
return !!preset?.toLowerCase().includes('vercel');
|
|
38
38
|
}
|
|
39
|
+
function getVercelBuildConfigPath(nitro) {
|
|
40
|
+
return join(nitro.options.output.dir, 'config.json');
|
|
41
|
+
}
|
|
42
|
+
function assertValidVercelBuildConfig(nitro) {
|
|
43
|
+
if (!isVercelPreset(nitro.options.preset)) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const buildConfigPath = getVercelBuildConfigPath(nitro);
|
|
47
|
+
if (!existsSync(buildConfigPath)) {
|
|
48
|
+
throw new Error(`Nitro did not generate the expected Vercel build output config at "${buildConfigPath}".`);
|
|
49
|
+
}
|
|
50
|
+
const buildConfig = readFileSync(buildConfigPath, 'utf8').trim();
|
|
51
|
+
if (!buildConfig) {
|
|
52
|
+
throw new Error(`Nitro generated an empty Vercel build output config at "${buildConfigPath}".`);
|
|
53
|
+
}
|
|
54
|
+
try {
|
|
55
|
+
JSON.parse(buildConfig);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
const symptomError = new Error(`Nitro generated an invalid Vercel build output config at "${buildConfigPath}": ${error instanceof Error ? error.message : String(error)}`);
|
|
59
|
+
symptomError.cause = error;
|
|
60
|
+
throw symptomError;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
39
63
|
function ensureVercelFunctionConfig(nitro) {
|
|
40
64
|
if (!isVercelPreset(nitro.options.preset)) {
|
|
41
65
|
return;
|
|
@@ -123,5 +147,6 @@ export async function buildServer(options, nitroConfig, routeSourceFiles) {
|
|
|
123
147
|
ensureVercelFunctionConfig(nitro);
|
|
124
148
|
}
|
|
125
149
|
await nitro.close();
|
|
150
|
+
assertValidVercelBuildConfig(nitro);
|
|
126
151
|
}
|
|
127
152
|
//# sourceMappingURL=build-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-server.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-server.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EACL,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,SAAS,GACV,MAAM,eAAe,CAAC;AACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"build-server.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { parseSync } from 'oxc-parser';
|
|
2
2
|
import { normalizePath } from 'vite';
|
|
3
3
|
import { SERVER_FETCH_FACTORY_SNIPPET } from '../utils/renderers.js';
|
|
4
4
|
export function pageEndpointsPlugin() {
|
|
@@ -6,24 +6,13 @@ export function pageEndpointsPlugin() {
|
|
|
6
6
|
name: 'analogjs-vite-plugin-nitro-rollup-page-endpoint',
|
|
7
7
|
async transform(_code, id) {
|
|
8
8
|
if (normalizePath(id).includes('/pages/') && id.endsWith('.server.ts')) {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
sourcefile: id,
|
|
13
|
-
loader: 'ts',
|
|
14
|
-
},
|
|
15
|
-
write: false,
|
|
16
|
-
metafile: true,
|
|
17
|
-
platform: 'neutral',
|
|
18
|
-
format: 'esm',
|
|
19
|
-
logLevel: 'silent',
|
|
9
|
+
const result = parseSync(id, _code, {
|
|
10
|
+
sourceType: 'module',
|
|
11
|
+
lang: 'ts',
|
|
20
12
|
});
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
fileExports = compiled.metafile?.outputs[key].exports;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
13
|
+
const fileExports = result.module.staticExports.flatMap((e) => e.entries
|
|
14
|
+
.filter((entry) => entry.exportName.name !== null)
|
|
15
|
+
.map((entry) => entry.exportName.name));
|
|
27
16
|
// In h3 v2 / Nitro v3, event.node is undefined during prerendering
|
|
28
17
|
// (which uses the fetch-based pipeline, not Node.js http). We use
|
|
29
18
|
// optional chaining so that page endpoints work in both Node.js
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-endpoints.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/page-endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"page-endpoints.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/page-endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAErE,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,IAAI,EAAE,iDAAiD;QACvD,KAAK,CAAC,SAAS,CACb,KAAa,EACb,EAAU;YAEV,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvE,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE;oBAClC,UAAU,EAAE,QAAQ;oBACpB,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC;gBAEH,MAAM,WAAW,GAAa,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACtE,CAAC,CAAC,OAAO;qBACN,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC;qBACjD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAc,CAAC,CACnD,CAAC;gBAEF,mEAAmE;gBACnE,kEAAkE;gBAClE,gEAAgE;gBAChE,6CAA6C;gBAC7C,gEAAgE;gBAChE,wCAAwC;gBACxC,EAAE;gBACF,uEAAuE;gBACvE,uEAAuE;gBACvE,qBAAqB;gBACrB,sDAAsD;gBACtD,kEAAkE;gBAClE,EAAE;gBACF,wEAAwE;gBACxE,8DAA8D;gBAC9D,MAAM,IAAI,GAAG;;;;cAKP,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC1B,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC;kBACA,KAAK;;;kBAIX;;cAGE,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC5B,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;;;;eAKN;;;gBAGI,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WA8BjC,CAAC;gBAEJ,OAAO;oBACL,IAAI;oBACJ,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;YAED,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC"}
|