Skip to content

Commit

Permalink
Update dependencies to latest versions (#233)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
rleojoseph authored Dec 19, 2022
1 parent a0dcc9c commit 9d00bb9
Show file tree
Hide file tree
Showing 25 changed files with 89 additions and 79 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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: .
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Empty file removed Icon
Empty file.
Binary file added icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions js-miniapp-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
22 changes: 11 additions & 11 deletions js-miniapp-sample/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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'",
Expand All @@ -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": {
Expand Down
3 changes: 2 additions & 1 deletion js-miniapp-sample/src/pages/ads.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useReducer, useState } from 'react';
import MiniApp from 'js-miniapp-sdk';

import {
Button,
Expand All @@ -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) => ({
Expand Down
4 changes: 2 additions & 2 deletions js-miniapp-sample/src/pages/app-close-alert.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState, useReducer } from 'react';

import {
Button,
Container,
Expand All @@ -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) => ({
Expand Down
1 change: 1 addition & 0 deletions js-miniapp-sample/src/pages/camera.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useRef, useState } from 'react';

import { Card, Grid, Button, makeStyles } from '@material-ui/core';

const useStyles = makeStyles((theme) => ({
Expand Down
2 changes: 1 addition & 1 deletion js-miniapp-sample/src/pages/event-listener.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useState } from 'react';
import { MiniAppEvents, MiniAppKeyboardEvents } from 'js-miniapp-sdk';

import {
Button,
Expand All @@ -8,6 +7,7 @@ import {
CardActions,
makeStyles,
} from '@material-ui/core';
import { MiniAppEvents, MiniAppKeyboardEvents } from 'js-miniapp-sdk';

import GreyCard from '../components/GreyCard';

Expand Down
2 changes: 1 addition & 1 deletion js-miniapp-sample/src/pages/inapp-purchases.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useState } from 'react';
import MiniApp from 'js-miniapp-sdk';

import {
Button,
Expand All @@ -8,6 +7,7 @@ import {
CardActions,
makeStyles,
} from '@material-ui/core';
import MiniApp from 'js-miniapp-sdk';

import GreyCard from '../components/GreyCard';

Expand Down
5 changes: 3 additions & 2 deletions js-miniapp-sample/src/pages/landing.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 2 additions & 1 deletion js-miniapp-sample/src/pages/media.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
21 changes: 13 additions & 8 deletions js-miniapp-sample/src/pages/secure-storage.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React, { useReducer, useState, Fragment } from 'react';

import {
Button,
CircularProgress,
Expand All @@ -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,
Expand Down Expand Up @@ -614,13 +616,16 @@ function SecureStorageComponent(props: SecureStorageProps) {
{state.error}
</Typography>
)}
{!state.isLoading && !state.isError && state.isSuccess && props.size && (
<Typography variant="body1" className={classes.red}>
<div>Maximum Size: {props.size.max}</div>
<div>Used Space: {props.size.used}</div>
<div>Available: {props.size.max - props.size.used}</div>
</Typography>
)}
{!state.isLoading &&
!state.isError &&
state.isSuccess &&
props.size && (
<Typography variant="body1" className={classes.red}>
<div>Maximum Size: {props.size.max}</div>
<div>Used Space: {props.size.used}</div>
<div>Available: {props.size.max - props.size.used}</div>
</Typography>
)}
{!state.isLoading && !state.isError && state.isStorageCleaned && (
<Typography variant="body1" className={classes.red}>
Storage Cleared Successfully
Expand Down
2 changes: 1 addition & 1 deletion js-miniapp-sample/src/pages/share.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import MiniApp from 'js-miniapp-sdk';

import {
Button,
Expand All @@ -8,6 +7,7 @@ import {
CardActions,
makeStyles,
} from '@material-ui/core';
import MiniApp from 'js-miniapp-sdk';

import GreyCard from '../components/GreyCard';

Expand Down
4 changes: 2 additions & 2 deletions js-miniapp-sample/src/pages/universal-bridge.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React, { useState } from 'react';
import MiniApp from 'js-miniapp-sdk';
import { HostAppEvents } from 'js-miniapp-sdk';

import {
Button,
Expand All @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions js-miniapp-sample/src/pages/uri-schemes.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const UriSchemes = () => {
);
const [externalUrl, setExternalUrl] = useState('');

function validateParams(params) {
function validateParams(params: string) {
return params.startsWith('?') && params.indexOf('=') >= 0;
}

Expand All @@ -95,7 +95,7 @@ const UriSchemes = () => {
onOpenUrl(url);
}

function onOpenUrl(url) {
function onOpenUrl(url: URL) {
window.location.href = url;
}

Expand Down
2 changes: 1 addition & 1 deletion js-miniapp-sample/src/pages/uuid-sdk.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
22 changes: 11 additions & 11 deletions js-miniapp-sample/src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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 = [
{
Expand Down
Loading

0 comments on commit 9d00bb9

Please sign in to comment.