@koine/next 1.0.12 → 1.0.15

package/Forms/index.d.ts

@@ -1,2 +1 @@
 export * from "./useForm";
-export * from "./useSubmit";

package/Forms/index.js

@@ -1,2 +1 @@
 export * from "./useForm";
-export * from "./useSubmit";

package/config/index.d.ts

@@ -1,5 +1,18 @@
 import type { NextConfig } from "next";
 import type { Redirect, Rewrite } from "next/dist/lib/load-custom-routes";
+/**
+ * Transform to path any absolute or relative URL
+ *
+ * Useful when setting up `rewrites` and `redirects` especally in a [multi-zones
+ * setup](https://nextjs.org/docs/advanced-features/multi-zones).
+ *
+ * From a path like `http://localhost/some//malformed/path///` it returns `/some/malformed/path`
+ *
+ * - just get the pathname form an absolute URL (if that is given)
+ * - Removes subsequent slashes
+ * - Removing initial and ending slashes
+ */
+export declare function toPath(urlOrPathname?: string): string;
 /**
  * Normalise pathname
  *

package/config/index.js

@@ -1,4 +1,28 @@
 import { __assign, __awaiter, __generator, __rest } from "tslib";
+/**
+ * Transform to path any absolute or relative URL
+ *
+ * Useful when setting up `rewrites` and `redirects` especally in a [multi-zones
+ * setup](https://nextjs.org/docs/advanced-features/multi-zones).
+ *
+ * From a path like `http://localhost/some//malformed/path///` it returns `/some/malformed/path`
+ *
+ * - just get the pathname form an absolute URL (if that is given)
+ * - Removes subsequent slashes
+ * - Removing initial and ending slashes
+ */
+export function toPath(urlOrPathname) {
+    if (urlOrPathname === void 0) { urlOrPathname = ""; }
+    var pathname = "";
+    try {
+        var parsed = new URL(urlOrPathname);
+        pathname = parsed.pathname;
+    }
+    catch (e) {
+        pathname = urlOrPathname;
+    }
+    return pathname.replace(/\/+\//g, "/").replace(/^\/+(.*?)\/+$/, "$1");
+}
 /**
  * Normalise pathname
  *
@@ -118,7 +142,9 @@ export function withKoine(_a) {
             // @see https://github.com/vercel/next.js/discussions/30174#discussion-3643870
             scrollRestoration: true }, (nextConfig.experimental || {})), { 
             // @see https://nextjs.org/docs/advanced-features/compiler#modularize-imports
-            modularizeImports: __assign({}, (((_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.experimental) === null || _b === void 0 ? void 0 : _b.modularizeImports) || {})) }) }, nextConfig);
+            modularizeImports: __assign({}, (((_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.experimental) === null || _b === void 0 ? void 0 : _b.modularizeImports) || {})) }), 
+        // @see https://github.com/vercel/next.js/issues/7322#issuecomment-887330111
+        reactStrictMode: true }, nextConfig);
     if (svg) {
         if (nx) {
             // @see https://github.com/gregberge/svgr

package/node/Forms/index.js

@@ -2,4 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./useForm"), exports);
-tslib_1.__exportStar(require("./useSubmit"), exports);

package/node/Head/Head.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Head = void 0;
 var head_1 = require("next/head");

package/node/config/index.js

@@ -1,7 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withKoine = exports.getRewrites = exports.getRedirects = exports.getPathRewrite = exports.getPathRedirect = exports.encodePathname = exports.normaliseUrlPathname = void 0;
+exports.withKoine = exports.getRewrites = exports.getRedirects = exports.getPathRewrite = exports.getPathRedirect = exports.encodePathname = exports.normaliseUrlPathname = exports.toPath = void 0;
 var tslib_1 = require("tslib");
+/**
+ * Transform to path any absolute or relative URL
+ *
+ * Useful when setting up `rewrites` and `redirects` especally in a [multi-zones
+ * setup](https://nextjs.org/docs/advanced-features/multi-zones).
+ *
+ * From a path like `http://localhost/some//malformed/path///` it returns `/some/malformed/path`
+ *
+ * - just get the pathname form an absolute URL (if that is given)
+ * - Removes subsequent slashes
+ * - Removing initial and ending slashes
+ */
+function toPath(urlOrPathname) {
+    if (urlOrPathname === void 0) { urlOrPathname = ""; }
+    var pathname = "";
+    try {
+        var parsed = new URL(urlOrPathname);
+        pathname = parsed.pathname;
+    }
+    catch (e) {
+        pathname = urlOrPathname;
+    }
+    return pathname.replace(/\/+\//g, "/").replace(/^\/+(.*?)\/+$/, "$1");
+}
+exports.toPath = toPath;
 /**
  * Normalise pathname
  *
@@ -127,7 +152,9 @@ function withKoine(_a) {
             // @see https://github.com/vercel/next.js/discussions/30174#discussion-3643870
             scrollRestoration: true }, (nextConfig.experimental || {})), { 
             // @see https://nextjs.org/docs/advanced-features/compiler#modularize-imports
-            modularizeImports: tslib_1.__assign({}, (((_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.experimental) === null || _b === void 0 ? void 0 : _b.modularizeImports) || {})) }) }, nextConfig);
+            modularizeImports: tslib_1.__assign({}, (((_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.experimental) === null || _b === void 0 ? void 0 : _b.modularizeImports) || {})) }), 
+        // @see https://github.com/vercel/next.js/issues/7322#issuecomment-887330111
+        reactStrictMode: true }, nextConfig);
     if (svg) {
         if (nx) {
             // @see https://github.com/gregberge/svgr

package/node/utils/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = exports.getSiteUrl = exports.ONE_DAY = exports.ONE_HOUR = void 0;
-var tslib_1 = require("tslib");
 var utils_1 = require("@koine/utils");
-tslib_1.__exportStar(require("./api"), exports);
 exports.ONE_HOUR = 3600;
 exports.ONE_DAY = 84000;
 /**

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@koine/next",
-  "version": "1.0.12",
   "sideEffects": false,
   "main": "./node/index.js",
   "typings": "./index.d.ts",
   "dependencies": {
     "react": "^16.8 || ^17 || ^18",
-    "react-dom": "^16.8 || ^17 || ^18",
     "next": "^12.1.6",
-    "framer-motion": "^6.3.3",
+    "@koine/utils": "1.0.15",
+    "framer-motion": "^6.3.4",
+    "@koine/react": "1.0.15",
     "styled-components": "^5.3.5",
-    "@mui/base": "^5.0.0-alpha.81",
+    "@mui/base": "^5.0.0-alpha.82",
     "react-icons": "^4.3.1",
     "date-fns": "^2.28.0",
     "react-swipeable": "^7.0.0",
     "@tiptap/react": "^2.0.0-beta.109",
-    "@tiptap/starter-kit": "^2.0.0-beta.184",
+    "@tiptap/starter-kit": "^2.0.0-beta.185",
     "yup": "^0.32.11",
-    "react-hook-form": "^7.31.1",
-    "type-fest": "^2.12.2",
+    "react-hook-form": "^7.31.2",
+    "type-fest": "^2.13.0",
     "tslib": "^2.4.0",
     "next-auth": "^4.3.4",
-    "@mui/material": "^5.8.0",
+    "@mui/material": "^5.8.1",
     "@emotion/react": "^11.9.0",
     "@emotion/server": "^11.4.0",
     "@hookform/resolvers": "^2.8.10",
@@ -29,6 +29,7 @@
     "next-seo": "^5.4.0"
   },
   "peerDependencies": {},
+  "version": "1.0.15",
   "module": "./index.js",
   "types": "./index.d.ts"
 }

package/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./api";
 export declare const ONE_HOUR = 3600;
 export declare const ONE_DAY = 84000;
 /**

package/utils/index.js

@@ -1,5 +1,4 @@
 import { normaliseUrl } from "@koine/utils";
-export * from "./api";
 export var ONE_HOUR = 3600;
 export var ONE_DAY = 84000;
 /**

package/node/Forms/useSubmit.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSubmit = void 0;
-var tslib_1 = require("tslib");
-var react_1 = require("@koine/react");
-var api_1 = require("../utils/api");
-function useSubmit(url, transformData) {
-    var _this = this;
-    var _a = (0, react_1.useAsyncFn)(function (json) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-        var response;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (transformData)
-                        json = transformData(json);
-                    return [4 /*yield*/, api_1.api.post(url, {
-                            json: json,
-                        })];
-                case 1:
-                    response = _a.sent();
-                    if (process.env["NODE_ENV"] !== "production") {
-                        console.log("[@koine/next] useSubmit response", response);
-                    }
-                    return [2 /*return*/, response];
-            }
-        });
-    }); }, [url, transformData]), state = _a[0], submit = _a[1];
-    var loading = state.loading, error = state.error, value = state.value;
-    var fail = !loading && (!!error || (value === null || value === void 0 ? void 0 : value.fail));
-    return tslib_1.__assign(tslib_1.__assign({ submit: submit, loading: loading }, (value || {})), { fail: fail });
-}
-exports.useSubmit = useSubmit;

package/node/utils/api.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.api = void 0;
-var tslib_1 = require("tslib");
-var utils_1 = require("@koine/utils");
-exports.api = ["get", "post", "put", "patch", "delete"].reduce(function (api, method) {
-    api[method] = function (endpoint, options) {
-        if (options === void 0) { options = {}; }
-        return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-            var _a, json, params, _b, headers, _c, timeout, requestInit, timeoutNumber, controller, timeoutId, url, response, result;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        _a = options.json, json = _a === void 0 ? {} : _a, params = options.params, _b = options.headers, headers = _b === void 0 ? {} : _b, _c = options.timeout, timeout = _c === void 0 ? 10000 : _c;
-                        requestInit = {
-                            method: method.toUpperCase(),
-                            headers: tslib_1.__assign({ "content-type": "application/json" }, headers),
-                        };
-                        timeoutNumber = Number(timeout);
-                        url = "/api/".concat(endpoint.replace(/^\/*/, ""));
-                        if (method !== "get") {
-                            requestInit.body = JSON.stringify(json);
-                        }
-                        if (timeoutNumber > 0) {
-                            controller = new AbortController();
-                            timeoutId = setTimeout(function () { return controller.abort(); }, timeoutNumber);
-                            requestInit.signal = controller.signal;
-                        }
-                        if (params) {
-                            url += (0, utils_1.buildUrlQueryString)(params);
-                        }
-                        return [4 /*yield*/, fetch(url, requestInit)];
-                    case 1:
-                        response = _d.sent();
-                        if (timeoutId) {
-                            clearTimeout(timeoutId);
-                        }
-                        return [4 /*yield*/, response.json()];
-                    case 2:
-                        result = (_d.sent());
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    return api;
-}, {});