@flatjs/evolve 2.1.3 → 2.1.5

package/dist/dev-server/middlewares/create-page-middleware.js

@@ -1 +1 @@
-import{getPageMainHtml}from"./get-page-main-html.js";import{getPageModuleHtml}from"./get-page-module-html.js";import{getRuntimeManifest}from"./get-runtime-manifest.js";export const createPageMiddleware=(e,t,a,m)=>(m.devServer?.middlewares||[]).concat((async(i,n)=>{let g;if("/runtime/manifest.json"===i.path){const t=await getRuntimeManifest(a,e,m);return n.json(t)}g="/"===i.path?await getPageMainHtml(a,e,m):await getPageModuleHtml(a,i,e,t,m),n.send(g)}));
+import{getPageMainHtml}from"./get-page-main-html.js";import{getPageModuleHtml}from"./get-page-module-html.js";import{getRuntimeManifest}from"./get-runtime-manifest.js";export const createPageMiddleware=(e,t,a,m)=>(m.devServer?.middlewares||[]).concat((async(i,n)=>{let g;if("/runtime/manifest.json"!==i.path)g="/"===i.path?await getPageMainHtml(a,e,m):await getPageModuleHtml(a,i,e,t,m),n.send(g);else{const t=await getRuntimeManifest(a,e,m);n.json(t)}}));

package/dist/main/prepare-serve.js

@@ -1 +1 @@
-import{arrayUnique,chalk,logger,urlJoin}from"@flatjs/common";import{attachMockMiddlewares}from"@flatjs/mock";import{ignoreEntryOptionKeys,moduleName}from"../constants.js";import{createAppPageRoute,createDevServer,createDevServerCompilerTask,createDevServerEntries}from"../dev-server/index.js";import{flatEntryMap,openPage}from"../helpers/index.js";import{normalizePageProxy}from"../helpers/normalize-page-proxy.js";import{splitToEntryGroup}from"../helpers/split-to-entry-group.js";import{verifyGroupEntryOptions}from"../helpers/verify-group-entry-options.js";import{envVerify}from"./env-verify.js";export const prepareServe=async(e,r,o)=>{await envVerify(e,o);const t=splitToEntryGroup(r,o,ignoreEntryOptionKeys,!0);if(!t.length)return void logger.warn("No served entries provided!");const n=[],{app:i,devPort:a,devHostUri:p,publicIp:s}=await createDevServer(o),c=o.devServer?.mockOptions?.mockFilters||[];for(const[,e]of Object.entries(r))c.push(...e.options?.mockFilters||[]);await attachMockMiddlewares(i,{...o.devServer?.mockOptions,mockFilters:arrayUnique(c),projectCwd:e});let m=a;const l=[];for(const e of t){if(!verifyGroupEntryOptions(e,ignoreEntryOptionKeys,!0))throw new Error("The entry options in a group must be the same.");m++;const r=await createDevServerEntries(m,e,o);l.push(r)}const v=flatEntryMap(l);createAppPageRoute(e,i,p,v,o);const y=normalizePageProxy(o.devServer?.pageProxy||"/pages"),f=urlJoin(p,[y]);o.devServer?.autoOpen&&openPage(f);for(const e of l){const r=createDevServerCompilerTask(s,e,l,o);n.push(r)}return Promise.all(n).then((()=>(logger.info(`debug page ➩ ${chalk(["cyan"])(f)}`,moduleName),i)))};
+import{arrayUnique,chalk,logger,urlJoin}from"@flatjs/common";import{attachMockMiddlewares}from"@flatjs/mock";import{ignoreEntryOptionKeys,moduleName}from"../constants.js";import{createAppPageRoute,createDevServer,createDevServerCompilerTask,createDevServerEntries}from"../dev-server/index.js";import{flatEntryMap,openPage}from"../helpers/index.js";import{normalizePageProxy}from"../helpers/normalize-page-proxy.js";import{splitToEntryGroup}from"../helpers/split-to-entry-group.js";import{verifyGroupEntryOptions}from"../helpers/verify-group-entry-options.js";import{envVerify}from"./env-verify.js";export const prepareServe=async(e,r,o)=>{await envVerify(e,o);const t=splitToEntryGroup(r,o,ignoreEntryOptionKeys,!0);if(!t.length)return void logger.warn("No served entries provided!");const n=[],{app:s,devPort:i,devHostUri:a,publicIp:p}=await createDevServer(o),c=o.devServer?.mockOptions?.mockFilters||[];for(const[,e]of Object.entries(r))c.push(...e.options?.mockFilters||[]);await attachMockMiddlewares(s,{...o.devServer?.mockOptions,mockFilters:arrayUnique(c),projectCwd:e});let l=i;const m=[];for(const e of t){if(!verifyGroupEntryOptions(e,ignoreEntryOptionKeys,!0))throw new Error("The entry options in a group must be the same.");l++;const r=await createDevServerEntries(l,e,o);m.push(r)}const v=flatEntryMap(m);createAppPageRoute(e,s,a,v,o);const d=normalizePageProxy(o.devServer?.pageProxy||"/pages"),f=urlJoin(a,[d]);o.devServer?.autoOpen&&openPage(f);for(const e of m){const r=createDevServerCompilerTask(p,e,m,o);n.push(r)}return Promise.all(n).then((()=>(logger.info(`debug page ➩ ${chalk(["cyan"])(f)}`,moduleName),process.stdin.resume(),process.stdin.setEncoding("utf8"),process.stdin.on("data",(e=>{const r=e.toString();12===r.charCodeAt(0)?console.clear():[102,70].includes(r.charCodeAt(0))&&logger.info(`debug page ➩ ${chalk(["cyan"])(f)}`,moduleName)})),s)))};

package/dist/types/types-multi-html.d.ts

@@ -18,6 +18,7 @@ export type MultiHtmlCDNEntryItem = {
     title?: string;
     /**
      * The favicon url to use for the generated HTML document
+     * Should be an path of (32 x 32).png
      */
     favicon?: string;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatjs/evolve",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -35,31 +35,31 @@
     "typecheck": "tsc --project ./tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@armit/babel-merge": "^0.2.5",
-    "@armit/config-loader": "^0.2.9",
-    "@armit/file-utility": "^0.2.5",
-    "@armit/git": "^0.2.5",
-    "@armit/package": "^0.2.9",
-    "@babel/core": "^7.25.2",
+    "@armit/babel-merge": "^0.2.6",
+    "@armit/config-loader": "^0.3.0",
+    "@armit/file-utility": "^0.2.6",
+    "@armit/git": "^0.2.6",
+    "@armit/package": "^0.2.10",
+    "@babel/core": "^7.25.8",
     "@clack/prompts": "^0.7.0",
     "@discoveryjs/json-ext": "0.6.1",
-    "@flatjs/babel-plugin-import": "2.1.3",
-    "@flatjs/common": "2.1.3",
-    "@flatjs/evolve-preset-babel": "2.1.3",
-    "@flatjs/forge-postcss-plugin-pixel": "2.1.3",
-    "@flatjs/graph": "2.1.3",
-    "@flatjs/mock": "2.1.3",
+    "@flatjs/babel-plugin-import": "2.1.4",
+    "@flatjs/common": "2.1.4",
+    "@flatjs/evolve-preset-babel": "2.1.4",
+    "@flatjs/forge-postcss-plugin-pixel": "2.1.4",
+    "@flatjs/graph": "2.1.4",
+    "@flatjs/mock": "2.2.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@types/babel__core": "^7.20.5",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^9.2.1",
     "better-opn": "^3.0.2",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "ci-info": "^4.0.0",
     "css-loader": "^7.1.2",
     "cssnano": "^7.0.6",
-    "express": "^4.19.2",
+    "express": "^4.21.1",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "happy-dom": "^15.7.3",
+    "happy-dom": "^15.7.4",
     "html-webpack-plugin": "^5.6.0",
     "image-minimizer-webpack-plugin": "^4.1.0",
     "less": "^4.2.0",
@@ -68,7 +68,7 @@
     "lodash": "^4.17.21",
     "log-update": "^6.1.0",
     "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.45",
+    "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
     "react-refresh": "^0.14.2",
     "svgo": "^3.3.2",
@@ -76,9 +76,9 @@
     "terser-webpack-plugin": "^5.3.10",
     "tinypool": "^1.0.1",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "type-fest": "^4.26.0",
-    "typescript": "^5.5.4",
-    "webpack": "^5.94.0",
+    "type-fest": "^4.26.1",
+    "typescript": "^5.6.3",
+    "webpack": "^5.95.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^5.1.0",
     "webpack-sources": "^3.2.3"
@@ -87,23 +87,23 @@
     "@dimjs/lang": "2.0.0",
     "@dimjs/model": "2.0.1",
     "@dimjs/model-react": "2.0.1",
-    "@dimjs/utils": "2.0.1",
-    "@flatjs/testing": "2.1.3",
+    "@dimjs/utils": "2.0.2",
+    "@flatjs/testing": "2.1.4",
     "@hyperse/eslint-config-hyperse": "^1.1.3",
-    "@swc/core": "1.7.23",
-    "@types/express": "4.17.21",
+    "@swc/core": "1.7.36",
+    "@types/express": "5.0.0",
     "@types/listr": "0.14.9",
-    "@types/node": "22.5.4",
-    "eslint": "^9.9.1",
+    "@types/node": "22.7.6",
+    "eslint": "^9.12.0",
     "imagemin-gifsicle": "7.0.0",
-    "imagemin-jpegtran": "7.0.0",
+    "imagemin-jpegtran": "8.0.0",
     "imagemin-pngquant": "10.0.0",
     "imagemin-svgo": "11.0.1",
     "npm-run-all": "4.1.5",
     "react": "18.3.1",
     "rimraf": "6.0.1",
     "vite-tsconfig-paths": "5.0.1",
-    "vitest": "2.0.5",
+    "vitest": "2.1.3",
     "vue-loader": "17.4.2"
   },
   "peerDependencies": {

package/templates/html-plugin/index-dev.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-inte.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-inte2.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-inte3.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-inte4.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-me.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-ntv.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-prod.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-rc.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/html-plugin/index-uat.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -35,8 +35,7 @@
     </script>
     <% } %>
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %>
     <% if (headBeforeStyles) { %>
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>

package/templates/main.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta

package/templates/module-404.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta

package/templates/module.html

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-control" content="no-cache" />
     <meta http-equiv="Cache" content="no-cache" />
     <meta name="format-detection" content="telephone=no,email=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-touch-fullscreen" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta
@@ -36,8 +36,7 @@
       </script>
     <% } %> 
     <% if (favicon) { %>
-      <link rel="shortcut icon" href="<%= favicon %>" type="image/x-icon" />
-      <link rel="icon" href="<%= favicon %>" type="image/x-icon" />
+      <link rel="icon" type="image/png" sizes="32x32" href="<%= favicon %>" />
     <% } %> 
     <% if (headBeforeStyles) { %> 
       <% for (let index = 0; index < headBeforeStyles.length; index++) { %>