diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 3236c2e..d92f01d 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Use Node.js 14.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - name: Set package.json version uses: menduz/oddish-action@master with: diff --git a/.github/workflows/set-rollouts-manual.yaml b/.github/workflows/set-rollouts-manual.yaml index 135a1cc..9eba597 100644 --- a/.github/workflows/set-rollouts-manual.yaml +++ b/.github/workflows/set-rollouts-manual.yaml @@ -19,7 +19,7 @@ on: jobs: set-manual-rollout: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: hmarr/debug-action@v2 - name: Set Rollout diff --git a/.github/workflows/set-rollouts.yaml b/.github/workflows/set-rollouts.yaml index 770ccf9..42a8ebf 100644 --- a/.github/workflows/set-rollouts.yaml +++ b/.github/workflows/set-rollouts.yaml @@ -5,7 +5,7 @@ on: [deployment_status] jobs: set-rollout: if: ${{ github.event.deployment.task == 'upload-to-cdn' && github.event.deployment_status.state == 'success' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: hmarr/debug-action@v2 diff --git a/config-overrides.js b/config-overrides.js new file mode 100644 index 0000000..48a2fc0 --- /dev/null +++ b/config-overrides.js @@ -0,0 +1,10 @@ +const { override, babelInclude } = require('customize-cra') +const path = require('path') + +module.exports = override([ + babelInclude([ + path.join(__dirname, 'src'), + path.join(__dirname, 'node_modules/@metamask/utils/node_modules/superstruct'), + path.join(__dirname, 'node_modules/@walletconnect'), + ]) +]) diff --git a/package-lock.json b/package-lock.json index ac0fd87..279b555 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,6 +39,8 @@ "@types/react-dom": "^17.0.11", "@types/react-router-dom": "^5.3.3", "@types/redux-logger": "^3.0.9", + "customize-cra": "^1.0.0", + "react-app-rewired": "^2.2.1", "typescript": "^4.4.4" } }, @@ -9771,6 +9773,15 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, + "node_modules/customize-cra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/customize-cra/-/customize-cra-1.0.0.tgz", + "integrity": "sha512-DbtaLuy59224U+xCiukkxSq8clq++MOtJ1Et7LED1fLszWe88EoblEYFBJ895sB1mC6B4uu3xPT/IjClELhMbA==", + "dev": true, + "dependencies": { + "lodash.flow": "^3.5.0" + } + }, "node_modules/cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -18948,6 +18959,12 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, + "node_modules/lodash.flow": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz", + "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==", + "dev": true + }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -22870,6 +22887,30 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/react-app-rewired": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz", + "integrity": "sha512-uFQWTErXeLDrMzOJHKp0h8P1z0LV9HzPGsJ6adOtGlA/B9WfT6Shh4j2tLTTGlXOfiVx6w6iWpp7SOC5pvk+gA==", + "dev": true, + "dependencies": { + "semver": "^5.6.0" + }, + "bin": { + "react-app-rewired": "bin/index.js" + }, + "peerDependencies": { + "react-scripts": ">=2.1.3" + } + }, + "node_modules/react-app-rewired/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/react-dev-utils": { "version": "11.0.4", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz", @@ -37570,6 +37611,15 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, + "customize-cra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/customize-cra/-/customize-cra-1.0.0.tgz", + "integrity": "sha512-DbtaLuy59224U+xCiukkxSq8clq++MOtJ1Et7LED1fLszWe88EoblEYFBJ895sB1mC6B4uu3xPT/IjClELhMbA==", + "dev": true, + "requires": { + "lodash.flow": "^3.5.0" + } + }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -44734,6 +44784,12 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" }, + "lodash.flow": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz", + "integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==", + "dev": true + }, "lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", @@ -47938,6 +47994,23 @@ } } }, + "react-app-rewired": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.2.1.tgz", + "integrity": "sha512-uFQWTErXeLDrMzOJHKp0h8P1z0LV9HzPGsJ6adOtGlA/B9WfT6Shh4j2tLTTGlXOfiVx6w6iWpp7SOC5pvk+gA==", + "dev": true, + "requires": { + "semver": "^5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true + } + } + }, "react-dev-utils": { "version": "11.0.4", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz", diff --git a/package.json b/package.json index c2e829b..d92d50f 100644 --- a/package.json +++ b/package.json @@ -33,12 +33,14 @@ "@types/react-dom": "^17.0.11", "@types/react-router-dom": "^5.3.3", "@types/redux-logger": "^3.0.9", + "customize-cra": "^1.0.0", + "react-app-rewired": "^2.2.1", "typescript": "^4.4.4" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", + "start": "react-app-rewired start", + "build": "react-app-rewired build", + "test": "react-app-rewired test", "eject": "react-scripts eject", "postinstall": "node ./scripts/prebuild.js" }, @@ -63,4 +65,4 @@ ] }, "homepage": "" -} +} \ No newline at end of file