eddev 0.3.2 → 0.3.4

package/build/get-webpack-config.js

@@ -145,7 +145,11 @@ function getWebpackConfig(opts) {
                                             require.resolve("@babel/preset-env"),
                                             {
                                                 useBuiltIns: "entry",
-                                                exclude: ["@babel/plugin-transform-regenerator"],
+                                                exclude: [
+                                                    "@babel/plugin-transform-regenerator",
+                                                    "proposal-dynamic-import",
+                                                    "transform-modules-commonjs",
+                                                ],
                                                 targets: "> 0.25%, not dead",
                                                 corejs: 3,
                                             },
@@ -314,6 +318,8 @@ function getWebpackConfig(opts) {
                             writeVirtualModule(ALIAS["@manifest/blocks"], manifest);
                         },
                     }));
+                    ALIAS["@devtools"] = path_1.default.resolve(opts.baseDirectory, "_devtools.js");
+                    writeVirtualModule(ALIAS["@devtools"], "\n      import { dynamic } from 'eddev/dynamic'\n      export const DevUI = dynamic(async () => await import(\"eddev/dev-ui/components/DevUI\"), { ssr: false })\n    ");
                     // Wait for all manifests to resolve
                     return [4 /*yield*/, Promise.all(manifestLoaders)
                         // External Gutenberg
@@ -358,6 +364,12 @@ function getWebpackConfig(opts) {
                     rpcExists = (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc.ts")) ||
                         (0, fs_1.existsSync)(path_1.default.join(opts.baseDirectory, "apis/_rpc/index.ts"));
                     DEFINES["process.rpcEnabled"] = rpcExists ? "true" : "false";
+                    if (!rpcExists) {
+                        EXTERNALS["@trpc/react"] = "{}";
+                        EXTERNALS["@trpc/server"] = "{}";
+                        EXTERNALS["@trpc/client"] = "{}";
+                        EXTERNALS["@trpc/next"] = "{}";
+                    }
                     if (isBrowser) {
                         DEFINES["process.env.themePath"] = "window.THEME_PATH || ".concat(DEFINES["process.env.themePath"]);
                     }

package/build/workers/codegen-worker-script.js

@@ -167,7 +167,7 @@ function beginWork(opts) {
                 });
             }); };
             // Create RPC/API types
-            (0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n    import type { router, createContext } from \"./apis/_rpc\"\n    import { createReactQueryHooks } from \"@trpc/react\"\n    export {}\n    \n    const createQueryHooks = () => createReactQueryHooks<typeof router>()\n    \n    declare global {\n      type RPCUse = ReturnType<typeof createQueryHooks>\n      type RPCRouter = typeof router\n      type RPCContextType = Awaited<ReturnType<typeof createContext>>\n      type RPCClient = ReturnType<RPCUse[\"createClient\"]>\n      type RPCUseQuery = RPCUse[\"useQuery\"]\n      type RPCUseMutation = RPCUse[\"useMutation\"]\n      type RPCUseInfiniteQuery = RPCUse[\"useInfiniteQuery\"]\n    }\n\n    declare global {\n      namespace NodeJS {\n        interface Process {\n          // @ts-ignore\n          browser: boolean\n          dev: boolean\n          admin: boolean\n          serverless: boolean\n        }\n      }\n    }\n    \n  ");
+            (0, promises_1.writeFile)(Path.join(opts.baseDirectory, "types.api.ts"), "\n    import type { router, createContext } from \"./apis/_rpc\"\n    import { createReactQueryHooks } from \"@trpc/react\"\n    export {}\n    \n    const createQueryHooks = process.rpcEnabled ? () => createReactQueryHooks<typeof router>() : null\n    \n    declare global {\n      type RPCUse = ReturnType<typeof createQueryHooks>\n      type RPCRouter = typeof router\n      type RPCContextType = Awaited<ReturnType<typeof createContext>>\n      type RPCClient = ReturnType<RPCUse[\"createClient\"]>\n      type RPCUseQuery = RPCUse[\"useQuery\"]\n      type RPCUseMutation = RPCUse[\"useMutation\"]\n      type RPCUseInfiniteQuery = RPCUse[\"useInfiniteQuery\"]\n    }\n\n    declare global {\n      namespace NodeJS {\n        interface Process {\n          // @ts-ignore\n          browser: boolean\n          dev: boolean\n          admin: boolean\n          serverless: boolean\n        }\n      }\n    }\n    \n  ");
             regenerate = debounce(100, function () { return __awaiter(_this, void 0, void 0, function () {
                 var startTime, hasChanged, err_1, documentSets, parseErrors, _loop_1, _a, _b, _i, key, generates, errors, _c, _d, _e, file, base, config, output, err_2;
                 var _this = this;

package/components/BrowserRouter.js

@@ -109,12 +109,22 @@ function BrowserRouter(props) {
             cancelled = true;
         };
     }, [pending]);
-    var _c = (0, react_1.useState)({ value: null }), scrollPosition = _c[0], setScrollPosition = _c[1];
-    (0, react_1.useEffect)(function () {
-        if (document.scrollingElement && typeof scrollPosition.value === "number") {
-            document.scrollingElement.scrollTop = scrollPosition.value;
+    var scrollTo = function (value) {
+        if (typeof value !== "number")
+            return;
+        if (routing_1.customRouterScrollHandler.handler) {
+            routing_1.customRouterScrollHandler.handler(value);
         }
-    }, [scrollPosition]);
+        else if (document.scrollingElement) {
+            document.scrollingElement.scrollTop = value;
+        }
+    };
+    // const [scrollPosition, setScrollPosition] = useState({ value: null as null | number })
+    // useEffect(() => {
+    //   if (document.scrollingElement && typeof scrollPosition.value === "number") {
+    //     document.scrollingElement.scrollTop = scrollPosition.value
+    //   }
+    // }, [scrollPosition])
     return ((0, jsx_runtime_1.jsx)(routing_1.RouterRoot, __assign({ url: url, data: data, onNavigateRequest: function (url) {
             setPendingUrl({ popped: false, url: url });
         }, onPreload: function (url) {
@@ -123,10 +133,14 @@ function BrowserRouter(props) {
             }
         }, onNavigated: function () {
             if (pending && typeof pending.scrollPosition === "number") {
-                setScrollPosition({ value: pending.scrollPosition });
+                // setScrollPosition({ value: pending.scrollPosition })
+                // document.scrollingElement!.scrollTop = pending.scrollPosition
+                scrollTo(pending.scrollPosition);
             }
             else {
-                setScrollPosition({ value: 0 });
+                // setScrollPosition({ value: 0 })
+                // document.scrollingElement!.scrollTop = 0
+                scrollTo(0);
             }
         } }, { children: props.children }), void 0));
 }

package/dev-ui/loader.js

@@ -1,30 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DevUILoader = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var dynamic_1 = require("../dynamic");
 var usePersistState_1 = require("./hooks/usePersistState");
-var DevUI = (0, dynamic_1.dynamic)(function () { return Promise.resolve().then(function () { return __importStar(require("./components/DevUI")); }); }, { ssr: false });
+// Defined as a webpack dynamic module
+// @ts-ignore
+var _devtools_1 = require("@devtools");
 function DevUILoader() {
     var _a = (0, usePersistState_1.usePersistState)("enable_devui", process.dev || (typeof window !== "undefined" && window["ENABLE_DEV_UI"])), render = _a[0], setRender = _a[1];
     (0, react_1.useEffect)(function () {
@@ -33,7 +15,7 @@ function DevUILoader() {
         }
     }, []);
     if (render) {
-        return (0, jsx_runtime_1.jsx)(DevUI, {}, void 0);
+        return (0, jsx_runtime_1.jsx)(_devtools_1.DevUI, {}, void 0);
     }
     else {
         return null;

package/entry/Root.js

@@ -38,12 +38,10 @@ var routing_1 = require("../routing");
 var loader_1 = require("../dev-ui/loader");
 var next_1 = require("@trpc/next");
 function Root() {
+    var _a, _b;
     var route = (0, routing_1.useRoute)();
-    return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [process.devUI && (0, jsx_runtime_1.jsx)(loader_1.DevUILoader, {}, void 0), (0, jsx_runtime_1.jsx)(views_1.App, { children: (0, jsx_runtime_1.jsx)(routing_1.Switch, { children: Object.entries(views_1.default).map(function (_a) {
-                        var _b, _c;
-                        var name = _a[0], Component = _a[1];
-                        return ((0, jsx_runtime_1.jsx)(routing_1.Route, __assign({ match: function (route) { var _a; return ((_a = route.data) === null || _a === void 0 ? void 0 : _a.view) === name; } }, { children: (0, jsx_runtime_1.jsx)(Component, __assign({}, (_c = (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData) === null || _c === void 0 ? void 0 : _c.data), void 0) }), name));
-                    }) }, void 0) }, void 0)] }, void 0));
+    var Component = views_1.default[(_a = route.data) === null || _a === void 0 ? void 0 : _a.view];
+    return ((0, jsx_runtime_1.jsxs)(react_1.Fragment, { children: [process.devUI && (0, jsx_runtime_1.jsx)(loader_1.DevUILoader, {}, void 0), (0, jsx_runtime_1.jsx)(views_1.App, { children: Component ? (0, jsx_runtime_1.jsx)(Component, __assign({}, (_b = route.data) === null || _b === void 0 ? void 0 : _b.viewData.data), void 0) : null }, void 0)] }, void 0));
 }
 exports.default = process.rpcEnabled
     ? (0, next_1.withTRPC)({

package/hooks/useRPC.d.ts

@@ -3,7 +3,7 @@ declare const trpc: any;
 export declare const useRPCQuery: RPCUseQuery;
 export declare const useRPCMutation: RPCUseMutation;
 export declare const useRPCInfiniteQuery: RPCUseInfiniteQuery;
-export declare const rpcClient: RPCClient;
+export declare const rpcClient: any;
 export declare type UseRPCMutationResult = ReturnType<typeof trpc.useMutation>;
 export declare type UseRPCQueryResult = ReturnType<typeof trpc.useQuery>;
 export declare type UseRPCInfiniteQueryResult = ReturnType<typeof trpc.useInfiniteQuery>;

package/hooks/useRPC.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPCClientError = exports.rpcClient = exports.useRPCInfiniteQuery = exports.useRPCMutation = exports.useRPCQuery = void 0;
 var react_1 = require("@trpc/react");
 var client_1 = require("@trpc/client");
-var trpc = (0, react_1.createReactQueryHooks)();
+var trpc = process.rpcEnabled ? (0, react_1.createReactQueryHooks)() : {};
 // @ts-ignore
 exports.useRPCQuery = trpc.useQuery;
 // @ts-ignore
 exports.useRPCMutation = trpc.useMutation;
 // @ts-ignore
 exports.useRPCInfiniteQuery = trpc.useInfiniteQuery;
-exports.rpcClient = trpc.createClient({
-    // @ts-ignore
-    url: process.serverlessEndpoint.replace(/\/$/, "") + "/api/trpc",
-    // @ts-ignore
-});
+exports.rpcClient = process.rpcEnabled
+    ? trpc.createClient({
+        // @ts-ignore
+        url: process.serverlessEndpoint.replace(/\/$/, "") + "/api/trpc",
+        // @ts-ignore
+    })
+    : null;
 exports.RPCClientError = client_1.TRPCClientError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "main": "./index.js",
   "license": "MIT",
   "bin": {

package/routing/routing.d.ts

@@ -52,6 +52,11 @@ declare type RouteContextType = {
 };
 export declare function useRoute(): RouteItem;
 export declare function useRouter(): RouteContextType | undefined;
+export declare type RouterScrollHandler = (value: number) => void;
+export declare const customRouterScrollHandler: {
+    handler: RouterScrollHandler | null;
+};
+export declare function useCustomRouterScrollHandler(handler: RouterScrollHandler): void;
 export declare type RouteProps = RouteContextConfig & {
     children: ReactNode;
 };

package/routing/routing.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useRouter = exports.useRoute = void 0;
+exports.RouteItemContext = exports.Switch = exports.Link = exports.urlDescendentsMatch = exports.urlPathsMatch = exports.isInternalPageLink = exports.RouterRoot = exports.createRouteItem = exports.Route = exports.useCustomRouterScrollHandler = exports.customRouterScrollHandler = exports.useRouter = exports.useRoute = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var react_merge_refs_1 = require("react-merge-refs");
@@ -236,6 +236,18 @@ function useRouter() {
     return (0, react_1.useContext)(RouterContext);
 }
 exports.useRouter = useRouter;
+exports.customRouterScrollHandler = {
+    handler: null,
+};
+function useCustomRouterScrollHandler(handler) {
+    exports.customRouterScrollHandler.handler = handler;
+    (0, react_1.useEffect)(function () {
+        return function () {
+            exports.customRouterScrollHandler.handler = null;
+        };
+    }, []);
+}
+exports.useCustomRouterScrollHandler = useCustomRouterScrollHandler;
 function Route(props) {
     var ctx = useForkedRouter({
         match: props.match,