zuby 1.0.35 → 1.0.37

package/commands/build.js

@@ -36,7 +36,6 @@ export default async function build(options) {
         build: {
             ...viteConfig?.build,
             outDir: normalizePath(join(outDir, 'client')),
-            ssrManifest: 'chunks-manifest.json',
             rollupOptions: {
                 ...viteConfig?.build?.rollupOptions,
                 input: {
@@ -46,7 +45,6 @@ export default async function build(options) {
         },
         cacheDir: normalizePath(join(cacheDir, 'client')),
         mode: MODES.production,
-        appType: 'custom',
     });
     // Server build
     logger?.info(`${chalk.bgYellow.bold.whiteBright(` Step 2/4 `)} ${chalk.gray(`building server...`)}`);
@@ -58,19 +56,10 @@ export default async function build(options) {
             ...viteConfig?.build,
             outDir: normalizePath(join(outDir, 'server')),
             ssr: normalizePath(entryFile),
-            ssrManifest: 'chunks-manifest.json',
             target: 'node18',
         },
-        optimizeDeps: {
-            ...viteConfig?.optimizeDeps,
-            entries: ['**/*'],
-            include: ['**/*'],
-            force: true,
-            disabled: false,
-        },
         cacheDir: normalizePath(join(cacheDir, 'server')),
         mode: MODES.production,
-        appType: 'custom',
     });
     // Add serialized zuby config to build directory
     writeFileSync(normalizePath(join(outDir, 'zuby.config.json')), JSON.stringify(zubyInternalConfig, null, 2));

package/config.js

@@ -99,6 +99,7 @@ export const mergeDefaultConfig = async (config) => {
     config.logLevel = config.logLevel ?? 'info';
     // Transform to vite config
     config.vite = config.vite ?? {};
+    config.vite.appType = config.vite.appType ?? 'custom';
     config.vite.build = config.vite?.build ?? {};
     config.vite.build.cssMinify = config.vite.build.cssMinify ?? config.minifyCSS;
     config.vite.build.minify = config.vite.build.minify ?? config.minifyJS;
@@ -109,6 +110,16 @@ export const mergeDefaultConfig = async (config) => {
     config.vite.logLevel = config.vite.logLevel ?? config.logLevel;
     config.vite.customLogger = config.vite.customLogger ?? config.customLogger;
     config.vite.server = config.vite.server ?? config.server;
+    config.vite.publicDir = config.vite.publicDir ?? config.publicDir;
+    config.vite.build.ssrManifest = config.vite.build.ssrManifest ?? 'chunks-manifest.json';
+    config.vite.build.ssrEmitAssets = config.vite.build.ssrEmitAssets ?? true;
+    config.vite.optimizeDeps = config.vite.optimizeDeps ?? {};
+    config.vite.optimizeDeps = {
+        ...config.vite.optimizeDeps,
+        entries: ['**/*', ...(config.vite.optimizeDeps?.entries ?? [])],
+        include: ['**/*', ...(config.vite.optimizeDeps?.include ?? [])],
+        disabled: false,
+    };
     // Merge built-in plugins with user plugins
     config.vite.plugins = [
         ...getBuiltInPlugins(),

package/constants.d.ts

@@ -1,4 +1 @@
 export declare const ZUBY_CONFIG_FILE = "zuby.config.mjs";
-export declare const ZUBY_PAGES_CONSTANT = "__zuby_pages__";
-export declare const PAGE_TITLE_ENV_VAR = "zuby_page_title";
-export declare const TMP_DIRNAME = ".zuby-tmp";

package/constants.js

@@ -1,4 +1 @@
 export const ZUBY_CONFIG_FILE = 'zuby.config.mjs';
-export const ZUBY_PAGES_CONSTANT = '__zuby_pages__';
-export const PAGE_TITLE_ENV_VAR = 'zuby_page_title';
-export const TMP_DIRNAME = '.zuby-tmp';

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "zuby",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Zuby.js is framework for building SPA apps using Vite",
   "type": "module",
   "main": "index.js",
   "scripts": {
     "release": "cd ./dist && npm publish --access public && cd ..",
-    "build": "rm -rf dist/ && tsc && cp -rf package.json README.md src/examples dist/ && npm run bundle-server",
+    "build": "rm -rf dist/ && tsc && cp -rf package.json README.md src/examples src/tsconfigs dist/ && npm run bundle-server",
     "bundle-server": "esbuild src/server/index.ts --bundle --minify=false --platform=node --format=esm --outfile=dist/server/index.js",
     "watch-build": "npm run build && tsc --watch",
     "push-build": "npm run build && cd dist && yalc push --force && cd ..",

package/server/zubyDevServer.js

@@ -60,7 +60,6 @@ export default class ZubyDevServer extends ZubyServer {
             },
             cacheDir: normalizePath(join(this.zubyInternalConfig.cacheDir, 'client')),
             mode: MODES.development,
-            appType: 'custom',
         });
         this.viteServerDevServer = await createServer({
             ...this.zubyInternalConfig.vite,
@@ -82,22 +81,13 @@ export default class ZubyDevServer extends ZubyServer {
                 outDir: normalizePath(join(this.zubyInternalConfig.outDir, 'server')),
                 ssr: normalizePath(entryFile),
                 ssrManifest: 'chunks-manifest.json',
-                ssrEmitAssets: true,
                 target: 'node18',
                 watch: {
                     include: `${this.zubyInternalConfig.srcDir}/**/*`,
                 },
             },
-            optimizeDeps: {
-                ...this.zubyInternalConfig.vite.optimizeDeps,
-                entries: ['**/*'],
-                include: ['**/*'],
-                force: true,
-                disabled: false,
-            },
             cacheDir: normalizePath(join(this.zubyInternalConfig.cacheDir, 'server')),
             mode: MODES.development,
-            appType: 'custom',
         });
         this.useBefore(this.viteClientDevServer.middlewares);
         this.useBefore(this.viteServerDevServer.middlewares);

package/tsconfigs/default.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "allowJs": true,
+    "composite": true,
+    "useDefineForClassFields": true,
+    "lib": ["ESNext", "DOM", "DOM.Iterable"]
+  }
+}