@analogjs/vite-plugin-nitro 1.0.0-rc.1 → 1.0.0-rc.2
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 +1 -1
- package/src/lib/build-server.js +3 -3
- package/src/lib/build-server.js.map +1 -1
- package/src/lib/build-sitemap.d.ts +1 -1
- package/src/lib/build-sitemap.js +4 -4
- package/src/lib/build-sitemap.js.map +1 -1
- package/src/lib/build-ssr.js +4 -4
- package/src/lib/build-ssr.js.map +1 -1
- package/src/lib/plugins/dev-server-plugin.js +3 -3
- package/src/lib/plugins/dev-server-plugin.js.map +1 -1
- package/src/lib/utils/get-content-files.js +5 -5
- package/src/lib/utils/get-content-files.js.map +1 -1
- package/src/lib/utils/get-page-handlers.js +3 -3
- package/src/lib/utils/get-page-handlers.js.map +1 -1
- package/src/lib/utils/load-esm.d.ts +1 -1
- package/src/lib/vite-nitro-plugin.spec.data.js +4 -4
- package/src/lib/vite-nitro-plugin.spec.data.js.map +1 -1
- package/src/lib/vite-plugin-nitro.d.ts +1 -1
- package/src/lib/vite-plugin-nitro.js +11 -11
- package/src/lib/vite-plugin-nitro.js.map +1 -1
package/package.json
CHANGED
package/src/lib/build-server.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { copyPublicAssets, prerender } from 'nitropack';
|
|
2
2
|
import { createNitro, build, prepare } from 'nitropack';
|
|
3
|
-
import
|
|
3
|
+
import { existsSync, unlinkSync } from 'node:fs';
|
|
4
4
|
import { addPostRenderingHooks } from './hooks/post-rendering-hook.js';
|
|
5
5
|
export async function buildServer(options, nitroConfig) {
|
|
6
6
|
const nitro = await createNitro({
|
|
@@ -16,8 +16,8 @@ export async function buildServer(options, nitroConfig) {
|
|
|
16
16
|
if (nitroConfig?.prerender?.routes &&
|
|
17
17
|
nitroConfig?.prerender?.routes.find((route) => route === '/')) {
|
|
18
18
|
// Remove the root index.html so it can be replaced with the prerendered version
|
|
19
|
-
if (
|
|
20
|
-
|
|
19
|
+
if (existsSync(`${nitroConfig?.output?.publicDir}/index.html`)) {
|
|
20
|
+
unlinkSync(`${nitroConfig?.output?.publicDir}/index.html`);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
console.log(`Prerendering static pages...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-server.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"build-server.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,gBAAgB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAiB,EACjB,WAAyB;IAEzB,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC;QAC9B,GAAG,EAAE,KAAK;QACV,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QACnC,GAAG,WAAW;KACf,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAC3C,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;IACrB,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAE9B,IACE,WAAW,EAAE,SAAS,EAAE,MAAM;QAC9B,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,EAC7D,CAAC;QACD,gFAAgF;QAChF,IAAI,UAAU,CAAC,GAAG,WAAW,EAAE,MAAM,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC;YAC/D,UAAU,CAAC,GAAG,WAAW,EAAE,MAAM,EAAE,SAAS,aAAa,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IAEvB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC"}
|
package/src/lib/build-sitemap.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { writeFileSync } from 'node:fs';
|
|
2
2
|
import { create } from 'xmlbuilder2';
|
|
3
|
-
import
|
|
3
|
+
import { resolve } from 'node:path';
|
|
4
4
|
export async function buildSitemap(config, sitemapConfig, routes, outputDir) {
|
|
5
5
|
const routeList = await optionHasRoutes(routes);
|
|
6
6
|
if (routeList.length) {
|
|
@@ -15,10 +15,10 @@ export async function buildSitemap(config, sitemapConfig, routes, outputDir) {
|
|
|
15
15
|
page.ele('loc').txt(item.page);
|
|
16
16
|
page.ele('lastmod').txt(item.lastMod);
|
|
17
17
|
}
|
|
18
|
-
const mapPath = `${
|
|
18
|
+
const mapPath = `${resolve(outputDir)}/sitemap.xml`;
|
|
19
19
|
try {
|
|
20
20
|
console.log(`Writing sitemap at ${mapPath}`);
|
|
21
|
-
|
|
21
|
+
writeFileSync(mapPath, sitemap.end({ prettyPrint: true }));
|
|
22
22
|
}
|
|
23
23
|
catch (e) {
|
|
24
24
|
console.error(`Unable to write file at ${mapPath}`, e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-sitemap.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-sitemap.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"build-sitemap.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-sitemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAkB,EAClB,aAA4B,EAC5B,MAAwE,EACxE,SAAiB;IAEjB,MAAM,SAAS,GAAa,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;IAE1D,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAgB,SAAS,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;YAChE,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE;YACjE,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEpC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC;QACpD,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;YAC7C,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,WAAsC;IACvD,OAAO,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SACjD,GAAG,CAAC,WAAW,EAAE;QAChB,KAAK,EAAE,8CAA8C;KACtD,CAAC;SACD,GAAG,CAAC,kDAAkD,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,OAAO,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,MAAwE;IAExE,IAAI,SAAiC,CAAC;IAEtC,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,gCAAgC;QAChC,SAAS,GAAG,MAAM,MAAM,EAAE,CAAC;IAC7B,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACjC,8BAA8B;QAC9B,SAAS,GAAG,MAAM,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,kCAAkC;QAClC,SAAS,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,OAAO,SAAS,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;AAC/C,CAAC"}
|
package/src/lib/build-ssr.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { build, mergeConfig } from 'vite';
|
|
2
|
-
import
|
|
2
|
+
import { relative, resolve } from 'node:path';
|
|
3
3
|
export async function buildSSRApp(config, options) {
|
|
4
4
|
const workspaceRoot = options?.workspaceRoot ?? process.cwd();
|
|
5
|
-
const rootDir =
|
|
5
|
+
const rootDir = relative(workspaceRoot, config.root || '.') || '.';
|
|
6
6
|
const ssrBuildConfig = mergeConfig(config, {
|
|
7
7
|
build: {
|
|
8
8
|
ssr: true,
|
|
9
9
|
rollupOptions: {
|
|
10
|
-
input: options?.entryServer ||
|
|
10
|
+
input: options?.entryServer || resolve(rootDir, './src/main.server.ts'),
|
|
11
11
|
},
|
|
12
|
-
outDir: options?.ssrBuildDir ||
|
|
12
|
+
outDir: options?.ssrBuildDir || resolve('dist', rootDir, 'ssr'),
|
|
13
13
|
},
|
|
14
14
|
});
|
|
15
15
|
await build(ssrBuildConfig);
|
package/src/lib/build-ssr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-ssr.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAc,MAAM,MAAM,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"build-ssr.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/build-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAc,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAI9C,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAkB,EAAE,OAAiB;IACrE,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9D,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC;IACnE,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE;QACzC,KAAK,EAAE;YACL,GAAG,EAAE,IAAI;YACT,aAAa,EAAE;gBACb,KAAK,EAAE,OAAO,EAAE,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,sBAAsB,CAAC;aACxE;YACD,MAAM,EAAE,OAAO,EAAE,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC;SAChE;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// SSR dev server, middleware and error page source modified from
|
|
2
2
|
// https://github.com/solidjs/solid-start/blob/main/packages/start/dev/server.js
|
|
3
|
-
import
|
|
4
|
-
import
|
|
3
|
+
import { resolve } from 'node:path';
|
|
4
|
+
import { readFileSync } from 'node:fs';
|
|
5
5
|
export function devServerPlugin(options) {
|
|
6
6
|
const entryServer = options.entryServer || 'src/main.server.ts';
|
|
7
7
|
const index = options.index || 'index.html';
|
|
@@ -20,7 +20,7 @@ export function devServerPlugin(options) {
|
|
|
20
20
|
return async () => {
|
|
21
21
|
remove_html_middlewares(viteServer.middlewares);
|
|
22
22
|
viteServer.middlewares.use(async (req, res) => {
|
|
23
|
-
let template =
|
|
23
|
+
let template = readFileSync(resolve(viteServer.config.root, index), 'utf-8');
|
|
24
24
|
template = await viteServer.transformIndexHtml(req.originalUrl, template);
|
|
25
25
|
try {
|
|
26
26
|
const entryServer = (await viteServer.ssrLoadModule('~analog/entry-server'))['default'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server-plugin.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/dev-server-plugin.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,gFAAgF;AAGhF,OAAO,
|
|
1
|
+
{"version":3,"file":"dev-server-plugin.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/plugins/dev-server-plugin.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,gFAAgF;AAGhF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAOvC,MAAM,UAAU,eAAe,CAAC,OAAsB;IACpD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAChE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC;IAE5C,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,MAAM;YACJ,OAAO;gBACL,OAAO,EAAE;oBACP,KAAK,EAAE;wBACL,sBAAsB,EAAE,WAAW;qBACpC;iBACF;aACF,CAAC;QACJ,CAAC;QACD,eAAe,CAAC,UAAU;YACxB,OAAO,KAAK,IAAI,EAAE;gBAChB,uBAAuB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;gBAChD,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC5C,IAAI,QAAQ,GAAG,YAAY,CACzB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EACtC,OAAO,CACR,CAAC;oBAEF,QAAQ,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC5C,GAAG,CAAC,WAAqB,EACzB,QAAQ,CACT,CAAC;oBAEF,IAAI,CAAC;wBACH,MAAM,WAAW,GAAG,CAClB,MAAM,UAAU,CAAC,aAAa,CAAC,sBAAsB,CAAC,CACvD,CAAC,SAAS,CAAC,CAAC;wBACb,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE;4BAC1D,GAAG;4BACH,GAAG;yBACJ,CAAC,CAAC;wBACH,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;wBAC3C,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,UAAU,IAAI,UAAU,CAAC,gBAAgB,CAAC,CAAU,CAAC,CAAC;wBACtD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;wBACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;;iEAQ6C,IAAI,CAAC,SAAS,CACzD,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CACrB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;;;;;aAMjC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,MAAoC;IACnE,MAAM,gBAAgB,GAAG;QACvB,yBAAyB;QACzB,mBAAmB;QACnB,2BAA2B;KAC5B,CAAC;IACF,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,aAAa;QACb,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,GAA4B,EAAE,KAAc;IAChE,MAAM,CAAC,GAAG,KAAc,CAAC;IACzB,OAAO;QACL,OAAO,EAAE,2CAA2C,GAAG,CAAC,GAAG,UACzD,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAChC,GAAG;QACH,KAAK,EAAE,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;KAC5C,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
2
|
+
import { join, relative, resolve } from 'node:path';
|
|
3
3
|
import { normalizePath } from 'vite';
|
|
4
4
|
import { createRequire } from 'node:module';
|
|
5
5
|
const require = createRequire(import.meta.url);
|
|
@@ -8,13 +8,13 @@ export function getMatchingContentFilesWithFrontMatter(workspaceRoot, rootDir, g
|
|
|
8
8
|
const fg = require('fast-glob');
|
|
9
9
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
10
10
|
const fm = require('front-matter');
|
|
11
|
-
const root = normalizePath(
|
|
12
|
-
const resolvedDir = normalizePath(
|
|
11
|
+
const root = normalizePath(resolve(workspaceRoot, rootDir));
|
|
12
|
+
const resolvedDir = normalizePath(relative(root, join(root, glob)));
|
|
13
13
|
const contentFiles = fg.sync([`${root}/${resolvedDir}/*`], {
|
|
14
14
|
dot: true,
|
|
15
15
|
});
|
|
16
16
|
const mappedFilesWithFm = contentFiles.map((f) => {
|
|
17
|
-
const fileContents =
|
|
17
|
+
const fileContents = readFileSync(f, 'utf8');
|
|
18
18
|
const raw = fm(fileContents);
|
|
19
19
|
const filepath = f.replace(root, '');
|
|
20
20
|
const match = filepath.match(/\/([^/.]+)(\.([^/.]+))?$/);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-content-files.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-content-files.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get-content-files.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-content-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,UAAU,sCAAsC,CACpD,aAAqB,EACrB,OAAe,EACf,IAAY;IAEZ,8DAA8D;IAC9D,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,8DAA8D;IAC9D,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,YAAY,GAAa,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI,WAAW,IAAI,CAAC,EAAE;QACnE,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAA2B,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACvE,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,QAAQ,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAErC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACzD,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAChB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,gDAAgD;QAC9E,CAAC;QAED,OAAO;YACL,IAAI;YACJ,SAAS;YACT,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,GAAG,CAAC,UAAiD;SAClE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
2
|
import fg from 'fast-glob';
|
|
3
3
|
import { normalizePath } from 'vite';
|
|
4
4
|
export function getPageHandlers({ workspaceRoot, rootDir }) {
|
|
5
|
-
const root = normalizePath(
|
|
5
|
+
const root = normalizePath(resolve(workspaceRoot, rootDir));
|
|
6
6
|
const endpointFiles = fg.sync([`${root}/src/app/pages/**/*.server.ts`], { dot: true });
|
|
7
7
|
const handlers = endpointFiles.map((endpointFile) => {
|
|
8
8
|
const route = endpointFile
|
|
9
|
-
.replace(normalizePath(
|
|
9
|
+
.replace(normalizePath(resolve(workspaceRoot, rootDir, 'src/app')), '')
|
|
10
10
|
.replace(/\.server\.ts$/, '')
|
|
11
11
|
.replace(/\[\.{3}(.+)\]/g, '**:$1')
|
|
12
12
|
.replace(/\[\.{3}(\w+)\]/g, '**:$1')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-page-handlers.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-page-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get-page-handlers.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-nitro/src/lib/utils/get-page-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,WAAW,CAAC;AAG3B,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAOrC,MAAM,UAAU,eAAe,CAAC,EAAE,aAAa,EAAE,OAAO,EAAmB;IACzE,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5D,MAAM,aAAa,GAAa,EAAE,CAAC,IAAI,CACrC,CAAC,GAAG,IAAI,+BAA+B,CAAC,EACxC,EAAE,GAAG,EAAE,IAAI,EAAE,CACd,CAAC;IAEF,MAAM,QAAQ,GAAwB,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;QACvE,MAAM,KAAK,GAAG,YAAY;aACvB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;aACtE,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;aAC5B,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC;aAClC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;aACnC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC;aAChC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC;aAC5B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEvB,OAAO;YACL,OAAO,EAAE,YAAY;YACrB,KAAK,EAAE,WAAW,KAAK,EAAE;YACzB,IAAI,EAAE,IAAI;SACX,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
|
-
import { URL } from 'url';
|
|
9
|
+
import { URL } from 'node:url';
|
|
10
10
|
/**
|
|
11
11
|
* This uses a dynamic import to load a module which may be ESM.
|
|
12
12
|
* CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { vi } from 'vitest';
|
|
2
|
-
import
|
|
2
|
+
import { resolve } from 'node:path';
|
|
3
3
|
export const mockViteDevServer = {
|
|
4
4
|
middlewares: {
|
|
5
5
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
@@ -7,12 +7,12 @@ export const mockViteDevServer = {
|
|
|
7
7
|
},
|
|
8
8
|
};
|
|
9
9
|
export const mockNitroConfig = {
|
|
10
|
-
buildDir:
|
|
10
|
+
buildDir: resolve('./dist/.nitro'),
|
|
11
11
|
handlers: [],
|
|
12
12
|
logLevel: 0,
|
|
13
13
|
output: {
|
|
14
|
-
dir:
|
|
15
|
-
publicDir:
|
|
14
|
+
dir: resolve('dist/analog'),
|
|
15
|
+
publicDir: resolve('dist/analog/public'),
|
|
16
16
|
},
|
|
17
17
|
rootDir: '.',
|
|
18
18
|
runtimeConfig: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-nitro-plugin.spec.data.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"vite-nitro-plugin.spec.data.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,WAAW,EAAE;QACX,gEAAgE;QAChE,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;KACd;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAgB;IAC1C,QAAQ,EAAE,OAAO,CAAC,eAAe,CAAC;IAClC,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,CAAC;IACX,MAAM,EAAE;QACN,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC;QAC3B,SAAS,EAAE,OAAO,CAAC,oBAAoB,CAAC;KACzC;IACD,OAAO,EAAE,GAAG;IACZ,aAAa,EAAE,EAAE;IACjB,QAAQ,EAAE,CAAC,YAAY,CAAC;IACxB,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE;QACT,UAAU,EAAE,SAAS;KACtB;IACD,UAAU,EAAE;QACV,gBAAgB,EAAE,KAAK;KACxB;IACD,YAAY,EAAE;QACZ,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,iDAAiD;gBACvD,SAAS,KAAI,CAAC;aACf;SACF;KACF;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACzD,MAAM,oBAAoB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,iBAAiB,CAAC,WAAW,GAAG,oBAAoB,CAAC;IAErD,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,oBAAoB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACrC,iBAAiB,CAAC,WAAW,GAAG,oBAAoB,CAAC;IAErD,MAAM,kBAAkB,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,MAAM,qBAAqB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACtC,kBAAkB,CAAC,YAAY,GAAG,qBAAqB,CAAC;IAExD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAC;AAC/E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,MAAgB;IAC5D,MACE,MAAM,CAAC,CAAC,CAAC,CAAC,MAIX,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAe,CAAC,CAAC;IACzC,MAAO,MAAM,CAAC,CAAC,CAAC,CAAC,WAAmC,EAAE,CAAC;AACzD,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { build, createDevServer, createNitro } from 'nitropack';
|
|
2
2
|
import { toNodeListener } from 'h3';
|
|
3
3
|
import { normalizePath } from 'vite';
|
|
4
|
-
import
|
|
4
|
+
import { dirname, relative, resolve } from 'node:path';
|
|
5
5
|
import { platform } from 'node:os';
|
|
6
6
|
import { buildServer } from './build-server.js';
|
|
7
7
|
import { buildSSRApp } from './build-ssr.js';
|
|
@@ -12,7 +12,7 @@ import { devServerPlugin } from './plugins/dev-server-plugin.js';
|
|
|
12
12
|
import { getMatchingContentFilesWithFrontMatter } from './utils/get-content-files.js';
|
|
13
13
|
const isWindows = platform() === 'win32';
|
|
14
14
|
let clientOutputPath = '';
|
|
15
|
-
const __dirname =
|
|
15
|
+
const __dirname = dirname(new URL(import.meta.url).pathname);
|
|
16
16
|
export function nitro(options, nitroOptions) {
|
|
17
17
|
const workspaceRoot = options?.workspaceRoot ?? process.cwd();
|
|
18
18
|
const isTest = process.env['NODE_ENV'] === 'test' || !!process.env['VITEST'];
|
|
@@ -36,7 +36,7 @@ export function nitro(options, nitroOptions) {
|
|
|
36
36
|
isBuild = command === 'build';
|
|
37
37
|
ssrBuild = _config.build?.ssr === true;
|
|
38
38
|
config = _config;
|
|
39
|
-
const rootDir =
|
|
39
|
+
const rootDir = relative(workspaceRoot, config.root || '.') || '.';
|
|
40
40
|
const buildPreset = process.env['BUILD_PRESET'] ??
|
|
41
41
|
nitroOptions?.preset;
|
|
42
42
|
const pageHandlers = getPageHandlers({ workspaceRoot, rootDir });
|
|
@@ -47,11 +47,11 @@ export function nitro(options, nitroOptions) {
|
|
|
47
47
|
srcDir: normalizePath(`${rootDir}/src/server`),
|
|
48
48
|
scanDirs: [normalizePath(`${rootDir}/src/server`)],
|
|
49
49
|
output: {
|
|
50
|
-
dir: normalizePath(
|
|
51
|
-
publicDir: normalizePath(
|
|
50
|
+
dir: normalizePath(resolve(workspaceRoot, 'dist', rootDir, 'analog')),
|
|
51
|
+
publicDir: normalizePath(resolve(workspaceRoot, 'dist', rootDir, 'analog/public')),
|
|
52
52
|
...nitroOptions?.output,
|
|
53
53
|
},
|
|
54
|
-
buildDir: normalizePath(
|
|
54
|
+
buildDir: normalizePath(resolve(workspaceRoot, 'dist', rootDir, '.nitro')),
|
|
55
55
|
typescript: {
|
|
56
56
|
generateTsConfig: false,
|
|
57
57
|
},
|
|
@@ -78,13 +78,13 @@ export function nitro(options, nitroOptions) {
|
|
|
78
78
|
}
|
|
79
79
|
if (!ssrBuild && !isTest) {
|
|
80
80
|
// store the client output path for the SSR build config
|
|
81
|
-
clientOutputPath =
|
|
81
|
+
clientOutputPath = resolve(rootDir, config.build?.outDir || 'dist/client');
|
|
82
82
|
}
|
|
83
83
|
nitroConfig.alias = {
|
|
84
84
|
// This is not the final fix but start point to discuss a fix for windows
|
|
85
85
|
'#analog/ssr': (isWindows ? 'file://' : '') +
|
|
86
|
-
normalizePath(
|
|
87
|
-
'#analog/index': normalizePath(
|
|
86
|
+
normalizePath(resolve(workspaceRoot, 'dist', rootDir, 'ssr/main.server')),
|
|
87
|
+
'#analog/index': normalizePath(resolve(clientOutputPath, 'index.html')),
|
|
88
88
|
...nitroOptions?.alias,
|
|
89
89
|
};
|
|
90
90
|
if (isBuild) {
|
|
@@ -215,8 +215,8 @@ const withVercelOutputAPI = (nitroConfig, workspaceRoot) => ({
|
|
|
215
215
|
...nitroConfig,
|
|
216
216
|
output: {
|
|
217
217
|
...nitroConfig?.output,
|
|
218
|
-
dir: normalizePath(
|
|
219
|
-
publicDir: normalizePath(
|
|
218
|
+
dir: normalizePath(resolve(workspaceRoot, '.vercel', 'output')),
|
|
219
|
+
publicDir: normalizePath(resolve(workspaceRoot, '.vercel', 'output/static')),
|
|
220
220
|
},
|
|
221
221
|
});
|
|
222
222
|
//# sourceMappingURL=vite-plugin-nitro.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-nitro.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7E,OAAO,EAAO,cAAc,EAAE,MAAM,IAAI,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"vite-plugin-nitro.js","sourceRoot":"","sources":["../../../../../packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts"],"names":[],"mappings":"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"}
|