npm - one - Versions diffs - 2.0.0-beta.139.1 → 2.0.0-beta.142.1 - Mend

one 2.0.0-beta.139.1 → 2.0.0-beta.142.1

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.

Files changed (46) hide show

package/android/src/main/java/dev/onejs/onenative/OneNativeComposeNodeView.kt CHANGED Viewed

@@ -1320,7 +1320,10 @@ private fun RenderComposeNode(
 ) {
     val props = node.renderedProps
     val style = props.composeStyle
-    val modifier = outerModifier.applyComposeStyle(style).applyReactSemantics(node, props)
+    // dialogs draw in their own window, outside the host or parent placement
+    val kind = node.renderedNodeKind
+    val placement = if (kind == "alertdialog" || kind == "dialog") Modifier else outerModifier
+    val modifier = placement.applyComposeStyle(style).applyReactSemantics(node, props)
     val foregroundColor = style.foregroundColor?.let(::Color) ?: resolveColorRole(props.colorRole)
     if (foregroundColor != null) {

package/dist/cjs/headless-server.cjs CHANGED Viewed

@@ -41,7 +41,7 @@ async function createServer(options) {
 		oneOptions: options.oneOptions,
 		routeToBuildInfo: options.buildInfo?.routeToBuildInfo ?? {},
 		cssContentsByPath: options.buildInfo?.cssContentsByPath,
-		routeMap: options.buildInfo?.routeMap ?? {},
+		routeMap: options.buildInfo?.routeMap,
 		preloads: options.buildInfo?.preloads ?? {},
 		cssPreloads: options.buildInfo?.cssPreloads ?? {}
 	};

package/dist/cjs/headless-server.native.cjs CHANGED Viewed

@@ -36,7 +36,7 @@ var import_setServerGlobals = require("./server/setServerGlobals.native.js");
 var import_setupBuildOptions = require("./server/setupBuildOptions.native.js");
 var import_workerHandler2 = require("./server/workerHandler.native.js");
 async function createServer(options) {
-	var _ref, _ref1, _ref2, _ref3;
+	var _ref, _ref1, _ref2;
 	var _options_buildInfo, _options_buildInfo1, _options_buildInfo2, _options_buildInfo3, _options_buildInfo4, _options_buildInfo5;
 	var manifest = options.manifest || ((_options_buildInfo = options.buildInfo) === null || _options_buildInfo === void 0 ? void 0 : _options_buildInfo.manifest);
 	if (!manifest) throw new Error("one/headless-server: manifest is required");
@@ -45,9 +45,9 @@ async function createServer(options) {
 		oneOptions: options.oneOptions,
 		routeToBuildInfo: (_ref = (_options_buildInfo1 = options.buildInfo) === null || _options_buildInfo1 === void 0 ? void 0 : _options_buildInfo1.routeToBuildInfo) !== null && _ref !== void 0 ? _ref : {},
 		cssContentsByPath: (_options_buildInfo2 = options.buildInfo) === null || _options_buildInfo2 === void 0 ? void 0 : _options_buildInfo2.cssContentsByPath,
-		routeMap: (_ref1 = (_options_buildInfo3 = options.buildInfo) === null || _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap) !== null && _ref1 !== void 0 ? _ref1 : {},
-		preloads: (_ref2 = (_options_buildInfo4 = options.buildInfo) === null || _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && _ref2 !== void 0 ? _ref2 : {},
-		cssPreloads: (_ref3 = (_options_buildInfo5 = options.buildInfo) === null || _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && _ref3 !== void 0 ? _ref3 : {}
+		routeMap: (_options_buildInfo3 = options.buildInfo) === null || _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap,
+		preloads: (_ref1 = (_options_buildInfo4 = options.buildInfo) === null || _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && _ref1 !== void 0 ? _ref1 : {},
+		cssPreloads: (_ref2 = (_options_buildInfo5 = options.buildInfo) === null || _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && _ref2 !== void 0 ? _ref2 : {}
 	};
 	(0, import_setupBuildOptions.setupBuildInfo)(buildInfo);
 	(0, import_setServerGlobals.setServerGlobals)();

package/dist/cjs/headless-server.native.js CHANGED Viewed

@@ -36,7 +36,7 @@ var import_setServerGlobals = require("./server/setServerGlobals.native.js");
 var import_setupBuildOptions = require("./server/setupBuildOptions.native.js");
 var import_workerHandler2 = require("./server/workerHandler.native.js");
 async function createServer(options) {
-	var _ref, _ref1, _ref2, _ref3;
+	var _ref, _ref1, _ref2;
 	var _options_buildInfo, _options_buildInfo1, _options_buildInfo2, _options_buildInfo3, _options_buildInfo4, _options_buildInfo5;
 	var manifest = options.manifest || ((_options_buildInfo = options.buildInfo) === null || _options_buildInfo === void 0 ? void 0 : _options_buildInfo.manifest);
 	if (!manifest) throw new Error("one/headless-server: manifest is required");
@@ -45,9 +45,9 @@ async function createServer(options) {
 		oneOptions: options.oneOptions,
 		routeToBuildInfo: (_ref = (_options_buildInfo1 = options.buildInfo) === null || _options_buildInfo1 === void 0 ? void 0 : _options_buildInfo1.routeToBuildInfo) !== null && _ref !== void 0 ? _ref : {},
 		cssContentsByPath: (_options_buildInfo2 = options.buildInfo) === null || _options_buildInfo2 === void 0 ? void 0 : _options_buildInfo2.cssContentsByPath,
-		routeMap: (_ref1 = (_options_buildInfo3 = options.buildInfo) === null || _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap) !== null && _ref1 !== void 0 ? _ref1 : {},
-		preloads: (_ref2 = (_options_buildInfo4 = options.buildInfo) === null || _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && _ref2 !== void 0 ? _ref2 : {},
-		cssPreloads: (_ref3 = (_options_buildInfo5 = options.buildInfo) === null || _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && _ref3 !== void 0 ? _ref3 : {}
+		routeMap: (_options_buildInfo3 = options.buildInfo) === null || _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap,
+		preloads: (_ref1 = (_options_buildInfo4 = options.buildInfo) === null || _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && _ref1 !== void 0 ? _ref1 : {},
+		cssPreloads: (_ref2 = (_options_buildInfo5 = options.buildInfo) === null || _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && _ref2 !== void 0 ? _ref2 : {}
 	};
 	(0, import_setupBuildOptions.setupBuildInfo)(buildInfo);
 	(0, import_setServerGlobals.setServerGlobals)();

package/dist/cjs/headless-server.native.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"headless-server.native.js","names":[],"sources":["cjs/headless-server.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" \|\| typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) \|\| desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar headless_server_exports = {};\n__export(headless_server_exports, {\n compileManifest: () => import_createHandleRequest.compileManifest,\n createServer: () => createServer,\n createWorkerHandler: () => import_workerHandler.createWorkerHandler,\n getFetchStaticHtml: () => import_staticHtmlFetcher.getFetchStaticHtml,\n setFetchStaticHtml: () => import_staticHtmlFetcher.setFetchStaticHtml\n});\nmodule.exports = __toCommonJS(headless_server_exports);\nvar import_workerHandler = require(\"./server/workerHandler\");\nvar import_createHandleRequest = require(\"./createHandleRequest\");\nvar import_staticHtmlFetcher = require(\"./server/staticHtmlFetcher\");\nvar import_setServerGlobals = require(\"./server/setServerGlobals\");\nvar import_setupBuildOptions = require(\"./server/setupBuildOptions\");\nvar import_workerHandler2 = require(\"./server/workerHandler\");\nasync function createServer(options) {\n var _ref, _ref1, _ref2~~, _ref3~~;\n var _options_buildInfo, _options_buildInfo1, _options_buildInfo2, _options_buildInfo3, _options_buildInfo4, _options_buildInfo5;\n var manifest = options.manifest \|\| ((_options_buildInfo = options.buildInfo) === null \|\| _options_buildInfo === void 0 ? void 0 : _options_buildInfo.manifest);\n if (!manifest) throw new Error(\"one/headless-server: manifest is required\");\n var buildInfo = {\n manifest,\n oneOptions: options.oneOptions,\n routeToBuildInfo: (_ref = (_options_buildInfo1 = options.buildInfo) === null \|\| _options_buildInfo1 === void 0 ? void 0 : _options_buildInfo1.routeToBuildInfo) !== null && _ref !== void 0 ? _ref : {},\n cssContentsByPath: (_options_buildInfo2 = options.buildInfo) === null \|\| _options_buildInfo2 === void 0 ? void 0 : _options_buildInfo2.cssContentsByPath,\n routeMap: (~~_ref1 = (~~_options_buildInfo3 = options.buildInfo) === null \|\| _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap~~) !== null && _ref1 !== void 0 ? _ref1 : {}~~,\n preloads: (~~_ref2~~ = (_options_buildInfo4 = options.buildInfo) === null \|\| _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && ~~_ref2~~ !== void 0 ? ~~_ref2~~ : {},\n cssPreloads: (~~_ref3~~ = (_options_buildInfo5 = options.buildInfo) === null \|\| _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && ~~_ref3~~ !== void 0 ? ~~_ref3~~ : {}\n };\n (0, import_setupBuildOptions.setupBuildInfo)(buildInfo);\n (0, import_setServerGlobals.setServerGlobals)();\n var handler = (0, import_workerHandler2.createWorkerHandler)({\n oneOptions: options.oneOptions,\n buildInfo,\n lazyRoutes: options.routes\n });\n return {\n /** handle an incoming request — returns Response or null (unmatched) /\n fetch: handler.handleRequest,\n /* hot-swap the route table without recreating the server */\n updateRoutes(newManifest, newRoutes) {\n var newBuildInfo = {\n ...buildInfo,\n manifest: newManifest\n };\n (0, import_setupBuildOptions.setupBuildInfo)(newBuildInfo);\n handler.updateRoutes(newBuildInfo, newRoutes);\n }\n };\n}\n//# sourceMappingURL=headless-server.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,0BAA0B,CAAC;AAC/B,SAAS,yBAAyB;CAChC,uBAAuB,2BAA2B;CAClD,oBAAoB;CACpB,2BAA2B,qBAAqB;CAChD,0BAA0B,yBAAyB;CACnD,0BAA0B,yBAAyB;AACrD,CAAC;AACD,OAAO,UAAU,aAAa,uBAAuB;AACrD,IAAI,uBAAuB,QAAQ,kCAAwB;AAC3D,IAAI,6BAA6B,QAAQ,iCAAuB;AAChE,IAAI,2BAA2B,QAAQ,sCAA4B;AACnE,IAAI,0BAA0B,QAAQ,qCAA2B;AACjE,IAAI,2BAA2B,QAAQ,sCAA4B;AACnE,IAAI,wBAAwB,QAAQ,kCAAwB;AAC5D,eAAe,aAAa,SAAS;CACnC,IAAI,MAAM,OAAO~~,OAAO~~;~~CACxB~~,IAAI,oBAAoB,qBAAqB,qBAAqB,qBAAqB,qBAAqB;CAC5G,IAAI,WAAW,QAAQ,cAAc,qBAAqB,QAAQ,eAAe,QAAQ,uBAAuB,KAAK,IAAI,KAAK,IAAI,mBAAmB;CACrJ,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,2CAA2C;CAC1E,IAAI,YAAY;EACd;EACA,YAAY,QAAQ;EACpB,mBAAmB,QAAQ,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,sBAAsB,QAAQ,SAAS,KAAK,IAAI,OAAO,CAAC;EACtM,oBAAoB,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;EACvI,WAAW,~~SAAS,~~sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB~~,cAAc,QAAQ,UAAU,KAAK,IAAI,QAAQ,CAAC~~;~~EACzL~~,WAAW,SAAS,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,cAAc,QAAQ,UAAU,KAAK,IAAI,QAAQ,CAAC;EACzL,cAAc,SAAS,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,iBAAiB,QAAQ,UAAU,KAAK,IAAI,QAAQ,CAAC;CACjM;CACA,CAAC,GAAG,yBAAyB,eAAc,CAAE,SAAS;CACtD,CAAC,GAAG,wBAAwB,iBAAgB,CAAE;CAC9C,IAAI,WAAW,GAAG,sBAAsB,oBAAmB,CAAE;EAC3D,YAAY,QAAQ;EACpB;EACA,YAAY,QAAQ;CACtB,CAAC;CACD,OAAO;;EAEL,OAAO,QAAQ;;EAEf,aAAa,aAAa,WAAW;GACnC,IAAI,eAAe;IACjB,GAAG;IACH,UAAU;GACZ;GACA,CAAC,GAAG,yBAAyB,eAAc,CAAE,YAAY;GACzD,QAAQ,aAAa,cAAc,SAAS;EAC9C;CACF;AACF"}
1	+ {"version":3,"file":"headless-server.native.js","names":[],"sources":["cjs/headless-server.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" \|\| typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) \|\| desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar headless_server_exports = {};\n__export(headless_server_exports, {\n compileManifest: () => import_createHandleRequest.compileManifest,\n createServer: () => createServer,\n createWorkerHandler: () => import_workerHandler.createWorkerHandler,\n getFetchStaticHtml: () => import_staticHtmlFetcher.getFetchStaticHtml,\n setFetchStaticHtml: () => import_staticHtmlFetcher.setFetchStaticHtml\n});\nmodule.exports = __toCommonJS(headless_server_exports);\nvar import_workerHandler = require(\"./server/workerHandler\");\nvar import_createHandleRequest = require(\"./createHandleRequest\");\nvar import_staticHtmlFetcher = require(\"./server/staticHtmlFetcher\");\nvar import_setServerGlobals = require(\"./server/setServerGlobals\");\nvar import_setupBuildOptions = require(\"./server/setupBuildOptions\");\nvar import_workerHandler2 = require(\"./server/workerHandler\");\nasync function createServer(options) {\n var _ref, _ref1, _ref2;\n var _options_buildInfo, _options_buildInfo1, _options_buildInfo2, _options_buildInfo3, _options_buildInfo4, _options_buildInfo5;\n var manifest = options.manifest \|\| ((_options_buildInfo = options.buildInfo) === null \|\| _options_buildInfo === void 0 ? void 0 : _options_buildInfo.manifest);\n if (!manifest) throw new Error(\"one/headless-server: manifest is required\");\n var buildInfo = {\n manifest,\n oneOptions: options.oneOptions,\n routeToBuildInfo: (_ref = (_options_buildInfo1 = options.buildInfo) === null \|\| _options_buildInfo1 === void 0 ? void 0 : _options_buildInfo1.routeToBuildInfo) !== null && _ref !== void 0 ? _ref : {},\n cssContentsByPath: (_options_buildInfo2 = options.buildInfo) === null \|\| _options_buildInfo2 === void 0 ? void 0 : _options_buildInfo2.cssContentsByPath,\n routeMap: (_options_buildInfo3 = options.buildInfo) === null \|\| _options_buildInfo3 === void 0 ? void 0 : _options_buildInfo3.routeMap,\n preloads: (_ref1 = (_options_buildInfo4 = options.buildInfo) === null \|\| _options_buildInfo4 === void 0 ? void 0 : _options_buildInfo4.preloads) !== null && _ref1 !== void 0 ? _ref1 : {},\n cssPreloads: (_ref2 = (_options_buildInfo5 = options.buildInfo) === null \|\| _options_buildInfo5 === void 0 ? void 0 : _options_buildInfo5.cssPreloads) !== null && _ref2 !== void 0 ? _ref2 : {}\n };\n (0, import_setupBuildOptions.setupBuildInfo)(buildInfo);\n (0, import_setServerGlobals.setServerGlobals)();\n var handler = (0, import_workerHandler2.createWorkerHandler)({\n oneOptions: options.oneOptions,\n buildInfo,\n lazyRoutes: options.routes\n });\n return {\n /** handle an incoming request — returns Response or null (unmatched) /\n fetch: handler.handleRequest,\n /* hot-swap the route table without recreating the server */\n updateRoutes(newManifest, newRoutes) {\n var newBuildInfo = {\n ...buildInfo,\n manifest: newManifest\n };\n (0, import_setupBuildOptions.setupBuildInfo)(newBuildInfo);\n handler.updateRoutes(newBuildInfo, newRoutes);\n }\n };\n}\n//# sourceMappingURL=headless-server.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,0BAA0B,CAAC;AAC/B,SAAS,yBAAyB;CAChC,uBAAuB,2BAA2B;CAClD,oBAAoB;CACpB,2BAA2B,qBAAqB;CAChD,0BAA0B,yBAAyB;CACnD,0BAA0B,yBAAyB;AACrD,CAAC;AACD,OAAO,UAAU,aAAa,uBAAuB;AACrD,IAAI,uBAAuB,QAAQ,kCAAwB;AAC3D,IAAI,6BAA6B,QAAQ,iCAAuB;AAChE,IAAI,2BAA2B,QAAQ,sCAA4B;AACnE,IAAI,0BAA0B,QAAQ,qCAA2B;AACjE,IAAI,2BAA2B,QAAQ,sCAA4B;AACnE,IAAI,wBAAwB,QAAQ,kCAAwB;AAC5D,eAAe,aAAa,SAAS;CACnC,IAAI,MAAM,OAAO;CACjB,IAAI,oBAAoB,qBAAqB,qBAAqB,qBAAqB,qBAAqB;CAC5G,IAAI,WAAW,QAAQ,cAAc,qBAAqB,QAAQ,eAAe,QAAQ,uBAAuB,KAAK,IAAI,KAAK,IAAI,mBAAmB;CACrJ,IAAI,CAAC,UAAU,MAAM,IAAI,MAAM,2CAA2C;CAC1E,IAAI,YAAY;EACd;EACA,YAAY,QAAQ;EACpB,mBAAmB,QAAQ,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,sBAAsB,QAAQ,SAAS,KAAK,IAAI,OAAO,CAAC;EACtM,oBAAoB,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;EACvI,WAAW,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB;EAC9H,WAAW,SAAS,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,cAAc,QAAQ,UAAU,KAAK,IAAI,QAAQ,CAAC;EACzL,cAAc,SAAS,sBAAsB,QAAQ,eAAe,QAAQ,wBAAwB,KAAK,IAAI,KAAK,IAAI,oBAAoB,iBAAiB,QAAQ,UAAU,KAAK,IAAI,QAAQ,CAAC;CACjM;CACA,CAAC,GAAG,yBAAyB,eAAc,CAAE,SAAS;CACtD,CAAC,GAAG,wBAAwB,iBAAgB,CAAE;CAC9C,IAAI,WAAW,GAAG,sBAAsB,oBAAmB,CAAE;EAC3D,YAAY,QAAQ;EACpB;EACA,YAAY,QAAQ;CACtB,CAAC;CACD,OAAO;;EAEL,OAAO,QAAQ;;EAEf,aAAa,aAAa,WAAW;GACnC,IAAI,eAAe;IACjB,GAAG;IACH,UAAU;GACZ;GACA,CAAC,GAAG,yBAAyB,eAAc,CAAE,YAAY;GACzD,QAAQ,aAAa,cAAc,SAAS;EAC9C;CACF;AACF"}

package/dist/cjs/router/diagnoseRouteLoadFailure.cjs CHANGED Viewed

@@ -21,7 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var diagnoseRouteLoadFailure_exports = {};
 __export(diagnoseRouteLoadFailure_exports, {
 	diagnoseRouteLoadFailure: () => diagnoseRouteLoadFailure,
-	findBlockedModule: () => findBlockedModule
+	findRouteLoadFault: () => findRouteLoadFault
 });
 module.exports = __toCommonJS(diagnoseRouteLoadFailure_exports);
 const MAX_MODULES = 500;
@@ -39,56 +39,88 @@ function collectImports(source, base) {
 	for (const m of source.matchAll(/(?:^|[\s;}])import\s*["']([^"']+)["']/g)) add(m[1]);
 	return out;
 }
-async function findBlockedModule(entryUrl) {
+async function findRouteLoadFault(entryUrl) {
 	const deadline = Date.now() + TIMEOUT_MS;
-	const seen = /* @__PURE__ */ new Set();
-	let frontier = [new URL(entryUrl, window.location.href).href];
-	while (frontier.length && seen.size < MAX_MODULES && Date.now() < deadline) {
-		const batch = frontier.filter((url) => !seen.has(url)).slice(0, 32);
-		if (!batch.length) break;
+	const importers = /* @__PURE__ */ new Map();
+	const entry = new URL(entryUrl, window.location.href).href;
+	importers.set(entry, null);
+	let frontier = [entry];
+	let visited = 0;
+	while (frontier.length && visited < MAX_MODULES && Date.now() < deadline) {
+		const batch = frontier.slice(0, 32);
 		frontier = frontier.slice(batch.length);
+		visited += batch.length;
 		const results = await Promise.all(batch.map(async (url) => {
-			seen.add(url);
 			let res;
 			try {
 				res = await fetch(url);
 			} catch {
 				return {
 					url,
-					blocked: true,
+					fault: "unreachable",
 					imports: []
 				};
 			}
+			if (res.status === 404) return {
+				url,
+				fault: "missing",
+				imports: []
+			};
 			if (!res.ok) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			const type = res.headers.get("content-type") ?? "";
 			if (!type.includes("javascript")) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: collectImports(await res.text(), url)
 			};
 		}));
 		for (const result of results) {
-			if (result.blocked) return result.url;
+			if (result.fault === "missing") {
+				const importer = importers.get(result.url) ?? null;
+				if (importer?.includes("/node_modules/")) continue;
+				return {
+					kind: "missing",
+					url: result.url,
+					importer
+				};
+			}
+			if (result.fault === "unreachable") {
+				const serverAnswers = await fetch(window.location.href, { method: "HEAD" }).then(() => true, () => false);
+				return serverAnswers ? {
+					kind: "blocked",
+					url: result.url
+				} : null;
+			}
 			for (const next of result.imports) {
-				if (!seen.has(next)) frontier.push(next);
+				if (importers.has(next)) continue;
+				importers.set(next, result.url);
+				frontier.push(next);
 			}
 		}
 	}
 	return null;
 }
 async function diagnoseRouteLoadFailure(routeId, routeUrl) {
-	const blocked = await findBlockedModule(routeUrl);
-	if (!blocked) return null;
-	const path = blocked.replace(window.location.origin, "");
+	const fault = await findRouteLoadFault(routeUrl);
+	if (!fault) return null;
+	const toPath = (url) => url.replace(window.location.origin, "");
+	const path = toPath(fault.url);
+	if (fault.kind === "missing") {
+		return [
+			`Route "${routeId}" failed to load because ${path} does not exist (the dev server answered 404).`,
+			``,
+			fault.importer ? `${toPath(fault.importer)} imports it. Create the file or remove the import.` : `Create the file or remove the import.`
+		].join("\n");
+	}
 	return [
 		`Route "${routeId}" failed to load because this browser refused to fetch ${path}`,
 		``,

package/dist/cjs/router/diagnoseRouteLoadFailure.native.cjs CHANGED Viewed

@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var diagnoseRouteLoadFailure_exports = {};
 __export(diagnoseRouteLoadFailure_exports, {
 	diagnoseRouteLoadFailure: () => diagnoseRouteLoadFailure,
-	findBlockedModule: () => findBlockedModule
+	findRouteLoadFault: () => findRouteLoadFault
 });
 module.exports = __toCommonJS(diagnoseRouteLoadFailure_exports);
 var MAX_MODULES = 500;
@@ -98,43 +98,48 @@ function collectImports(source, base) {
 	}
 	return out;
 }
-async function findBlockedModule(entryUrl) {
+async function findRouteLoadFault(entryUrl) {
 	var deadline = Date.now() + TIMEOUT_MS;
-	var seen = /* @__PURE__ */ new Set();
-	var frontier = [new URL(entryUrl, window.location.href).href];
-	while (frontier.length && seen.size < MAX_MODULES && Date.now() < deadline) {
-		var batch = frontier.filter(function(url) {
-			return !seen.has(url);
-		}).slice(0, 32);
-		if (!batch.length) break;
+	var importers = /* @__PURE__ */ new Map();
+	var entry = new URL(entryUrl, window.location.href).href;
+	importers.set(entry, null);
+	var frontier = [entry];
+	var visited = 0;
+	while (frontier.length && visited < MAX_MODULES && Date.now() < deadline) {
+		var batch = frontier.slice(0, 32);
 		frontier = frontier.slice(batch.length);
+		visited += batch.length;
 		var results = await Promise.all(batch.map(async function(url) {
 			var _res_headers_get;
-			seen.add(url);
 			var res;
 			try {
 				res = await fetch(url);
 			} catch (unused) {
 				return {
 					url,
-					blocked: true,
+					fault: "unreachable",
 					imports: []
 				};
 			}
+			if (res.status === 404) return {
+				url,
+				fault: "missing",
+				imports: []
+			};
 			if (!res.ok) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			var type = (_res_headers_get = res.headers.get("content-type")) !== null && _res_headers_get !== void 0 ? _res_headers_get : "";
 			if (!type.includes("javascript")) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: collectImports(await res.text(), url)
 			};
 		}));
@@ -142,12 +147,34 @@ async function findBlockedModule(entryUrl) {
 		try {
 			for (var _iterator = results[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
 				var result = _step.value;
-				if (result.blocked) return result.url;
+				if (result.fault === "missing") {
+					var _importers_get;
+					var importer = (_importers_get = importers.get(result.url)) !== null && _importers_get !== void 0 ? _importers_get : null;
+					if (importer === null || importer === void 0 ? void 0 : importer.includes("/node_modules/")) continue;
+					return {
+						kind: "missing",
+						url: result.url,
+						importer
+					};
+				}
+				if (result.fault === "unreachable") {
+					var serverAnswers = await fetch(window.location.href, { method: "HEAD" }).then(function() {
+						return true;
+					}, function() {
+						return false;
+					});
+					return serverAnswers ? {
+						kind: "blocked",
+						url: result.url
+					} : null;
+				}
 				var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
 				try {
 					for (var _iterator1 = result.imports[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
 						var next = _step1.value;
-						if (!seen.has(next)) frontier.push(next);
+						if (importers.has(next)) continue;
+						importers.set(next, result.url);
+						frontier.push(next);
 					}
 				} catch (err) {
 					_didIteratorError1 = true;
@@ -182,9 +209,19 @@ async function findBlockedModule(entryUrl) {
 	return null;
 }
 async function diagnoseRouteLoadFailure(routeId, routeUrl) {
-	var blocked = await findBlockedModule(routeUrl);
-	if (!blocked) return null;
-	var path = blocked.replace(window.location.origin, "");
+	var fault = await findRouteLoadFault(routeUrl);
+	if (!fault) return null;
+	var toPath = function(url) {
+		return url.replace(window.location.origin, "");
+	};
+	var path = toPath(fault.url);
+	if (fault.kind === "missing") {
+		return [
+			`Route "${routeId}" failed to load because ${path} does not exist (the dev server answered 404).`,
+			``,
+			fault.importer ? `${toPath(fault.importer)} imports it. Create the file or remove the import.` : `Create the file or remove the import.`
+		].join("\n");
+	}
 	return [
 		`Route "${routeId}" failed to load because this browser refused to fetch ${path}`,
 		``,

package/dist/cjs/router/diagnoseRouteLoadFailure.native.js CHANGED Viewed

@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var diagnoseRouteLoadFailure_exports = {};
 __export(diagnoseRouteLoadFailure_exports, {
 	diagnoseRouteLoadFailure: () => diagnoseRouteLoadFailure,
-	findBlockedModule: () => findBlockedModule
+	findRouteLoadFault: () => findRouteLoadFault
 });
 module.exports = __toCommonJS(diagnoseRouteLoadFailure_exports);
 var MAX_MODULES = 500;
@@ -98,43 +98,48 @@ function collectImports(source, base) {
 	}
 	return out;
 }
-async function findBlockedModule(entryUrl) {
+async function findRouteLoadFault(entryUrl) {
 	var deadline = Date.now() + TIMEOUT_MS;
-	var seen = /* @__PURE__ */ new Set();
-	var frontier = [new URL(entryUrl, window.location.href).href];
-	while (frontier.length && seen.size < MAX_MODULES && Date.now() < deadline) {
-		var batch = frontier.filter(function(url) {
-			return !seen.has(url);
-		}).slice(0, 32);
-		if (!batch.length) break;
+	var importers = /* @__PURE__ */ new Map();
+	var entry = new URL(entryUrl, window.location.href).href;
+	importers.set(entry, null);
+	var frontier = [entry];
+	var visited = 0;
+	while (frontier.length && visited < MAX_MODULES && Date.now() < deadline) {
+		var batch = frontier.slice(0, 32);
 		frontier = frontier.slice(batch.length);
+		visited += batch.length;
 		var results = await Promise.all(batch.map(async function(url) {
 			var _res_headers_get;
-			seen.add(url);
 			var res;
 			try {
 				res = await fetch(url);
 			} catch (unused) {
 				return {
 					url,
-					blocked: true,
+					fault: "unreachable",
 					imports: []
 				};
 			}
+			if (res.status === 404) return {
+				url,
+				fault: "missing",
+				imports: []
+			};
 			if (!res.ok) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			var type = (_res_headers_get = res.headers.get("content-type")) !== null && _res_headers_get !== void 0 ? _res_headers_get : "";
 			if (!type.includes("javascript")) return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: []
 			};
 			return {
 				url,
-				blocked: false,
+				fault: null,
 				imports: collectImports(await res.text(), url)
 			};
 		}));
@@ -142,12 +147,34 @@ async function findBlockedModule(entryUrl) {
 		try {
 			for (var _iterator = results[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
 				var result = _step.value;
-				if (result.blocked) return result.url;
+				if (result.fault === "missing") {
+					var _importers_get;
+					var importer = (_importers_get = importers.get(result.url)) !== null && _importers_get !== void 0 ? _importers_get : null;
+					if (importer === null || importer === void 0 ? void 0 : importer.includes("/node_modules/")) continue;
+					return {
+						kind: "missing",
+						url: result.url,
+						importer
+					};
+				}
+				if (result.fault === "unreachable") {
+					var serverAnswers = await fetch(window.location.href, { method: "HEAD" }).then(function() {
+						return true;
+					}, function() {
+						return false;
+					});
+					return serverAnswers ? {
+						kind: "blocked",
+						url: result.url
+					} : null;
+				}
 				var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
 				try {
 					for (var _iterator1 = result.imports[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
 						var next = _step1.value;
-						if (!seen.has(next)) frontier.push(next);
+						if (importers.has(next)) continue;
+						importers.set(next, result.url);
+						frontier.push(next);
 					}
 				} catch (err) {
 					_didIteratorError1 = true;
@@ -182,9 +209,19 @@ async function findBlockedModule(entryUrl) {
 	return null;
 }
 async function diagnoseRouteLoadFailure(routeId, routeUrl) {
-	var blocked = await findBlockedModule(routeUrl);
-	if (!blocked) return null;
-	var path = blocked.replace(window.location.origin, "");
+	var fault = await findRouteLoadFault(routeUrl);
+	if (!fault) return null;
+	var toPath = function(url) {
+		return url.replace(window.location.origin, "");
+	};
+	var path = toPath(fault.url);
+	if (fault.kind === "missing") {
+		return [
+			`Route "${routeId}" failed to load because ${path} does not exist (the dev server answered 404).`,
+			``,
+			fault.importer ? `${toPath(fault.importer)} imports it. Create the file or remove the import.` : `Create the file or remove the import.`
+		].join("\n");
+	}
 	return [
 		`Route "${routeId}" failed to load because this browser refused to fetch ${path}`,
 		``,

package/dist/cjs/router/diagnoseRouteLoadFailure.native.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"diagnoseRouteLoadFailure.native.js","names":[],"sources":["cjs/router/diagnoseRouteLoadFailure.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" \|\| typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) \|\| desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar diagnoseRouteLoadFailure_exports = {};\n__export(diagnoseRouteLoadFailure_exports, {\n diagnoseRouteLoadFailure: () => diagnoseRouteLoadFailure,\n findBlockedModule: () => findBlockedModule\n});\nmodule.exports = __toCommonJS(diagnoseRouteLoadFailure_exports);\nvar MAX_MODULES = 500;\nvar TIMEOUT_MS = 5e3;\nfunction collectImports(source, base) {\n var out = [];\n var add = function(spec) {\n if (!/^[./]\|^https?:/.test(spec)) return;\n try {\n out.push(new URL(spec, base).href);\n } catch (unused) {\n }\n };\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = source.matchAll(/(?:^\|[\\s;}])(?:import\|export)[^'\"]{0,300}?from\\s[\"']([^\"']+)[\"']/g)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var m = _step.value;\n add(m[1]);\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = source.matchAll(/\\bimport\\s\$\\s[\"']([^\"']+)[\"']\\s\$/g)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var m1 = _step1.value;\n add(m1[1]);\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;\n try {\n for (var _iterator2 = source.matchAll(/(?:^\|[\\s;}])import\\s[\"']([^\"']+)[\"']/g)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {\n var m2 = _step2.value;\n add(m2[1]);\n }\n } catch (err) {\n _didIteratorError2 = true;\n _iteratorError2 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion2 && _iterator2.return != null) {\n _iterator2.return();\n }\n } finally {\n if (_didIteratorError2) {\n throw _iteratorError2;\n }\n }\n }\n return out;\n}\nasync function findBlockedModule(entryUrl) {\n var deadline = Date.now() + TIMEOUT_MS;\n var seen = / @__PURE__ */ new Set();\n var frontier = [\n new URL(entryUrl, window.location.href).href\n ];\n while (frontier.length && seen.size < MAX_MODULES && Date.now() < deadline) {\n var batch = frontier.filter(function(url) {\n return !seen.has(url);\n }).slice(0, 32);\n if (!batch.length) break;\n frontier = frontier.slice(batch.length);\n var results = await Promise.all(batch.map(async function(url) {\n var _res_headers_get;\n seen.add(url);\n var res;\n try {\n res = await fetch(url);\n } catch (unused) {\n return {\n url,\n blocked: true,\n imports: []\n };\n }\n if (!res.ok) return {\n url,\n blocked: false,\n imports: []\n };\n var type = (_res_headers_get = res.headers.get(\"content-type\")) !== null && _res_headers_get !== void 0 ? _res_headers_get : \"\";\n if (!type.includes(\"javascript\")) return {\n url,\n blocked: false,\n imports: []\n };\n return {\n url,\n blocked: false,\n imports: collectImports(await res.text(), url)\n };\n }));\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = results[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var result = _step.value;\n if (result.blocked) return result.url;\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = result.imports[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var next = _step1.value;\n if (!seen.has(next)) frontier.push(next);\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n }\n return null;\n}\nasync function diagnoseRouteLoadFailure(routeId, routeUrl) {\n var blocked = await findBlockedModule(routeUrl);\n if (!blocked) return null;\n var path = blocked.replace(window.location.origin, \"\");\n return [\n `Route \"${routeId}\" failed to load because this browser refused to fetch ${path}`,\n ``,\n `That request never reached the dev server, so a content blocker or privacy`,\n `extension is blocking it. In dev the module URL is the source path, and a`,\n `path containing a word like \"analytics\", \"pageview\" or \"track\" matches the`,\n `tracking rules those blockers ship.`,\n ``,\n `Rename the file or the directory so its path no longer matches, or allow`,\n `${window.location.origin} in the blocker.`\n ].join(\"\\n\");\n}\n//# sourceMappingURL=diagnoseRouteLoadFailure.js.map\n"],"mappings":"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"}
1	+ {"version":3,"file":"diagnoseRouteLoadFailure.native.js","names":[],"sources":["cjs/router/diagnoseRouteLoadFailure.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" \|\| typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) \|\| desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar diagnoseRouteLoadFailure_exports = {};\n__export(diagnoseRouteLoadFailure_exports, {\n diagnoseRouteLoadFailure: () => diagnoseRouteLoadFailure,\n findRouteLoadFault: () => findRouteLoadFault\n});\nmodule.exports = __toCommonJS(diagnoseRouteLoadFailure_exports);\nvar MAX_MODULES = 500;\nvar TIMEOUT_MS = 5e3;\nfunction collectImports(source, base) {\n var out = [];\n var add = function(spec) {\n if (!/^[./]\|^https?:/.test(spec)) return;\n try {\n out.push(new URL(spec, base).href);\n } catch (unused) {\n }\n };\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = source.matchAll(/(?:^\|[\\s;}])(?:import\|export)[^'\"]{0,300}?from\\s[\"']([^\"']+)[\"']/g)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var m = _step.value;\n add(m[1]);\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = source.matchAll(/\\bimport\\s\$\\s[\"']([^\"']+)[\"']\\s\$/g)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var m1 = _step1.value;\n add(m1[1]);\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;\n try {\n for (var _iterator2 = source.matchAll(/(?:^\|[\\s;}])import\\s[\"']([^\"']+)[\"']/g)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {\n var m2 = _step2.value;\n add(m2[1]);\n }\n } catch (err) {\n _didIteratorError2 = true;\n _iteratorError2 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion2 && _iterator2.return != null) {\n _iterator2.return();\n }\n } finally {\n if (_didIteratorError2) {\n throw _iteratorError2;\n }\n }\n }\n return out;\n}\nasync function findRouteLoadFault(entryUrl) {\n var deadline = Date.now() + TIMEOUT_MS;\n var importers = / @__PURE__ */ new Map();\n var entry = new URL(entryUrl, window.location.href).href;\n importers.set(entry, null);\n var frontier = [\n entry\n ];\n var visited = 0;\n while (frontier.length && visited < MAX_MODULES && Date.now() < deadline) {\n var batch = frontier.slice(0, 32);\n frontier = frontier.slice(batch.length);\n visited += batch.length;\n var results = await Promise.all(batch.map(async function(url) {\n var _res_headers_get;\n var res;\n try {\n res = await fetch(url);\n } catch (unused) {\n return {\n url,\n fault: \"unreachable\",\n imports: []\n };\n }\n if (res.status === 404) return {\n url,\n fault: \"missing\",\n imports: []\n };\n if (!res.ok) return {\n url,\n fault: null,\n imports: []\n };\n var type = (_res_headers_get = res.headers.get(\"content-type\")) !== null && _res_headers_get !== void 0 ? _res_headers_get : \"\";\n if (!type.includes(\"javascript\")) return {\n url,\n fault: null,\n imports: []\n };\n return {\n url,\n fault: null,\n imports: collectImports(await res.text(), url)\n };\n }));\n var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n try {\n for (var _iterator = results[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n var result = _step.value;\n if (result.fault === \"missing\") {\n var _importers_get;\n var importer = (_importers_get = importers.get(result.url)) !== null && _importers_get !== void 0 ? _importers_get : null;\n if (importer === null \|\| importer === void 0 ? void 0 : importer.includes(\"/node_modules/\")) continue;\n return {\n kind: \"missing\",\n url: result.url,\n importer\n };\n }\n if (result.fault === \"unreachable\") {\n var serverAnswers = await fetch(window.location.href, {\n method: \"HEAD\"\n }).then(function() {\n return true;\n }, function() {\n return false;\n });\n return serverAnswers ? {\n kind: \"blocked\",\n url: result.url\n } : null;\n }\n var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n try {\n for (var _iterator1 = result.imports[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n var next = _step1.value;\n if (importers.has(next)) continue;\n importers.set(next, result.url);\n frontier.push(next);\n }\n } catch (err) {\n _didIteratorError1 = true;\n _iteratorError1 = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n _iterator1.return();\n }\n } finally {\n if (_didIteratorError1) {\n throw _iteratorError1;\n }\n }\n }\n }\n } catch (err) {\n _didIteratorError = true;\n _iteratorError = err;\n } finally {\n try {\n if (!_iteratorNormalCompletion && _iterator.return != null) {\n _iterator.return();\n }\n } finally {\n if (_didIteratorError) {\n throw _iteratorError;\n }\n }\n }\n }\n return null;\n}\nasync function diagnoseRouteLoadFailure(routeId, routeUrl) {\n var fault = await findRouteLoadFault(routeUrl);\n if (!fault) return null;\n var toPath = function(url) {\n return url.replace(window.location.origin, \"\");\n };\n var path = toPath(fault.url);\n if (fault.kind === \"missing\") {\n return [\n `Route \"${routeId}\" failed to load because ${path} does not exist (the dev server answered 404).`,\n ``,\n fault.importer ? `${toPath(fault.importer)} imports it. Create the file or remove the import.` : `Create the file or remove the import.`\n ].join(\"\\n\");\n }\n return [\n `Route \"${routeId}\" failed to load because this browser refused to fetch ${path}`,\n ``,\n `That request never reached the dev server, so a content blocker or privacy`,\n `extension is blocking it. In dev the module URL is the source path, and a`,\n `path containing a word like \"analytics\", \"pageview\" or \"track\" matches the`,\n `tracking rules those blockers ship.`,\n ``,\n `Rename the file or the directory so its path no longer matches, or allow`,\n `${window.location.origin} in the blocker.`\n ].join(\"\\n\");\n}\n//# sourceMappingURL=diagnoseRouteLoadFailure.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,mCAAmC,CAAC;AACxC,SAAS,kCAAkC;CACzC,gCAAgC;CAChC,0BAA0B;AAC5B,CAAC;AACD,OAAO,UAAU,aAAa,gCAAgC;AAC9D,IAAI,cAAc;AAClB,IAAI,aAAa;AACjB,SAAS,eAAe,QAAQ,MAAM;CACpC,IAAI,MAAM,CAAC;CACX,IAAI,MAAM,SAAS,MAAM;EACvB,IAAI,CAAC,iBAAiB,KAAK,IAAI,GAAG;EAClC,IAAI;GACF,IAAI,KAAK,IAAI,IAAI,MAAM,IAAI,CAAC,CAAC,IAAI;EACnC,SAAS,QAAQ,CACjB;CACF;CACA,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;CACvF,IAAI;EACF,KAAK,IAAI,YAAY,OAAO,SAAS,oEAAoE,CAAC,CAAC,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;GACtO,IAAI,IAAI,MAAM;GACd,IAAI,EAAE,EAAE;EACV;CACF,SAAS,KAAK;EACZ,oBAAoB;EACpB,iBAAiB;CACnB,UAAU;EACR,IAAI;GACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;IAC1D,UAAU,OAAO;GACnB;EACF,UAAU;GACR,IAAI,mBAAmB;IACrB,MAAM;GACR;EACF;CACF;CACA,IAAI,6BAA6B,MAAM,qBAAqB,OAAO,kBAAkB,KAAK;CAC1F,IAAI;EACF,KAAK,IAAI,aAAa,OAAO,SAAS,wCAAwC,CAAC,CAAC,OAAO,SAAS,CAAC,GAAG,QAAQ,EAAE,8BAA8B,SAAS,WAAW,KAAK,EAAC,CAAE,OAAO,6BAA6B,MAAM;GAChN,IAAI,KAAK,OAAO;GAChB,IAAI,GAAG,EAAE;EACX;CACF,SAAS,KAAK;EACZ,qBAAqB;EACrB,kBAAkB;CACpB,UAAU;EACR,IAAI;GACF,IAAI,CAAC,8BAA8B,WAAW,UAAU,MAAM;IAC5D,WAAW,OAAO;GACpB;EACF,UAAU;GACR,IAAI,oBAAoB;IACtB,MAAM;GACR;EACF;CACF;CACA,IAAI,6BAA6B,MAAM,qBAAqB,OAAO,kBAAkB,KAAK;CAC1F,IAAI;EACF,KAAK,IAAI,aAAa,OAAO,SAAS,wCAAwC,CAAC,CAAC,OAAO,SAAS,CAAC,GAAG,QAAQ,EAAE,8BAA8B,SAAS,WAAW,KAAK,EAAC,CAAE,OAAO,6BAA6B,MAAM;GAChN,IAAI,KAAK,OAAO;GAChB,IAAI,GAAG,EAAE;EACX;CACF,SAAS,KAAK;EACZ,qBAAqB;EACrB,kBAAkB;CACpB,UAAU;EACR,IAAI;GACF,IAAI,CAAC,8BAA8B,WAAW,UAAU,MAAM;IAC5D,WAAW,OAAO;GACpB;EACF,UAAU;GACR,IAAI,oBAAoB;IACtB,MAAM;GACR;EACF;CACF;CACA,OAAO;AACT;AACA,eAAe,mBAAmB,UAAU;CAC1C,IAAI,WAAW,KAAK,IAAI,IAAI;CAC5B,IAAI,4BAA4B,IAAI,IAAI;CACxC,IAAI,QAAQ,IAAI,IAAI,UAAU,OAAO,SAAS,IAAI,CAAC,CAAC;CACpD,UAAU,IAAI,OAAO,IAAI;CACzB,IAAI,WAAW,CACb,KACF;CACA,IAAI,UAAU;CACd,OAAO,SAAS,UAAU,UAAU,eAAe,KAAK,IAAI,IAAI,UAAU;EACxE,IAAI,QAAQ,SAAS,MAAM,GAAG,EAAE;EAChC,WAAW,SAAS,MAAM,MAAM,MAAM;EACtC,WAAW,MAAM;EACjB,IAAI,UAAU,MAAM,QAAQ,IAAI,MAAM,IAAI,eAAe,KAAK;GAC5D,IAAI;GACJ,IAAI;GACJ,IAAI;IACF,MAAM,MAAM,MAAM,GAAG;GACvB,SAAS,QAAQ;IACf,OAAO;KACL;KACA,OAAO;KACP,SAAS,CAAC;IACZ;GACF;GACA,IAAI,IAAI,WAAW,KAAK,OAAO;IAC7B;IACA,OAAO;IACP,SAAS,CAAC;GACZ;GACA,IAAI,CAAC,IAAI,IAAI,OAAO;IAClB;IACA,OAAO;IACP,SAAS,CAAC;GACZ;GACA,IAAI,QAAQ,mBAAmB,IAAI,QAAQ,IAAI,cAAc,OAAO,QAAQ,qBAAqB,KAAK,IAAI,mBAAmB;GAC7H,IAAI,CAAC,KAAK,SAAS,YAAY,GAAG,OAAO;IACvC;IACA,OAAO;IACP,SAAS,CAAC;GACZ;GACA,OAAO;IACL;IACA,OAAO;IACP,SAAS,eAAe,MAAM,IAAI,KAAK,GAAG,GAAG;GAC/C;EACF,CAAC,CAAC;EACF,IAAI,4BAA4B,MAAM,oBAAoB,OAAO,iBAAiB,KAAK;EACvF,IAAI;GACF,KAAK,IAAI,YAAY,QAAQ,OAAO,SAAS,CAAC,GAAG,OAAO,EAAE,6BAA6B,QAAQ,UAAU,KAAK,EAAC,CAAE,OAAO,4BAA4B,MAAM;IACxJ,IAAI,SAAS,MAAM;IACnB,IAAI,OAAO,UAAU,WAAW;KAC9B,IAAI;KACJ,IAAI,YAAY,iBAAiB,UAAU,IAAI,OAAO,GAAG,OAAO,QAAQ,mBAAmB,KAAK,IAAI,iBAAiB;KACrH,IAAI,aAAa,QAAQ,aAAa,KAAK,IAAI,KAAK,IAAI,SAAS,SAAS,gBAAgB,GAAG;KAC7F,OAAO;MACL,MAAM;MACN,KAAK,OAAO;MACZ;KACF;IACF;IACA,IAAI,OAAO,UAAU,eAAe;KAClC,IAAI,gBAAgB,MAAM,MAAM,OAAO,SAAS,MAAM,EACpD,QAAQ,OACV,CAAC,CAAC,CAAC,KAAK,WAAW;MACjB,OAAO;KACT,GAAG,WAAW;MACZ,OAAO;KACT,CAAC;KACD,OAAO,gBAAgB;MACrB,MAAM;MACN,KAAK,OAAO;KACd,IAAI;IACN;IACA,IAAI,6BAA6B,MAAM,qBAAqB,OAAO,kBAAkB,KAAK;IAC1F,IAAI;KACF,KAAK,IAAI,aAAa,OAAO,QAAQ,OAAO,SAAS,CAAC,GAAG,QAAQ,EAAE,8BAA8B,SAAS,WAAW,KAAK,EAAC,CAAE,OAAO,6BAA6B,MAAM;MACrK,IAAI,OAAO,OAAO;MAClB,IAAI,UAAU,IAAI,IAAI,GAAG;MACzB,UAAU,IAAI,MAAM,OAAO,GAAG;MAC9B,SAAS,KAAK,IAAI;KACpB;IACF,SAAS,KAAK;KACZ,qBAAqB;KACrB,kBAAkB;IACpB,UAAU;KACR,IAAI;MACF,IAAI,CAAC,8BAA8B,WAAW,UAAU,MAAM;OAC5D,WAAW,OAAO;MACpB;KACF,UAAU;MACR,IAAI,oBAAoB;OACtB,MAAM;MACR;KACF;IACF;GACF;EACF,SAAS,KAAK;GACZ,oBAAoB;GACpB,iBAAiB;EACnB,UAAU;GACR,IAAI;IACF,IAAI,CAAC,6BAA6B,UAAU,UAAU,MAAM;KAC1D,UAAU,OAAO;IACnB;GACF,UAAU;IACR,IAAI,mBAAmB;KACrB,MAAM;IACR;GACF;EACF;CACF;CACA,OAAO;AACT;AACA,eAAe,yBAAyB,SAAS,UAAU;CACzD,IAAI,QAAQ,MAAM,mBAAmB,QAAQ;CAC7C,IAAI,CAAC,OAAO,OAAO;CACnB,IAAI,SAAS,SAAS,KAAK;EACzB,OAAO,IAAI,QAAQ,OAAO,SAAS,QAAQ,EAAE;CAC/C;CACA,IAAI,OAAO,OAAO,MAAM,GAAG;CAC3B,IAAI,MAAM,SAAS,WAAW;EAC5B,OAAO;GACL,UAAU,QAAQ,2BAA2B,KAAK;GAClD;GACA,MAAM,WAAW,GAAG,OAAO,MAAM,QAAQ,EAAE,sDAAsD;EACnG,CAAC,CAAC,KAAK,IAAI;CACb;CACA,OAAO;EACL,UAAU,QAAQ,yDAAyD;EAC3E;EACA;EACA;EACA;EACA;EACA;EACA;EACA,GAAG,OAAO,SAAS,OAAO;CAC5B,CAAC,CAAC,KAAK,IAAI;AACb"}

package/dist/cjs/server/workerHandler.cjs CHANGED Viewed

@@ -23,6 +23,7 @@ __export(workerHandler_exports, { createWorkerHandler: () => createWorkerHandler
 module.exports = __toCommonJS(workerHandler_exports);
 var import_constants = require("../constants.cjs");
 var import_createHandleRequest = require("../createHandleRequest.cjs");
+var import_matchers = require("../router/matchers.cjs");
 var import_cleanUrl = require("../utils/cleanUrl.cjs");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.cjs");
 var import_isResponse = require("../utils/isResponse.cjs");
@@ -88,7 +89,10 @@ function createWorkerHandler(options) {
 		let cur = urlPath;
 		while (cur) {
 			const parent = cur.lastIndexOf("/") > 0 ? cur.slice(0, cur.lastIndexOf("/")) : "";
-			if (routeMap[`${parent}/+not-found`]) return `${parent}/+not-found`;
+			const candidate = `${parent}/+not-found`;
+			if (routeMap ? routeMap[candidate] : compiledManifest.pageRoutes.some((route) => route.isNotFound && (0, import_matchers.stripGroupSegmentsFromPath)(route.page) === candidate)) {
+				return candidate;
+			}
 			if (!parent) break;
 			cur = parent;
 		}
@@ -288,7 +292,7 @@ function createWorkerHandler(options) {
 					}
 					if (pageResult.isEnoent) {
 						const nfPath = findNearestNotFoundPath(loaderProps?.path || "/");
-						const nfHtml = routeMap[nfPath];
+						const nfHtml = routeMap?.[nfPath];
 						if (nfHtml) {
 							const html = await readStaticHtml(nfHtml);
 							if (html) {
@@ -405,7 +409,7 @@ url: ${url}`);
 				const isDynamicRoute = Object.keys(route.routeKeys).length > 0;
 				const routeCleanPath = route.urlCleanPath.replace(/\?/g, "");
 				const notFoundKey = route.isNotFound ? route.page.replace(/\[([^\]]+)\]/g, ":$1") : null;
-				const htmlPath = notFoundKey ? routeMap[notFoundKey] : isDynamicRoute ? routeMap[routeCleanPath] || routeMap[url.pathname] : routeMap[url.pathname] || routeMap[routeBuildInfo?.cleanPath];
+				const htmlPath = notFoundKey ? routeMap?.[notFoundKey] : isDynamicRoute ? routeMap?.[routeCleanPath] || routeMap?.[url.pathname] : routeMap?.[url.pathname] || routeMap?.[routeBuildInfo?.cleanPath];
 				if (htmlPath) {
 					const html = await readStaticHtml(htmlPath);
 					if (html) {
@@ -417,7 +421,7 @@ url: ${url}`);
 				}
 				if (isDynamicRoute) {
 					const notFoundRoute = findNearestNotFoundPath(url.pathname);
-					const notFoundHtmlPath = routeMap[notFoundRoute];
+					const notFoundHtmlPath = routeMap?.[notFoundRoute];
 					if (notFoundHtmlPath) {
 						const notFoundHtml = await readStaticHtml(notFoundHtmlPath);
 						if (notFoundHtml) {
@@ -491,7 +495,7 @@ url: ${url}`);
 			for (const route of compiledManifest.pageRoutes) {
 				if (route.file === "") continue;
 				if (!route.compiledRegex.test(originalUrl)) continue;
-				if (route.type === "ssg" && Object.keys(route.routeKeys).length > 0 && !routeMap[originalUrl]) {
+				if (route.type === "ssg" && Object.keys(route.routeKeys).length > 0 && routeMap && !routeMap[originalUrl]) {
 					return new Response(make404LoaderJs(originalUrl, "ssg route not in routeMap"), { headers: { "Content-Type": "text/javascript" } });
 				}
 				if (route.hasLoader === false) {