From 9d00bb95e4fd3c903bf698ac81ef50aee363c3ed Mon Sep 17 00:00:00 2001 From: Leo Joseph <58416454+rleojoseph@users.noreply.github.com> Date: Mon, 19 Dec 2022 15:48:47 +0900 Subject: [PATCH] Update dependencies to latest versions (#233) * JS Sample app dependencies * Removed unused file * SDK & Bridge dependencies * Revert yarn.lock * Update node for circleci * Node image update * Prettier fix * Prettier * Typedoc fix * Prettier * Downgrade few router versions * Revert * Downgrade typedoc --- .circleci/config.yml | 14 +++++------ "Icon\r" | 0 icon.png | Bin 0 -> 6223 bytes js-miniapp-bridge/package.json | 8 +++---- js-miniapp-sample/package.json | 22 +++++++++--------- js-miniapp-sample/src/pages/ads.js | 3 ++- .../src/pages/app-close-alert.js | 4 ++-- js-miniapp-sample/src/pages/camera.js | 1 + js-miniapp-sample/src/pages/event-listener.js | 2 +- .../src/pages/inapp-purchases.js | 2 +- js-miniapp-sample/src/pages/landing.js | 5 ++-- js-miniapp-sample/src/pages/media.js | 3 ++- js-miniapp-sample/src/pages/secure-storage.js | 21 ++++++++++------- js-miniapp-sample/src/pages/share.js | 2 +- .../src/pages/universal-bridge.js | 4 ++-- js-miniapp-sample/src/pages/uri-schemes.js | 4 ++-- js-miniapp-sample/src/pages/uuid-sdk.js | 2 +- js-miniapp-sample/src/routes.js | 22 +++++++++--------- .../src/services/landing/reducers.js | 3 ++- .../src/services/message/actions.js | 5 ++-- js-miniapp-sample/src/services/reducers.js | 10 ++++---- .../src/services/secure-storage/actions.js | 4 ++-- .../src/services/secure-storage/reducers.js | 15 ++++++------ .../src/services/user/reducers.js | 2 +- js-miniapp-sdk/package.json | 10 ++++---- 25 files changed, 89 insertions(+), 79 deletions(-) delete mode 100644 "Icon\r" create mode 100644 icon.png diff --git a/.circleci/config.yml b/.circleci/config.yml index 693f39a57..761ddf89e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: build-bridge: working_directory: ~/mini-js-bridge docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - restore_cache: @@ -64,7 +64,7 @@ jobs: export-bridge: working_directory: ~/mini-js-bridge docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - attach_workspace: @@ -77,7 +77,7 @@ jobs: build-sdk: working_directory: ~/mini-js-sdk docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - restore_cache: @@ -131,7 +131,7 @@ jobs: publish-sdk: working_directory: ~/mini-js-sdk docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - attach_workspace: @@ -173,7 +173,7 @@ jobs: build-sample: # builds & tests the sample app against latest sdk build. working_directory: ~/js-miniapp-sample docker: - - image: circleci/node:12.16.2 + - image: circleci/node:14.17.0 # TODO get the sdk build from saved workspace environment: PUBLIC_URL: . @@ -210,7 +210,7 @@ jobs: deploy-sample: working_directory: ~/js-miniapp-sample docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - attach_workspace: @@ -236,7 +236,7 @@ jobs: upload-coverage: working_directory: ~/js-miniapp docker: - - image: circleci/node:12.0.0 + - image: circleci/node:14.17.0 steps: - checkout - attach_workspace: diff --git "a/Icon\r" "b/Icon\r" deleted file mode 100644 index e69de29bb..000000000 diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..45b6a1b6b33a9f4fd84a80766ab56098e4203877 GIT binary patch literal 6223 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 Dp1SI* literal 0 HcmV?d00001 diff --git a/js-miniapp-bridge/package.json b/js-miniapp-bridge/package.json index 5b8315176..b23a1ecef 100644 --- a/js-miniapp-bridge/package.json +++ b/js-miniapp-bridge/package.json @@ -4,12 +4,12 @@ "description": "Mini App JavaScript Bridge", "dependencies": {}, "devDependencies": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/chai": "^4.2.11", "@types/mocha": "^7.0.2", "@types/node": "^10.0.3", "@types/sinon": "^9.0.0", - "browserify": "^16.5.1", + "browserify": "^17.0.0", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "gts": "^1.1.2", @@ -18,10 +18,10 @@ "nyc": "^15.0.0", "sinon": "^9.0.1", "sinon-chai": "^3.5.0", - "source-map-support": "^0.5.16", + "source-map-support": "^0.5.21", "ts-node": "^8.8.1", "tslint": "^6.1.0", - "typescript": "^3.8.3" + "typescript": "^4.9.4" }, "scripts": { "lint": "gts check", diff --git a/js-miniapp-sample/package.json b/js-miniapp-sample/package.json index 0536005e7..de6118ce1 100644 --- a/js-miniapp-sample/package.json +++ b/js-miniapp-sample/package.json @@ -3,13 +3,13 @@ "version": "1.15.0", "description": "Mini App Sample for JavaScript SDK", "dependencies": { - "@brightcove/react-player-loader": "^1.4.1", - "@emotion/react": "^11.9.0", - "@emotion/styled": "^11.8.1", + "@brightcove/react-player-loader": "^1.4.2", + "@emotion/react": "^11.10.5", + "@emotion/styled": "^11.10.5", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", - "@mui/material": "^5.8.1", + "@mui/material": "^5.10.17", "bowser": "^2.11.0", "react": "^18.0.0", "react-copy-to-clipboard": "^5.0.4", @@ -19,7 +19,7 @@ "react-scripts": "3.4.1", "redux": "^4.1.2", "redux-thunk": "^2.4.1", - "semver": "^7.3.5" + "semver": "^7.3.8" }, "scripts": { "format": "prettier --config ./prettier.config.js --write 'src/**/*.js'", @@ -41,14 +41,14 @@ "iOS>=11" ], "devDependencies": { - "eslint": "^6.8.0", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-react": "^7.19.0", + "eslint": "^8.29.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-react": "^7.31.11", "flow-bin": "^0.121.0", "flow-typed": "^3.7.0", - "husky": "^4.2.3", - "lint-staged": "^10.1.1", - "prettier": "^2.6.2" + "husky": "^8.0.2", + "lint-staged": "^13.1.0", + "prettier": "^2.8.1" }, "husky": { "hooks": { diff --git a/js-miniapp-sample/src/pages/ads.js b/js-miniapp-sample/src/pages/ads.js index bcdc927fe..8a397ec3d 100644 --- a/js-miniapp-sample/src/pages/ads.js +++ b/js-miniapp-sample/src/pages/ads.js @@ -1,5 +1,4 @@ import React, { useReducer, useState } from 'react'; -import MiniApp from 'js-miniapp-sdk'; import { Button, @@ -11,6 +10,8 @@ import { Typography, makeStyles, } from '@material-ui/core'; +import MiniApp from 'js-miniapp-sdk'; + import GreyCard from '../components/GreyCard'; const useStyles = makeStyles((theme) => ({ diff --git a/js-miniapp-sample/src/pages/app-close-alert.js b/js-miniapp-sample/src/pages/app-close-alert.js index 5c84050e0..b191b2801 100644 --- a/js-miniapp-sample/src/pages/app-close-alert.js +++ b/js-miniapp-sample/src/pages/app-close-alert.js @@ -1,4 +1,5 @@ import React, { useState, useReducer } from 'react'; + import { Button, Container, @@ -7,10 +8,9 @@ import { makeStyles, Typography, } from '@material-ui/core'; - +import { red } from '@material-ui/core/colors'; import Checkbox from '@mui/material/Checkbox'; import FormControlLabel from '@mui/material/FormControlLabel'; -import { red } from '@material-ui/core/colors'; import MiniApp, { CloseAlertInfo } from 'js-miniapp-sdk'; const useStyles = makeStyles((theme) => ({ diff --git a/js-miniapp-sample/src/pages/camera.js b/js-miniapp-sample/src/pages/camera.js index 1a00a6591..47378a855 100644 --- a/js-miniapp-sample/src/pages/camera.js +++ b/js-miniapp-sample/src/pages/camera.js @@ -1,4 +1,5 @@ import React, { useRef, useState } from 'react'; + import { Card, Grid, Button, makeStyles } from '@material-ui/core'; const useStyles = makeStyles((theme) => ({ diff --git a/js-miniapp-sample/src/pages/event-listener.js b/js-miniapp-sample/src/pages/event-listener.js index eaaf34b04..411b99e97 100644 --- a/js-miniapp-sample/src/pages/event-listener.js +++ b/js-miniapp-sample/src/pages/event-listener.js @@ -1,5 +1,4 @@ import React, { useState } from 'react'; -import { MiniAppEvents, MiniAppKeyboardEvents } from 'js-miniapp-sdk'; import { Button, @@ -8,6 +7,7 @@ import { CardActions, makeStyles, } from '@material-ui/core'; +import { MiniAppEvents, MiniAppKeyboardEvents } from 'js-miniapp-sdk'; import GreyCard from '../components/GreyCard'; diff --git a/js-miniapp-sample/src/pages/inapp-purchases.js b/js-miniapp-sample/src/pages/inapp-purchases.js index 370451c59..1a3b1e823 100644 --- a/js-miniapp-sample/src/pages/inapp-purchases.js +++ b/js-miniapp-sample/src/pages/inapp-purchases.js @@ -1,5 +1,4 @@ import React, { useState } from 'react'; -import MiniApp from 'js-miniapp-sdk'; import { Button, @@ -8,6 +7,7 @@ import { CardActions, makeStyles, } from '@material-ui/core'; +import MiniApp from 'js-miniapp-sdk'; import GreyCard from '../components/GreyCard'; diff --git a/js-miniapp-sample/src/pages/landing.js b/js-miniapp-sample/src/pages/landing.js index aceca0a1b..bdcf8aa64 100644 --- a/js-miniapp-sample/src/pages/landing.js +++ b/js-miniapp-sample/src/pages/landing.js @@ -1,13 +1,14 @@ import React, { useEffect } from 'react'; + import { CardContent, makeStyles } from '@material-ui/core'; +import { connect } from 'react-redux'; + import GreyCard from '../components/GreyCard'; import { setHostEnvironmentInfo, onSecureStorageReady, } from '../services/landing/actions'; -import { connect } from 'react-redux'; - type LandingProps = { platform: ?string, platformVersion: ?string, diff --git a/js-miniapp-sample/src/pages/media.js b/js-miniapp-sample/src/pages/media.js index bf73da7f8..19fa09025 100644 --- a/js-miniapp-sample/src/pages/media.js +++ b/js-miniapp-sample/src/pages/media.js @@ -1,12 +1,13 @@ // @flow import React, { useState } from 'react'; + +import ReactPlayerLoader from '@brightcove/react-player-loader'; import { Button, CardContent, CardActions, makeStyles, } from '@material-ui/core'; -import ReactPlayerLoader from '@brightcove/react-player-loader'; import MiniApp from 'js-miniapp-sdk'; import { ScreenOrientation } from 'js-miniapp-sdk'; diff --git a/js-miniapp-sample/src/pages/secure-storage.js b/js-miniapp-sample/src/pages/secure-storage.js index 044be5c65..b508c0a10 100644 --- a/js-miniapp-sample/src/pages/secure-storage.js +++ b/js-miniapp-sample/src/pages/secure-storage.js @@ -1,3 +1,5 @@ +import React, { useReducer, useState, Fragment } from 'react'; + import { Button, CircularProgress, @@ -14,8 +16,8 @@ import TabList from '@material-ui/lab/TabList'; import TabPanel from '@material-ui/lab/TabPanel'; import clsx from 'clsx'; import { MiniAppError, MiniAppSecureStorageSize } from 'js-miniapp-sdk'; -import React, { useReducer, useState, Fragment } from 'react'; import { connect } from 'react-redux'; + import { clear, getItem, @@ -614,13 +616,16 @@ function SecureStorageComponent(props: SecureStorageProps) { {state.error} )} - {!state.isLoading && !state.isError && state.isSuccess && props.size && ( - -
Maximum Size: {props.size.max}
-
Used Space: {props.size.used}
-
Available: {props.size.max - props.size.used}
- - )} + {!state.isLoading && + !state.isError && + state.isSuccess && + props.size && ( + +
Maximum Size: {props.size.max}
+
Used Space: {props.size.used}
+
Available: {props.size.max - props.size.used}
+ + )} {!state.isLoading && !state.isError && state.isStorageCleaned && ( Storage Cleared Successfully diff --git a/js-miniapp-sample/src/pages/share.js b/js-miniapp-sample/src/pages/share.js index 2838a31b5..6df87b81e 100644 --- a/js-miniapp-sample/src/pages/share.js +++ b/js-miniapp-sample/src/pages/share.js @@ -1,5 +1,4 @@ import React from 'react'; -import MiniApp from 'js-miniapp-sdk'; import { Button, @@ -8,6 +7,7 @@ import { CardActions, makeStyles, } from '@material-ui/core'; +import MiniApp from 'js-miniapp-sdk'; import GreyCard from '../components/GreyCard'; diff --git a/js-miniapp-sample/src/pages/universal-bridge.js b/js-miniapp-sample/src/pages/universal-bridge.js index b75531606..9328df737 100644 --- a/js-miniapp-sample/src/pages/universal-bridge.js +++ b/js-miniapp-sample/src/pages/universal-bridge.js @@ -1,6 +1,4 @@ import React, { useState } from 'react'; -import MiniApp from 'js-miniapp-sdk'; -import { HostAppEvents } from 'js-miniapp-sdk'; import { Button, @@ -9,6 +7,8 @@ import { CardActions, makeStyles, } from '@material-ui/core'; +import MiniApp from 'js-miniapp-sdk'; +import { HostAppEvents } from 'js-miniapp-sdk'; import GreyCard from '../components/GreyCard'; diff --git a/js-miniapp-sample/src/pages/uri-schemes.js b/js-miniapp-sample/src/pages/uri-schemes.js index c46994a62..2100d7e39 100644 --- a/js-miniapp-sample/src/pages/uri-schemes.js +++ b/js-miniapp-sample/src/pages/uri-schemes.js @@ -74,7 +74,7 @@ const UriSchemes = () => { ); const [externalUrl, setExternalUrl] = useState(''); - function validateParams(params) { + function validateParams(params: string) { return params.startsWith('?') && params.indexOf('=') >= 0; } @@ -95,7 +95,7 @@ const UriSchemes = () => { onOpenUrl(url); } - function onOpenUrl(url) { + function onOpenUrl(url: URL) { window.location.href = url; } diff --git a/js-miniapp-sample/src/pages/uuid-sdk.js b/js-miniapp-sample/src/pages/uuid-sdk.js index be23b3dba..b5a16b97c 100644 --- a/js-miniapp-sample/src/pages/uuid-sdk.js +++ b/js-miniapp-sample/src/pages/uuid-sdk.js @@ -7,11 +7,11 @@ import { makeStyles, Snackbar, } from '@material-ui/core'; +import { CopyToClipboard } from 'react-copy-to-clipboard'; import { connect } from 'react-redux'; import GreyCard from '../components/GreyCard'; import { setMessagingUniqueId, setMauid } from '../services/uuid/actions'; -import { CopyToClipboard } from 'react-copy-to-clipboard'; const useStyles = makeStyles((theme) => ({ card: { diff --git a/js-miniapp-sample/src/routes.js b/js-miniapp-sample/src/routes.js index 1ba42273d..bd0c6040b 100644 --- a/js-miniapp-sample/src/routes.js +++ b/js-miniapp-sample/src/routes.js @@ -3,6 +3,7 @@ import React from 'react'; import AttachFileIcon from '@material-ui/icons/AttachFile'; import ChatIcon from '@material-ui/icons/Chat'; import CloudDownloadIcon from '@material-ui/icons/CloudDownload'; +import EventIcon from '@material-ui/icons/CompareArrows'; import FingerprintIcon from '@material-ui/icons/Fingerprint'; import GifIcon from '@material-ui/icons/Gif'; import HomeIcon from '@material-ui/icons/Home'; @@ -11,38 +12,37 @@ import LinkIcon from '@material-ui/icons/Link'; import AdsIcon from '@material-ui/icons/LocalPlay'; import LocationOnIcon from '@material-ui/icons/LocationOn'; import MediaIcon from '@material-ui/icons/MusicVideo'; +import NotificationImportantOutlinedIcon from '@material-ui/icons/NotificationImportantOutlined'; import PersonIcon from '@material-ui/icons/Person'; -import ShareIcon from '@material-ui/icons/Share'; -import StorageIcon from '@material-ui/icons/Storage'; -import VpnKeyIcon from '@material-ui/icons/VpnKey'; -import EventIcon from '@material-ui/icons/CompareArrows'; import PhotoCamera from '@material-ui/icons/PhotoCamera'; import SecurityIcon from '@material-ui/icons/Security'; -import NotificationImportantOutlinedIcon from '@material-ui/icons/NotificationImportantOutlined'; -import ShoppingCartIcon from '@material-ui/icons/ShoppingCart'; import SendIcon from '@material-ui/icons/SendSharp'; +import ShareIcon from '@material-ui/icons/Share'; +import ShoppingCartIcon from '@material-ui/icons/ShoppingCart'; +import StorageIcon from '@material-ui/icons/Storage'; +import VpnKeyIcon from '@material-ui/icons/VpnKey'; import Ads from './pages/ads'; +import { CloseConfirmAlert } from './pages/app-close-alert'; import AuthToken from './pages/auth-token'; import Camera from './pages/camera'; +import EventListener from './pages/event-listener'; import FileDownload from './pages/file-download'; import FileUploader from './pages/file-upload'; import GifPage from './pages/gifs'; +import Purchases from './pages/inapp-purchases'; import Landing from './pages/landing'; import LocalStorage from './pages/local-storage'; import Media from './pages/media'; import TalkToChatBot from './pages/message'; +import SecureStorageComponent from './pages/secure-storage'; import Share from './pages/share'; +import UniversalBridge from './pages/universal-bridge'; import UriSchemes from './pages/uri-schemes'; -import EventListener from './pages/event-listener'; import UserDetails from './pages/user-details'; import UuidFetcher from './pages/uuid-sdk'; import WebLocation from './pages/web-location'; import WindowActions from './pages/window-actions'; -import SecureStorageComponent from './pages/secure-storage'; -import { CloseConfirmAlert } from './pages/app-close-alert'; -import Purchases from './pages/inapp-purchases'; -import UniversalBridge from './pages/universal-bridge'; const homeItem = [ { diff --git a/js-miniapp-sample/src/services/landing/reducers.js b/js-miniapp-sample/src/services/landing/reducers.js index b97885ffc..e09108616 100644 --- a/js-miniapp-sample/src/services/landing/reducers.js +++ b/js-miniapp-sample/src/services/landing/reducers.js @@ -1,8 +1,9 @@ +import { HostEnvironmentInfo } from 'js-miniapp-sdk'; + import type { RequestHostInfoSuccessAction, OnStorageReadySuccessAction, } from './actions'; -import { HostEnvironmentInfo } from 'js-miniapp-sdk'; import { REQUEST_HOST_ENVIRONMENT_INFO_SUCCESS, ON_SECURE_STORAGE_READY_SUCCESS, diff --git a/js-miniapp-sample/src/services/message/actions.js b/js-miniapp-sample/src/services/message/actions.js index c37fd8491..fbe971dcc 100644 --- a/js-miniapp-sample/src/services/message/actions.js +++ b/js-miniapp-sample/src/services/message/actions.js @@ -1,11 +1,12 @@ -import { SET_MESSAGE_TYPES } from './types'; -import type { SetMessageTypeAction } from './types'; import MiniApp, { CustomPermissionStatus, CustomPermissionName, } from 'js-miniapp-sdk'; import { MessageToContact } from 'js-miniapp-sdk'; +import { SET_MESSAGE_TYPES } from './types'; +import type { SetMessageTypeAction } from './types'; + const getMessageTypeList = (): SetMessageTypeAction => { return { type: SET_MESSAGE_TYPES, diff --git a/js-miniapp-sample/src/services/reducers.js b/js-miniapp-sample/src/services/reducers.js index c780aa626..a30921048 100644 --- a/js-miniapp-sample/src/services/reducers.js +++ b/js-miniapp-sample/src/services/reducers.js @@ -1,16 +1,16 @@ import { combineReducers } from 'redux'; -import MessageReducer from './message/reducers'; +import { FileDownloadReducer } from './filedownload/reducers'; import HomeStateReducer from './home/reducers'; -import { grantedPermissionsReducer } from './permissions/reducers'; -import userReducer from './user/reducers'; -import { UUIDReducer } from './uuid/reducers'; import { HostEnvironmentInfoReducer, SecureStorageStatusReducer, } from './landing/reducers'; -import { FileDownloadReducer } from './filedownload/reducers'; +import MessageReducer from './message/reducers'; +import { grantedPermissionsReducer } from './permissions/reducers'; import storageReducer from './secure-storage/reducers'; +import userReducer from './user/reducers'; +import { UUIDReducer } from './uuid/reducers'; export default combineReducers({ message: MessageReducer, diff --git a/js-miniapp-sample/src/services/secure-storage/actions.js b/js-miniapp-sample/src/services/secure-storage/actions.js index a36f21471..389e15537 100644 --- a/js-miniapp-sample/src/services/secure-storage/actions.js +++ b/js-miniapp-sample/src/services/secure-storage/actions.js @@ -1,4 +1,6 @@ import MiniApp from 'js-miniapp-sdk'; +import { MiniAppSecureStorageSize } from 'js-miniapp-sdk'; + import { SET_SECURE_STORAGE_SUCCESS, SET_SECURE_STORAGE_FAILURE, @@ -12,8 +14,6 @@ import { GET_SIZE_SECURE_STORAGE_FAILURE, } from './types'; -import { MiniAppSecureStorageSize } from 'js-miniapp-sdk'; - type SetItemsSuccessAction = { type: string }; type GetItemSuccessAction = { type: string, item: string }; type RemoveItemsSuccessAction = { type: string }; diff --git a/js-miniapp-sample/src/services/secure-storage/reducers.js b/js-miniapp-sample/src/services/secure-storage/reducers.js index c9acc2dec..542ff742a 100644 --- a/js-miniapp-sample/src/services/secure-storage/reducers.js +++ b/js-miniapp-sample/src/services/secure-storage/reducers.js @@ -1,13 +1,5 @@ import { combineReducers } from 'redux'; -import { - CLEAR_SECURE_STORAGE_SUCCESS, - GET_SECURE_STORAGE_SUCCESS, - GET_SIZE_SECURE_STORAGE_SUCCESS, - REMOVE_ITEMS_STORAGE_SUCCESS, - SET_SECURE_STORAGE_SUCCESS, -} from './types'; - import type { SetItemsSuccessAction, GetItemSuccessAction, @@ -15,6 +7,13 @@ import type { SizeSuccessAction, ClearSuccessAction, } from './actions'; +import { + CLEAR_SECURE_STORAGE_SUCCESS, + GET_SECURE_STORAGE_SUCCESS, + GET_SIZE_SECURE_STORAGE_SUCCESS, + REMOVE_ITEMS_STORAGE_SUCCESS, + SET_SECURE_STORAGE_SUCCESS, +} from './types'; const defaultSetItems = null; const setItemsReducer = ( diff --git a/js-miniapp-sample/src/services/user/reducers.js b/js-miniapp-sample/src/services/user/reducers.js index 0f1a9d1b4..2c7242c24 100644 --- a/js-miniapp-sample/src/services/user/reducers.js +++ b/js-miniapp-sample/src/services/user/reducers.js @@ -1,5 +1,5 @@ -import { combineReducers } from 'redux'; import { Points } from 'js-miniapp-sdk'; +import { combineReducers } from 'redux'; import type { UserNameSuccessAction, diff --git a/js-miniapp-sdk/package.json b/js-miniapp-sdk/package.json index 4ed2c2100..779bf8d41 100644 --- a/js-miniapp-sdk/package.json +++ b/js-miniapp-sdk/package.json @@ -8,13 +8,13 @@ "types": "build/js-miniapp-sdk/src/index.d.ts", "dependencies": {}, "devDependencies": { - "@istanbuljs/nyc-config-typescript": "^1.0.1", + "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/chai": "^4.2.11", "@types/chai-as-promised": "^7.1.2", "@types/mocha": "^7.0.2", "@types/node": "^10.0.3", "@types/sinon": "^9.0.0", - "browserify": "^16.5.1", + "browserify": "^17.0.0", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "gts": "^1.1.2", @@ -24,12 +24,12 @@ "sinon": "^9.0.1", "sinon-chai": "^3.5.0", "source-map-support": "^0.5.16", - "tinyify": "3.0.0", + "tinyify": "4.0.0", "ts-node": "^8.8.1", - "tslint": "^6.1.0", + "tslint": "^6.1.3", "typedoc": "^0.19.2", "typedoc-plugin-markdown": "^3.0.11", - "typescript": "^3.8.3" + "typescript": "^4.9.4" }, "scripts": { "lint": "gts check",