nuudel-core 0.1.135 → 0.1.138
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/build/main/lib/components/Dialog/index.d.ts +1 -0
- package/build/main/lib/components/Dialog/index.js +2 -2
- package/build/main/lib/hocs/withUser/index.js +26 -4
- package/build/module/lib/components/Dialog/index.d.ts +1 -0
- package/build/module/lib/components/Dialog/index.js +2 -2
- package/build/module/lib/hocs/withUser/index.js +26 -7
- package/package.json +2 -2
|
@@ -91,7 +91,7 @@ const DialogBasic = (_a) => {
|
|
|
91
91
|
else
|
|
92
92
|
didMountRef.current = true;
|
|
93
93
|
}, [props.open]);
|
|
94
|
-
return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)(core_1.Dialog, Object.assign({ open: open, onClose: handleClose, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-content", maxWidth: props.maxWidth, fullScreen: props.fullScreen }, { children: [(0, jsx_runtime_1.jsxs)(core_1.DialogTitle, Object.assign({ id: "alert-dialog-title", className: classes.title }, { children: [props.title, (0, jsx_runtime_1.jsx)(IconButton_1.default, Object.assign({ "aria-label": "close", className: classes.closeButton, onClick: handleClose }, { children: (0, jsx_runtime_1.jsx)(Close_1.default, {}, void 0) }), void 0)] }), void 0), (0, jsx_runtime_1.jsx)(core_1.DialogContent, Object.assign({ id: "alert-dialog-content", className: classes.dialogContent }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ className: classes.content }, { children: children }), void 0) }), void 0), !!props.onSubmit && ((0, jsx_runtime_1.jsx)(core_1.DialogActions, { children: (0, jsx_runtime_1.jsx)(__1.Button, Object.assign({ onClick: props.onSubmit, color: "primary" }, { children: (0, i18n_1.t)('Done') }), void 0) }, void 0))] }), void 0) }, void 0));
|
|
94
|
+
return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsxs)(core_1.Dialog, Object.assign({ open: open, onClose: handleClose, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-content", maxWidth: props.maxWidth, fullWidth: props.fullWidth, fullScreen: props.fullScreen }, { children: [(0, jsx_runtime_1.jsxs)(core_1.DialogTitle, Object.assign({ id: "alert-dialog-title", className: classes.title }, { children: [props.title, (0, jsx_runtime_1.jsx)(IconButton_1.default, Object.assign({ "aria-label": "close", className: classes.closeButton, onClick: handleClose }, { children: (0, jsx_runtime_1.jsx)(Close_1.default, {}, void 0) }), void 0)] }), void 0), (0, jsx_runtime_1.jsx)(core_1.DialogContent, Object.assign({ id: "alert-dialog-content", className: classes.dialogContent }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ className: classes.content }, { children: children }), void 0) }), void 0), !!props.onSubmit && ((0, jsx_runtime_1.jsx)(core_1.DialogActions, { children: (0, jsx_runtime_1.jsx)(__1.Button, Object.assign({ onClick: props.onSubmit, color: "primary" }, { children: (0, i18n_1.t)('Done') }), void 0) }, void 0))] }), void 0) }, void 0));
|
|
95
95
|
};
|
|
96
96
|
exports.default = DialogBasic;
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvRGlhbG9nL2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwrQ0FBb0U7QUFDcEUsNENBUzJCO0FBQzNCLDJCQUE2QjtBQUM3Qix5Q0FBbUM7QUFDbkMsOEVBQXNEO0FBQ3RELHFFQUFpRDtBQUVqRCxNQUFNLFNBQVMsR0FBRyxJQUFBLGlCQUFVLEVBQUMsQ0FBQyxLQUFZLEVBQUUsRUFBRSxDQUM1QyxJQUFBLG1CQUFZLEVBQUM7SUFDWCxJQUFJLEVBQUU7UUFDSixNQUFNLEVBQUUsQ0FBQztRQUNULE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztLQUMxQjtJQUNELFdBQVcsRUFBRTtRQUNYLFFBQVEsRUFBRSxVQUFVO1FBQ3BCLEtBQUssRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUN2QixHQUFHLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7S0FFdEI7SUFDRCxPQUFPLEVBQUU7UUFDUCxPQUFPLEVBQUUsTUFBTTtRQUNmLFNBQVMsRUFBRSxNQUFNO1FBQ2pCLGNBQWMsRUFBRSxRQUFRO0tBQ3pCO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsU0FBUyxFQUNQLHVHQUF1RztRQUN6RyxlQUFlLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSTtRQUMzQyxNQUFNLEVBQUUsQ0FBQztLQUNWO0lBQ0QsYUFBYSxFQUFFO1FBQ2IsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO0tBQzFCO0NBQ0YsQ0FBQyxDQUNILENBQUM7QUFjRixNQUFNLFdBQVcsR0FBb0MsQ0FBQyxFQUdyRCxFQUFFLEVBQUU7UUFIaUQsRUFDcEQsUUFBUSxPQUVULEVBREksS0FB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
|
|
@@ -12,14 +12,32 @@ const fetcher_1 = require("../../services/fetcher");
|
|
|
12
12
|
const Query_1 = require("./Query");
|
|
13
13
|
const nuudel_utils_1 = require("nuudel-utils");
|
|
14
14
|
const swr_1 = __importDefault(require("swr"));
|
|
15
|
+
const router_1 = __importDefault(require("next/router"));
|
|
16
|
+
function getRedirectTo() {
|
|
17
|
+
if (typeof window !== 'undefined' && (window === null || window === void 0 ? void 0 : window.location)) {
|
|
18
|
+
return window.location;
|
|
19
|
+
}
|
|
20
|
+
return {};
|
|
21
|
+
}
|
|
15
22
|
var initialState = {};
|
|
16
23
|
exports.UserContext = (0, react_1.createContext)(initialState);
|
|
17
24
|
exports.UserContext.displayName = 'userContext';
|
|
18
25
|
const withUser = (WrappedComponent) => (props) => {
|
|
19
|
-
|
|
26
|
+
var _a;
|
|
27
|
+
let token = UI_1.UI.getItem(nuudel_utils_1.USER_TOKEN);
|
|
20
28
|
const userId = UI_1.UI.getItem(nuudel_utils_1.USER_ID);
|
|
21
|
-
|
|
22
|
-
const
|
|
29
|
+
let cuser = { _id: null, username: null, email: null };
|
|
30
|
+
const obj = (0, nuudel_utils_1.tokenObj)(token);
|
|
31
|
+
if ((obj === null || obj === void 0 ? void 0 : obj._id) &&
|
|
32
|
+
userId === obj._id &&
|
|
33
|
+
(obj === null || obj === void 0 ? void 0 : obj.exp) > Math.ceil(Date.now() / 1000)) {
|
|
34
|
+
cuser = {
|
|
35
|
+
_id: obj._id,
|
|
36
|
+
username: obj.username,
|
|
37
|
+
email: obj.email,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
const [state, dispatch] = (0, react_1.useReducer)(reducer_1.reducer, Object.assign(Object.assign({}, initialState), cuser));
|
|
23
41
|
const { data: fetchedUser, error } = (0, swr_1.default)(!token || !!(state === null || state === void 0 ? void 0 : state.type) ? null : Query_1.currentUserQuery, fetcher_1.fetcher, {
|
|
24
42
|
revalidateOnFocus: false,
|
|
25
43
|
revalidateIfStale: false,
|
|
@@ -31,6 +49,10 @@ const withUser = (WrappedComponent) => (props) => {
|
|
|
31
49
|
errorRetryCount: 1,
|
|
32
50
|
shouldRetryOnError: false,
|
|
33
51
|
});
|
|
52
|
+
if (token && error && ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('not logged'))) {
|
|
53
|
+
const redir = getRedirectTo();
|
|
54
|
+
router_1.default.replace(`/admin/login?r=${redir.pathname + encodeURIComponent(redir.search)}`, '/admin/login', { shallow: true });
|
|
55
|
+
}
|
|
34
56
|
(0, react_1.useEffect)(() => {
|
|
35
57
|
var _a;
|
|
36
58
|
if ((_a = fetchedUser === null || fetchedUser === void 0 ? void 0 : fetchedUser.data) === null || _a === void 0 ? void 0 : _a.currentUser) {
|
|
@@ -43,4 +65,4 @@ exports.withUser = withUser;
|
|
|
43
65
|
const useAuth = () => (0, react_1.useContext)(exports.UserContext);
|
|
44
66
|
exports.useAuth = useAuth;
|
|
45
67
|
exports.default = exports.withUser;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFVzZXIvaW5kZXgudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQSxpQ0FNZTtBQUNmLG9EQUFpRDtBQUNqRCx3Q0FBcUM7QUFDckMsb0RBQWlEO0FBRWpELG1DQUEyQztBQUMzQywrQ0FBNkQ7QUFDN0QsOENBQXlCO0FBRXpCLHlEQUFpQztBQUNqQyxTQUFTLGFBQWE7SUFDcEIsSUFBSSxPQUFPLE1BQU0sS0FBSyxXQUFXLEtBQUksTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLFFBQVEsQ0FBQSxFQUFFO1FBQ3JELE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQztLQUN4QjtJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUdELElBQUksWUFBWSxHQUFRLEVBQUUsQ0FBQztBQUdkLFFBQUEsV0FBVyxHQUFHLElBQUEscUJBQWEsRUFBQyxZQUFZLENBQUMsQ0FBQztBQUN2RCxtQkFBVyxDQUFDLFdBQVcsR0FBRyxhQUFhLENBQUM7QUFFakMsTUFBTSxRQUFRLEdBQ25CLENBQUMsZ0JBQXFDLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7O0lBQ3hELElBQUksS0FBSyxHQUFHLE9BQUUsQ0FBQyxPQUFPLENBQUMseUJBQVUsQ0FBQyxDQUFDO0lBQ25DLE1BQU0sTUFBTSxHQUFHLE9BQUUsQ0FBQyxPQUFPLENBQUMsc0JBQU8sQ0FBQyxDQUFDO0lBQ25DLElBQUksS0FBSyxHQUFRLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUM1RCxNQUFNLEdBQUcsR0FBRyxJQUFBLHVCQUFRLEVBQUMsS0FBSyxDQUFDLENBQUM7SUFDNUIsSUFDRSxDQUFBLEdBQUcsYUFBSCxHQUFHLHVCQUFILEdBQUcsQ0FBRSxHQUFH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
|
|
@@ -55,7 +55,7 @@ const DialogBasic = ({ children, ...props }) => {
|
|
|
55
55
|
else
|
|
56
56
|
didMountRef.current = true;
|
|
57
57
|
}, [props.open]);
|
|
58
|
-
return (_jsx("div", { children: _jsxs(Dialog, { open: open, onClose: handleClose, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-content", maxWidth: props.maxWidth, fullScreen: props.fullScreen, children: [_jsxs(DialogTitle, { id: "alert-dialog-title", className: classes.title, children: [props.title, _jsx(IconButton, { "aria-label": "close", className: classes.closeButton, onClick: handleClose, children: _jsx(CloseIcon, {}, void 0) }, void 0)] }, void 0), _jsx(DialogContent, { id: "alert-dialog-content", className: classes.dialogContent, children: _jsx("div", { className: classes.content, children: children }, void 0) }, void 0), !!props.onSubmit && (_jsx(DialogActions, { children: _jsx(Button, { onClick: props.onSubmit, color: "primary", children: t('Done') }, void 0) }, void 0))] }, void 0) }, void 0));
|
|
58
|
+
return (_jsx("div", { children: _jsxs(Dialog, { open: open, onClose: handleClose, "aria-labelledby": "alert-dialog-title", "aria-describedby": "alert-dialog-content", maxWidth: props.maxWidth, fullWidth: props.fullWidth, fullScreen: props.fullScreen, children: [_jsxs(DialogTitle, { id: "alert-dialog-title", className: classes.title, children: [props.title, _jsx(IconButton, { "aria-label": "close", className: classes.closeButton, onClick: handleClose, children: _jsx(CloseIcon, {}, void 0) }, void 0)] }, void 0), _jsx(DialogContent, { id: "alert-dialog-content", className: classes.dialogContent, children: _jsx("div", { className: classes.content, children: children }, void 0) }, void 0), !!props.onSubmit && (_jsx(DialogActions, { children: _jsx(Button, { onClick: props.onSubmit, color: "primary", children: t('Done') }, void 0) }, void 0))] }, void 0) }, void 0));
|
|
59
59
|
};
|
|
60
60
|
export default DialogBasic;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvRGlhbG9nL2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxLQUFLLEVBQUUsRUFBcUIsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLE9BQU8sQ0FBQztBQUNwRSxPQUFPLEVBQ0wsTUFBTSxFQUVOLGFBQWEsRUFDYixhQUFhLEVBQ2IsV0FBVyxFQUNYLFVBQVUsRUFDVixZQUFZLEdBRWIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBQzdCLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNuQyxPQUFPLFVBQVUsTUFBTSw4QkFBOEIsQ0FBQztBQUN0RCxPQUFPLFNBQVMsTUFBTSwwQkFBMEIsQ0FBQztBQUVqRCxNQUFNLFNBQVMsR0FBRyxVQUFVLENBQUMsQ0FBQyxLQUFZLEVBQUUsRUFBRSxDQUM1QyxZQUFZLENBQUM7SUFDWCxJQUFJLEVBQUU7UUFDSixNQUFNLEVBQUUsQ0FBQztRQUNULE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztLQUMxQjtJQUNELFdBQVcsRUFBRTtRQUNYLFFBQVEsRUFBRSxVQUFVO1FBQ3BCLEtBQUssRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUN2QixHQUFHLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7S0FFdEI7SUFDRCxPQUFPLEVBQUU7UUFDUCxPQUFPLEVBQUUsTUFBTTtRQUNmLFNBQVMsRUFBRSxNQUFNO1FBQ2pCLGNBQWMsRUFBRSxRQUFRO0tBQ3pCO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsU0FBUyxFQUNQLHVHQUF1RztRQUN6RyxlQUFlLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSTtRQUMz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
|
|
@@ -4,20 +4,35 @@ import { reducer } from '../withContext/reducer';
|
|
|
4
4
|
import { UI } from '../../common/UI';
|
|
5
5
|
import { fetcher } from '../../services/fetcher';
|
|
6
6
|
import { currentUserQuery } from './Query';
|
|
7
|
-
import {
|
|
7
|
+
import { USER_TOKEN, tokenObj, USER_ID } from 'nuudel-utils';
|
|
8
8
|
import useSWR from 'swr';
|
|
9
|
+
import Router from 'next/router';
|
|
10
|
+
function getRedirectTo() {
|
|
11
|
+
if (typeof window !== 'undefined' && window?.location) {
|
|
12
|
+
return window.location;
|
|
13
|
+
}
|
|
14
|
+
return {};
|
|
15
|
+
}
|
|
9
16
|
var initialState = {};
|
|
10
17
|
export const UserContext = createContext(initialState);
|
|
11
18
|
UserContext.displayName = 'userContext';
|
|
12
19
|
export const withUser = (WrappedComponent) => (props) => {
|
|
13
|
-
|
|
20
|
+
let token = UI.getItem(USER_TOKEN);
|
|
14
21
|
const userId = UI.getItem(USER_ID);
|
|
15
|
-
|
|
22
|
+
let cuser = { _id: null, username: null, email: null };
|
|
23
|
+
const obj = tokenObj(token);
|
|
24
|
+
if (obj?._id &&
|
|
25
|
+
userId === obj._id &&
|
|
26
|
+
obj?.exp > Math.ceil(Date.now() / 1000)) {
|
|
27
|
+
cuser = {
|
|
28
|
+
_id: obj._id,
|
|
29
|
+
username: obj.username,
|
|
30
|
+
email: obj.email,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
16
33
|
const [state, dispatch] = useReducer(reducer, {
|
|
17
34
|
...initialState,
|
|
18
|
-
|
|
19
|
-
email: username?.includes('@') ? username : null,
|
|
20
|
-
username: !username?.includes('@') ? username : null,
|
|
35
|
+
...cuser,
|
|
21
36
|
});
|
|
22
37
|
const { data: fetchedUser, error } = useSWR(!token || !!state?.type ? null : currentUserQuery, fetcher, {
|
|
23
38
|
revalidateOnFocus: false,
|
|
@@ -30,6 +45,10 @@ export const withUser = (WrappedComponent) => (props) => {
|
|
|
30
45
|
errorRetryCount: 1,
|
|
31
46
|
shouldRetryOnError: false,
|
|
32
47
|
});
|
|
48
|
+
if (token && error && error.message?.includes('not logged')) {
|
|
49
|
+
const redir = getRedirectTo();
|
|
50
|
+
Router.replace(`/admin/login?r=${redir.pathname + encodeURIComponent(redir.search)}`, '/admin/login', { shallow: true });
|
|
51
|
+
}
|
|
33
52
|
useEffect(() => {
|
|
34
53
|
if (fetchedUser?.data?.currentUser) {
|
|
35
54
|
dispatch(fetchedUser.data.currentUser);
|
|
@@ -39,4 +58,4 @@ export const withUser = (WrappedComponent) => (props) => {
|
|
|
39
58
|
};
|
|
40
59
|
export const useAuth = () => useContext(UserContext);
|
|
41
60
|
export default withUser;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFVzZXIvaW5kZXgudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUNWLGFBQWEsRUFFYixVQUFVLEVBQ1YsU0FBUyxHQUNWLE1BQU0sT0FBTyxDQUFDO0FBQ2YsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ2pELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNyQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzNDLE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUM3RCxPQUFPLE1BQU0sTUFBTSxLQUFLLENBQUM7QUFFekIsT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ2pDLFNBQVMsYUFBYTtJQUNwQixJQUFJLE9BQU8sTUFBTSxLQUFLLFdBQVcsSUFBSSxNQUFNLEVBQUUsUUFBUSxFQUFFO1FBQ3JELE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQztLQUN4QjtJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUdELElBQUksWUFBWSxHQUFRLEVBQUUsQ0FBQztBQUczQixNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsYUFBYSxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ3ZELFdBQVcsQ0FBQyxXQUFXLEdBQUcsYUFBYSxDQUFDO0FBRXhDLE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FDbkIsQ0FBQyxnQkFBcUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRTtJQUN4RCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ25DLE1B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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nuudel-core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.138",
|
|
4
4
|
"description": "Web components for react with material UI",
|
|
5
5
|
"main": "build/main/index.js",
|
|
6
6
|
"typings": "build/main/index.d.ts",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"i18next": "^21.6.6",
|
|
67
67
|
"material-ui-chip-input": "^1.1.0",
|
|
68
68
|
"next-with-apollo": "^5.2.1",
|
|
69
|
-
"nuudel-utils": "^0.1.
|
|
69
|
+
"nuudel-utils": "^0.1.58",
|
|
70
70
|
"pica": "^9.0.1",
|
|
71
71
|
"react-colorful": "^5.6.1",
|
|
72
72
|
"react-device-detect": "^2.1.2",
|