@webqit/webflo 0.20.55 → 0.20.57

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.20.55",
+  "version": "0.20.57",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -47,17 +47,18 @@
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
     "@webqit/backpack": "^0.1.12",
-    "@webqit/fetch-plus": "^0.1.24",
+    "@webqit/fetch-plus": "^0.1.29",
     "@webqit/keyval": "^0.2.17",
     "@webqit/observer": "^3.8.14",
     "@webqit/oohtml-ssr": "^2.2.4",
-    "@webqit/port-plus": "^0.1.19",
-    "@webqit/url-plus": "^0.1.4",
+    "@webqit/port-plus": "^0.1.22",
+    "@webqit/url-plus": "^0.1.8",
     "@webqit/use-live": "^0.5.49",
     "@webqit/util": "^0.8.11",
     "chokidar": "^4.0.3",
+    "cross-spawn": "^7.0.6",
     "dotenv": "^16.4.7",
-    "esbuild": "^0.14.54",
+    "esbuild": "^0.27.3",
     "fast-glob": "^3.3.3",
     "idb": "^8.0.3",
     "mime-types": "^2.1.33",

package/src/util.js

@@ -2,6 +2,7 @@ import { _wq as $wq } from '@webqit/util/js/index.js';
 
 export const _wq = (target, ...args) => $wq(target, 'webflo', ...args);
 export const _meta = (target, ...args) => $wq(target, 'webflo', 'meta', ...args);
+export const _portPlusMeta = (target, ...args) => $wq(target, 'port+', 'meta', ...args);
 
 export const _await = (value, callback) => {
     if (value instanceof Promise) {

package/src/webflo-build/index.js

@@ -121,15 +121,18 @@ function writeScriptBody({ $context, $source, bootstrap, configExport, which })
 
 async function bundleScript({ $context, $source, which, outfile, asModule = true, ...restParams }) {
     const { flags: FLAGS, logger: LOGGER } = $context;
+
     // >> Show banner...
     LOGGER?.log(LOGGER.style.keyword(`---`));
     LOGGER?.log(`Bundling ${which} build`);
     LOGGER?.log(LOGGER.style.keyword(`---`));
+
     // Apply compression?
     const compression = !FLAGS.compression ? false : (
         FLAGS.compression === true ? ['gz'] : FLAGS.compression.split(',').map(s => s.trim())
     );
     const moduleFile = `${_beforeLast(outfile, '.')}.esm.js`;
+
     // >> Show waiting...
     if (LOGGER) {
         const waiting = LOGGER.waiting(
@@ -141,26 +144,34 @@ async function bundleScript({ $context, $source, which, outfile, asModule = true
     } else {
         jsFile.write($source, moduleFile, 'ES Module file');
     }
+
     // >> esbuild config
     const bundlingConfig = {
         entryPoints: [moduleFile],
         outfile,
+        bundle: true,
+        treeShaking: true,
         format: asModule ? 'esm' : 'iife',
-        platform: which === 'server' ? 'node' : 'browser', // optional but good for clarity
-        bundle: which === 'server' ? false : true,
-        minify: which === 'server' ? false : true,
-        treeShaking: true,   // Important optimization
-        banner: { js: '/** @webqit/webflo */', },
-        footer: { js: '', },
+        ...(which === 'server' ? {
+            platform: 'node',
+            packages: 'external',
+        } : {
+            platform: 'browser',
+            minify: true,
+            banner: { js: '/** @webqit/webflo */', },
+            footer: { js: '', },
+        }),
         plugins: [UseLiveTransform()],
         ...(restParams.buildParams || {})
     };
+
     if (asModule && which !== 'server') {
         // Support top-level await
         // See: https://github.com/evanw/esbuild/issues/253#issuecomment-826147115
         bundlingConfig.banner.js += '(async () => {';
         bundlingConfig.footer.js += '})();';
     }
+
     // The bundling process
     let waiting;
     if (LOGGER) {
@@ -170,8 +181,10 @@ async function bundleScript({ $context, $source, which, outfile, asModule = true
         );
         waiting.start();
     }
+
     // Main
     await EsBuild.build(bundlingConfig);
+
     // Compress...
     const compressedFiles = [];
     const removals = [];
@@ -195,10 +208,12 @@ async function bundleScript({ $context, $source, which, outfile, asModule = true
         removals.push(bundlingConfig.outfile + '.gz');
         removals.push(bundlingConfig.outfile + '.br');
     }
+
     // Remove moduleFile build
     Fs.unlinkSync(bundlingConfig.entryPoints[0]);
     removals.forEach((file) => Fs.existsSync(file) && Fs.unlinkSync(file));
     if (waiting) waiting.stop();
+
     // ----------------
     // Stats
     if (LOGGER) {
@@ -208,6 +223,7 @@ async function bundleScript({ $context, $source, which, outfile, asModule = true
         });
         LOGGER.log('');
     }
+
     return [bundlingConfig.outfile].concat(compressedFiles);
 }
 
@@ -372,7 +388,7 @@ async function generateWorkerScript({ $context, bootstrap, ...restParams }) {
             const [urls, patterns] = configExport.WORKER[strategy].reduce(([urls, patterns], url) => {
                 const patternInstance = new URLPatternPlus(url, 'http://localhost');
                 const isPattern = patternInstance.isPattern();
-                
+
                 if (isPattern && (patternInstance.hostname !== 'localhost' || patternInstance.port)) {
                     throw new Error(`Pattern URLs must have no origin part. Recieved "${url}".`);
                 }
@@ -463,7 +479,7 @@ export async function build() {
         outfiles.push(..._outfiles);
     }
 
-    if (false) { // TODO: WebfloServer needs to be buildable first
+    if ($context.flags.server && false) { // TODO: WebfloServer needs to be buildable first
         const bootstrap = await serverBootstrap($context);
         const _outfiles = await generateServerScript({ $context, bootstrap, buildParams });
         outfiles.push(..._outfiles);

package/src/webflo-config/runtime/Client.js

@@ -26,8 +26,8 @@ export default class Client extends Dotfile {
             capabilities: {
                 service_worker: false,
                 webpush: false,
-                custom_install: false,
-                exposed: ['display-mode', 'notifications'],
+                pwa_install: false,
+                exposed: [],
             },
         }, config, 'patch');
     }
@@ -89,7 +89,7 @@ export default class Client extends Dotfile {
                         inactive: 'NO',
                     },
                     {
-                        name: 'custom_install',
+                        name: 'pwa_install',
                         type: 'toggle',
                         message: 'Enable custom PWA install prompt?',
                         active: 'YES',