zuby 1.0.61 → 1.0.63

package/packageConfig.js

@@ -1,13 +1,17 @@
 import { fileURLToPath } from 'url';
 import { dirname, resolve } from 'path';
 import { readFileSync } from 'fs';
-let packageJson;
+let packageConfigCache;
+/**
+ * Returns the package.json content of the current package.
+ * @param cache - If true, the package.json content will be cached.
+ */
 export const getZubyPackageConfig = (cache = true) => {
-    if (cache && packageJson)
-        return packageJson;
+    if (cache && packageConfigCache)
+        return packageConfigCache;
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
     // Cache the package.json content
-    packageJson = JSON.parse(readFileSync(resolve(__dirname, 'package.json'), 'utf-8'));
-    return packageJson;
+    packageConfigCache = JSON.parse(readFileSync(resolve(__dirname, 'package.json'), 'utf-8'));
+    return packageConfigCache;
 };

package/plugins/chunkNamingPlugin/index.js

@@ -1,12 +1,17 @@
 import { MODES } from '../../types.js';
+import { getZubyInternalConfig } from '../../config.js';
 /**
  * This is internal plugin
  * which configure a custom chunk naming for the build.
  */
 export default function chunkNamingPlugin() {
+    let buildId;
     return {
         name: 'zuby-chunk-naming-plugin',
         enforce: 'pre',
+        async configResolved() {
+            buildId = (await getZubyInternalConfig()).buildId;
+        },
         config(config) {
             if (!config.build)
                 config.build = {};
@@ -18,15 +23,15 @@ export default function chunkNamingPlugin() {
                 return;
             }
             const transformJsFileName = (chunkInfo) => {
+                const folder = 'chunks/';
+                const name = config?.mode === MODES.production ? 'chunk' : '[name]';
                 if (config.build?.ssr && chunkInfo.isEntry) {
                     return `[name].js`;
                 }
-                const folder = 'chunks/';
-                const prefix = chunkInfo.isEntry ? 'entry' : 'chunk';
-                if (config?.mode === MODES.production) {
-                    return `${folder}${prefix}-[hash].js`;
+                if (chunkInfo.isEntry) {
+                    return `${folder}entry-${buildId}.js`;
                 }
-                return `${folder}[name]-[hash].js`;
+                return `${folder}${name}-[hash].js`;
             };
             const transformAssetFileName = (_chunkInfo) => {
                 if (config?.mode === MODES.production) {

package/plugins/contextPlugin/index.js

@@ -25,10 +25,10 @@ export default function index() {
     };
 }
 export async function generateCompileTimeContextCode(ssr) {
-    const { site, i18n, buildId, props, serverProps, headElements } = await getZubyInternalConfig();
+    const { site, i18n, buildId, props, serverProps, headElements, bodyElements } = await getZubyInternalConfig();
     const { version } = await getZubyPackageConfig();
-    return `globalThis.ZubyRawContext = {
-        ...(globalThis.ZubyRawContext || {}),
+    return `globalThis._zubyGlobalContext = {
+        ...(globalThis._zubyGlobalContext || {}),
         templates: ${await generateTemplatesCode(ssr)},
         render: ${await generateRenderCode(ssr)},
         site: '${site || ''}',
@@ -38,6 +38,7 @@ export async function generateCompileTimeContextCode(ssr) {
         props: ${JSON.stringify(props)},
         serverProps: ${JSON.stringify(ssr ? serverProps : {})},
         headElements: ${JSON.stringify(ssr ? headElements : [])},
+        bodyElements: ${JSON.stringify(ssr ? bodyElements : [])},
         i18n: ${JSON.stringify(i18n)},
     };`;
 }

package/preload/index.js

@@ -1,4 +1,4 @@
-import { getContext } from '../context/index.js';
+import { getGlobalContext } from '../contexts/index.js';
 import { PREALOD_MANIFEST } from '../constants.js';
 /**
  * The set of links that were already preloaded.
@@ -48,8 +48,8 @@ export function preloadPage(href, onHandle = () => { }) {
     // Do nothing on server
     if (typeof window === 'undefined')
         return;
-    const context = getContext();
-    const pages = context.templates?.pages || [];
+    const context = getGlobalContext();
+    const pages = context.templates.pages || [];
     const page = pages.find(({ pathRegex }) => {
         return pathRegex.test(href);
     });
@@ -87,8 +87,8 @@ async function getPreloadManifest() {
     return (preloadManifest =
         preloadManifest ||
             (async () => {
-                const { buildId } = getContext();
-                const res = await fetch(`/${PREALOD_MANIFEST}?${buildId}`);
+                const { buildId } = getGlobalContext();
+                const res = await fetch(`/${PREALOD_MANIFEST}?${encodeURIComponent(buildId)}`);
                 return res.json();
             })());
 }