@koine/next 1.1.8 → 1.1.10
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.
- package/AnalyticsGoogle.js +1 -1
- package/ThemeProvider.js +1 -1
- package/app/css/index.d.ts +2 -2
- package/auth/helpers.js +1 -1
- package/auth/useLogin.d.ts +1 -1
- package/auth/useLogin.js +1 -1
- package/auth/useLogout.js +1 -1
- package/getSiteUrl.js +1 -1
- package/node/AnalyticsGoogle.js +2 -2
- package/node/ThemeProvider.js +4 -4
- package/node/auth/helpers.js +3 -2
- package/node/auth/useLogin.js +2 -2
- package/node/auth/useLogout.js +4 -3
- package/node/getSiteUrl.js +3 -2
- package/node/seoBuildTags.js +2 -2
- package/node/useBackUrl.js +3 -2
- package/node/useDateFormat.js +2 -2
- package/package.json +13 -7
- package/seoBuildTags.js +1 -1
- package/useBackUrl.js +1 -1
- package/useDateFormat.js +1 -1
package/AnalyticsGoogle.js
CHANGED
|
@@ -3,7 +3,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
|
|
|
3
3
|
import { useState, useEffect } from "react";
|
|
4
4
|
import { useRouter } from "next/router";
|
|
5
5
|
import Script from "next/script";
|
|
6
|
-
import
|
|
6
|
+
import gtagPageview from "@koine/browser/gtagPageview";
|
|
7
7
|
export var AnalyticsGoogle = function (_a) {
|
|
8
8
|
var id = _a.id;
|
|
9
9
|
var uid = id || process.env["NEXT_PUBLIC_GTM_ID"];
|
package/ThemeProvider.js
CHANGED
|
@@ -2,7 +2,7 @@ import { __assign, __spreadArray } from "tslib";
|
|
|
2
2
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
3
|
import { useCallback, useEffect, useState, memo } from "react";
|
|
4
4
|
import NextScript from "next/script";
|
|
5
|
-
import
|
|
5
|
+
import isServer from "@koine/utils/isServer";
|
|
6
6
|
import { ThemeContext } from "./ThemeContext";
|
|
7
7
|
var colorSchemes = ["light", "dark"];
|
|
8
8
|
var MEDIA = "(prefers-color-scheme: dark)";
|
package/app/css/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AppProps } from "next/app";
|
|
2
|
-
import { AppThemeProps } from "./AppTheme";
|
|
3
|
-
import { AppMainProps } from "./AppMain";
|
|
2
|
+
import { type AppThemeProps } from "./AppTheme";
|
|
3
|
+
import { type AppMainProps } from "./AppMain";
|
|
4
4
|
export type NextAppProps = AppProps & AppThemeProps & AppMainProps;
|
|
5
5
|
/**
|
|
6
6
|
* App
|
package/auth/helpers.js
CHANGED
package/auth/useLogin.d.ts
CHANGED
package/auth/useLogin.js
CHANGED
|
@@ -2,7 +2,7 @@ import { __assign } from "tslib";
|
|
|
2
2
|
import { useState, useCallback } from "react";
|
|
3
3
|
import { useRouter } from "next/router";
|
|
4
4
|
import { signIn } from "next-auth/react";
|
|
5
|
-
import
|
|
5
|
+
import parseURL from "@koine/utils/parseURL";
|
|
6
6
|
import { useT } from "../useT";
|
|
7
7
|
import { getAuthRoutes, getCallbackUrl } from "./helpers";
|
|
8
8
|
export function useLogin() {
|
package/auth/useLogout.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useState, useCallback } from "react";
|
|
2
2
|
import { useRouter } from "next/router";
|
|
3
3
|
import { signOut } from "next-auth/react";
|
|
4
|
-
import
|
|
4
|
+
import parseURL from "@koine/utils/parseURL";
|
|
5
5
|
import { useT } from "../useT";
|
|
6
6
|
import { getAuthRoutes, getCallbackUrl } from "./helpers";
|
|
7
7
|
export function useLogout() {
|
package/getSiteUrl.js
CHANGED
package/node/AnalyticsGoogle.js
CHANGED
|
@@ -6,7 +6,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
6
6
|
var react_1 = require("react");
|
|
7
7
|
var router_1 = require("next/router");
|
|
8
8
|
var script_1 = tslib_1.__importDefault(require("next/script"));
|
|
9
|
-
var
|
|
9
|
+
var gtagPageview_1 = tslib_1.__importDefault(require("@koine/browser/gtagPageview"));
|
|
10
10
|
var AnalyticsGoogle = function (_a) {
|
|
11
11
|
var id = _a.id;
|
|
12
12
|
var uid = id || process.env["NEXT_PUBLIC_GTM_ID"];
|
|
@@ -26,7 +26,7 @@ var AnalyticsGoogle = function (_a) {
|
|
|
26
26
|
(0, react_1.useEffect)(function () {
|
|
27
27
|
if (routed && ready && asPath) {
|
|
28
28
|
// const search = query;
|
|
29
|
-
(0,
|
|
29
|
+
(0, gtagPageview_1.default)(asPath);
|
|
30
30
|
}
|
|
31
31
|
}, [asPath, query, routed, ready]);
|
|
32
32
|
if (!uid) {
|
package/node/ThemeProvider.js
CHANGED
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var jsx_runtime_1 = require("react/jsx-runtime");
|
|
6
6
|
var react_1 = require("react");
|
|
7
7
|
var script_1 = tslib_1.__importDefault(require("next/script"));
|
|
8
|
-
var
|
|
8
|
+
var isServer_1 = tslib_1.__importDefault(require("@koine/utils/isServer"));
|
|
9
9
|
var ThemeContext_1 = require("./ThemeContext");
|
|
10
10
|
var colorSchemes = ["light", "dark"];
|
|
11
11
|
var MEDIA = "(prefers-color-scheme: dark)";
|
|
@@ -31,7 +31,7 @@ var ThemeProvider = function (_a) {
|
|
|
31
31
|
var applyTheme = (0, react_1.useCallback)(function (theme) {
|
|
32
32
|
var _a;
|
|
33
33
|
var resolved = theme;
|
|
34
|
-
if (
|
|
34
|
+
if (isServer_1.default || !resolved)
|
|
35
35
|
return;
|
|
36
36
|
// If theme is system, resolve it before setting theme
|
|
37
37
|
if (theme === "system" && enableSystem) {
|
|
@@ -212,7 +212,7 @@ var ThemeScript = (0, react_1.memo)(function (_a) {
|
|
|
212
212
|
function () { return true; });
|
|
213
213
|
// Helpers
|
|
214
214
|
var getTheme = function (key, fallback) {
|
|
215
|
-
if (
|
|
215
|
+
if (isServer_1.default)
|
|
216
216
|
return undefined;
|
|
217
217
|
var theme;
|
|
218
218
|
try {
|
|
@@ -245,6 +245,6 @@ var getSystemTheme = function (e) {
|
|
|
245
245
|
return systemTheme;
|
|
246
246
|
};
|
|
247
247
|
var encodeBase64 = function (str) {
|
|
248
|
-
return
|
|
248
|
+
return isServer_1.default ? Buffer.from(str).toString("base64") : btoa(str);
|
|
249
249
|
};
|
|
250
250
|
exports.default = exports.ThemeProvider;
|
package/node/auth/helpers.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getCallbackUrl = exports.getAuthRoutes = exports.AUTH_ROUTES = void 0;
|
|
4
|
-
var
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
5
|
+
var isString_1 = tslib_1.__importDefault(require("@koine/utils/isString"));
|
|
5
6
|
exports.AUTH_ROUTES = {
|
|
6
7
|
login: process.env["AUTH_ROUTE_LOGIN"],
|
|
7
8
|
profile: process.env["AUTH_ROUTE_PROFILE"],
|
|
@@ -12,7 +13,7 @@ function getAuthRoutes(t) {
|
|
|
12
13
|
return Object.keys(exports.AUTH_ROUTES).reduce(function (map, name) {
|
|
13
14
|
var routePage = exports.AUTH_ROUTES[name];
|
|
14
15
|
// @ts-expect-error cannot remember
|
|
15
|
-
map[name] = (0,
|
|
16
|
+
map[name] = (0, isString_1.default)(routePage) ? t("~:".concat(exports.AUTH_ROUTES[name])) : routePage;
|
|
16
17
|
return map;
|
|
17
18
|
}, {});
|
|
18
19
|
}
|
package/node/auth/useLogin.js
CHANGED
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var react_1 = require("react");
|
|
6
6
|
var router_1 = require("next/router");
|
|
7
7
|
var react_2 = require("next-auth/react");
|
|
8
|
-
var
|
|
8
|
+
var parseURL_1 = tslib_1.__importDefault(require("@koine/utils/parseURL"));
|
|
9
9
|
var useT_1 = require("../useT");
|
|
10
10
|
var helpers_1 = require("./helpers");
|
|
11
11
|
function useLogin() {
|
|
@@ -24,7 +24,7 @@ function useLogin() {
|
|
|
24
24
|
setOk(ok);
|
|
25
25
|
setFail(!ok);
|
|
26
26
|
if (ok) {
|
|
27
|
-
var redirectUrl = (0,
|
|
27
|
+
var redirectUrl = (0, parseURL_1.default)((0, helpers_1.getCallbackUrl)());
|
|
28
28
|
var _b = (0, helpers_1.getAuthRoutes)(t), login = _b.login, register = _b.register, profile = _b.profile;
|
|
29
29
|
if (redirectUrl) {
|
|
30
30
|
var redirectPath = redirectUrl.pathname;
|
package/node/auth/useLogout.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useLogout = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
4
5
|
var react_1 = require("react");
|
|
5
6
|
var router_1 = require("next/router");
|
|
6
7
|
var react_2 = require("next-auth/react");
|
|
7
|
-
var
|
|
8
|
+
var parseURL_1 = tslib_1.__importDefault(require("@koine/utils/parseURL"));
|
|
8
9
|
var useT_1 = require("../useT");
|
|
9
10
|
var helpers_1 = require("./helpers");
|
|
10
11
|
function useLogout() {
|
|
@@ -20,8 +21,8 @@ function useLogout() {
|
|
|
20
21
|
(0, react_2.signOut)({ redirect: false }).then(function () {
|
|
21
22
|
setLoading(false);
|
|
22
23
|
setOk(true);
|
|
23
|
-
var redirectUrl = (0,
|
|
24
|
-
var currentUrl = (0,
|
|
24
|
+
var redirectUrl = (0, parseURL_1.default)((0, helpers_1.getCallbackUrl)());
|
|
25
|
+
var currentUrl = (0, parseURL_1.default)(window.location.href);
|
|
25
26
|
var secured = (0, helpers_1.getAuthRoutes)(t).secured;
|
|
26
27
|
var signin = t("~:/signin");
|
|
27
28
|
var profile = t("~:/profile");
|
package/node/getSiteUrl.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getSiteUrl = void 0;
|
|
4
|
-
var
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
5
|
+
var normaliseUrl_1 = tslib_1.__importDefault(require("@koine/utils/normaliseUrl"));
|
|
5
6
|
/**
|
|
6
7
|
* Get site absolute url with the given path
|
|
7
8
|
*
|
|
@@ -10,7 +11,7 @@ var utils_1 = require("@koine/utils");
|
|
|
10
11
|
*/
|
|
11
12
|
function getSiteUrl(path) {
|
|
12
13
|
if (path === void 0) { path = ""; }
|
|
13
|
-
return (0,
|
|
14
|
+
return (0, normaliseUrl_1.default)("".concat(process.env["NEXT_PUBLIC_APP_URL"], "/").concat(path));
|
|
14
15
|
}
|
|
15
16
|
exports.getSiteUrl = getSiteUrl;
|
|
16
17
|
exports.default = getSiteUrl;
|
package/node/seoBuildTags.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.seoBuildTags = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var jsx_runtime_1 = require("react/jsx-runtime");
|
|
6
|
-
var
|
|
6
|
+
var isArray_1 = tslib_1.__importDefault(require("@koine/utils/isArray"));
|
|
7
7
|
var defaults = {
|
|
8
8
|
tplTitle: "",
|
|
9
9
|
};
|
|
@@ -52,7 +52,7 @@ var seoBuildTags = function (_a) {
|
|
|
52
52
|
}
|
|
53
53
|
keywords = keywords || (seo === null || seo === void 0 ? void 0 : seo.keywords);
|
|
54
54
|
if (keywords) {
|
|
55
|
-
$names["keywords"] = (0,
|
|
55
|
+
$names["keywords"] = (0, isArray_1.default)(keywords) ? keywords.join(", ") : keywords;
|
|
56
56
|
}
|
|
57
57
|
if ((languageAlternates === null || languageAlternates === void 0 ? void 0 : languageAlternates.length) > 0) {
|
|
58
58
|
languageAlternates.forEach(function (_a) {
|
package/node/useBackUrl.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useBackUrl = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
4
5
|
var react_1 = require("react");
|
|
5
6
|
var router_1 = require("next/router");
|
|
6
|
-
var
|
|
7
|
-
var back = (0,
|
|
7
|
+
var createStorage_1 = tslib_1.__importDefault(require("@koine/browser/createStorage"));
|
|
8
|
+
var back = (0, createStorage_1.default)({
|
|
8
9
|
lastUrl: "",
|
|
9
10
|
});
|
|
10
11
|
function useBackUrl() {
|
package/node/useDateFormat.js
CHANGED
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var react_1 = require("react");
|
|
6
6
|
var router_1 = require("next/router");
|
|
7
7
|
var format_1 = tslib_1.__importDefault(require("date-fns/format"));
|
|
8
|
-
var
|
|
8
|
+
var useDateLocale_1 = tslib_1.__importDefault(require("@koine/react/hooks/useDateLocale"));
|
|
9
9
|
/**
|
|
10
10
|
* Automatically returns the `date-fns/format` function with the right locale
|
|
11
11
|
* passed as option (grabbed from next router value).
|
|
@@ -21,7 +21,7 @@ var useDateFormat = function () {
|
|
|
21
21
|
};
|
|
22
22
|
}), formatter = _a[0], setFormatter = _a[1];
|
|
23
23
|
var router = (0, router_1.useRouter)();
|
|
24
|
-
var locale = (0,
|
|
24
|
+
var locale = (0, useDateLocale_1.default)(router.locale);
|
|
25
25
|
(0, react_1.useEffect)(function () {
|
|
26
26
|
if (locale) {
|
|
27
27
|
var newFormatter_1 = function (date, _format, options) { return (0, format_1.default)(date, _format, tslib_1.__assign(tslib_1.__assign({}, (options || {})), { locale: locale })); };
|
package/package.json
CHANGED
|
@@ -38,6 +38,12 @@
|
|
|
38
38
|
"next-auth": {
|
|
39
39
|
"optional": true
|
|
40
40
|
},
|
|
41
|
+
"next-seo": {
|
|
42
|
+
"optional": true
|
|
43
|
+
},
|
|
44
|
+
"next-translate": {
|
|
45
|
+
"optional": true
|
|
46
|
+
},
|
|
41
47
|
"react-hook-form": {
|
|
42
48
|
"optional": true
|
|
43
49
|
},
|
|
@@ -55,6 +61,9 @@
|
|
|
55
61
|
},
|
|
56
62
|
"styled-components": {
|
|
57
63
|
"optional": true
|
|
64
|
+
},
|
|
65
|
+
"tailwindcss": {
|
|
66
|
+
"optional": true
|
|
58
67
|
}
|
|
59
68
|
},
|
|
60
69
|
"main": "./node/index.js",
|
|
@@ -63,26 +72,23 @@
|
|
|
63
72
|
"peerDependencies": {
|
|
64
73
|
"react": "18.2.0",
|
|
65
74
|
"next": "13.1.6",
|
|
66
|
-
"@koine/browser": "1.1.8",
|
|
67
|
-
"@koine/utils": "1.1.8",
|
|
68
|
-
"ts-debounce": "4.0.0",
|
|
69
|
-
"type-fest": "3.5.3",
|
|
70
|
-
"@koine/dom": "1.1.8",
|
|
71
|
-
"date-fns-tz": "1.3.7",
|
|
72
75
|
"framer-motion": "8.5.5",
|
|
73
76
|
"next-auth": "4.19.0",
|
|
74
77
|
"@mui/material": "5.11.6",
|
|
75
78
|
"@emotion/react": "11.10.5",
|
|
76
79
|
"styled-components": "5.3.6",
|
|
80
|
+
"@koine/utils": "1.1.10",
|
|
77
81
|
"react-hook-form": "7.42.1",
|
|
78
82
|
"@emotion/server": "11.10.0",
|
|
79
83
|
"next-translate": "1.6.0",
|
|
84
|
+
"ts-debounce": "4.0.0",
|
|
85
|
+
"type-fest": "3.5.3",
|
|
80
86
|
"next-seo": "5.15.0",
|
|
81
87
|
"date-fns": "2.29.3",
|
|
82
88
|
"@kuus/yup": "1.0.0-beta.7",
|
|
83
89
|
"@hookform/resolvers": "2.9.10",
|
|
84
90
|
"tslib": "2.5.0"
|
|
85
91
|
},
|
|
86
|
-
"version": "1.1.
|
|
92
|
+
"version": "1.1.10",
|
|
87
93
|
"module": "./index.js"
|
|
88
94
|
}
|
package/seoBuildTags.js
CHANGED
package/useBackUrl.js
CHANGED
package/useDateFormat.js
CHANGED
|
@@ -2,7 +2,7 @@ import { __assign } from "tslib";
|
|
|
2
2
|
import { useEffect, useState } from "react";
|
|
3
3
|
import { useRouter } from "next/router";
|
|
4
4
|
import format from "date-fns/format";
|
|
5
|
-
import
|
|
5
|
+
import useDateLocale from "@koine/react/hooks/useDateLocale";
|
|
6
6
|
/**
|
|
7
7
|
* Automatically returns the `date-fns/format` function with the right locale
|
|
8
8
|
* passed as option (grabbed from next router value).
|