Skip to content

Commit

Permalink
Bump node to v16 and LavaMoat to the latest version (#661)
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobar79 authored Jun 15, 2023
1 parent 18608e8 commit 3e57f6d
Show file tree
Hide file tree
Showing 10 changed files with 662 additions and 2,717 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Install deps via Yarn
run: yarn setup
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v3
# with:
# node-version: "14.20.1"
# node-version: "16.20.0"
# cache: 'yarn'
# - name: Download deps cache artifacts
# uses: actions/download-artifact@v3
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
token: ${{ secrets.REPO_TOKEN }}
- uses: actions/setup-node@v2
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Install deps via Yarn
run: yarn setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
token: ${{ secrets.REPO_TOKEN }}
- uses: actions/setup-node@v2
with:
node-version: "14.20.1"
node-version: "16.20.0"
cache: 'yarn'
- name: Install deps via Yarn
run: yarn setup
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14.20.1
v16.20.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

### 1. Set up Node

Use node v14 or if you use nvm follow the instructions below
Use node v16 or if you use nvm follow the instructions below

```bash
nvm install
Expand Down
68 changes: 38 additions & 30 deletions lavamoat/build-webpack/policy.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"resources": {
"@testing-library/react>@testing-library/dom>@babel/code-frame": {
"globals": {
"console.warn": true,
"process.emitWarning": true
},
"packages": {
"lavamoat>@babel/highlight": true
}
},
"@vanilla-extract/css": {
"globals": {
"process.env.NODE_ENV": true
Expand Down Expand Up @@ -476,6 +485,7 @@
"process": true
},
"packages": {
"@testing-library/react>@testing-library/dom>@babel/code-frame": true,
"eslint-config-rainbow>eslint-import-resolver-babel-module>@babel/core>@ampproject/remapping": true,
"eslint-config-rainbow>eslint-import-resolver-babel-module>@babel/core>@babel/helper-compilation-targets": true,
"eslint-config-rainbow>eslint-import-resolver-babel-module>@babel/core>@babel/helper-module-transforms": true,
Expand All @@ -487,7 +497,6 @@
"jest>@jest/core>jest-snapshot>@babel/generator": true,
"jest>@jest/core>jest-snapshot>@babel/types": true,
"lavamoat-browserify>convert-source-map": true,
"lavamoat>@babel/code-frame": true,
"lavamoat>lavamoat-tofu>@babel/parser": true,
"lavamoat>lavamoat-tofu>@babel/traverse": true,
"vitest>debug": true
Expand Down Expand Up @@ -560,8 +569,8 @@
},
"eslint-config-rainbow>eslint-import-resolver-babel-module>@babel/core>@babel/template": {
"packages": {
"@testing-library/react>@testing-library/dom>@babel/code-frame": true,
"jest>@jest/core>jest-snapshot>@babel/types": true,
"lavamoat>@babel/code-frame": true,
"lavamoat>lavamoat-tofu>@babel/parser": true
}
},
Expand Down Expand Up @@ -1008,15 +1017,6 @@
"value": true
}
},
"lavamoat>@babel/code-frame": {
"globals": {
"console.warn": true,
"process.emitWarning": true
},
"packages": {
"lavamoat>@babel/highlight": true
}
},
"lavamoat>@babel/highlight": {
"packages": {
"lavamoat>@babel/highlight>@babel/helper-validator-identifier": true,
Expand Down Expand Up @@ -1071,9 +1071,9 @@
"console.trace": true
},
"packages": {
"@testing-library/react>@testing-library/dom>@babel/code-frame": true,
"jest>@jest/core>jest-snapshot>@babel/generator": true,
"jest>@jest/core>jest-snapshot>@babel/types": true,
"lavamoat>@babel/code-frame": true,
"lavamoat>lavamoat-tofu>@babel/parser": true,
"lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-environment-visitor": true,
"lavamoat>lavamoat-tofu>@babel/traverse>@babel/helper-function-name": true,
Expand All @@ -1099,22 +1099,6 @@
"jest>@jest/core>jest-snapshot>@babel/types": true
}
},
"lavamoat>node-gyp-build": {
"builtin": {
"fs.existsSync": true,
"fs.readdirSync": true,
"os.arch": true,
"os.platform": true,
"path.dirname": true,
"path.join": true,
"path.resolve": true
},
"globals": {
"__non_webpack_require__": true,
"__webpack_require__": true,
"process": true
}
},
"lint-staged>execa>merge-stream": {
"builtin": {
"stream.PassThrough": true
Expand Down Expand Up @@ -1233,7 +1217,7 @@
},
"native": true,
"packages": {
"lavamoat>node-gyp-build": true
"wagmi>@coinbase/wallet-sdk>keccak>node-gyp-build": true
}
},
"selenium-webdriver>ws>utf-8-validate": {
Expand All @@ -1242,7 +1226,7 @@
},
"native": true,
"packages": {
"lavamoat>node-gyp-build": true
"wagmi>@coinbase/wallet-sdk>keccak>node-gyp-build": true
}
},
"semver": {
Expand Down Expand Up @@ -1388,6 +1372,22 @@
"jest>@jest/core>jest-snapshot>@babel/types": true
}
},
"wagmi>@coinbase/wallet-sdk>keccak>node-gyp-build": {
"builtin": {
"fs.existsSync": true,
"fs.readdirSync": true,
"os.arch": true,
"os.platform": true,
"path.dirname": true,
"path.join": true,
"path.resolve": true
},
"globals": {
"__non_webpack_require__": true,
"__webpack_require__": true,
"process": true
}
},
"webpack": {
"builtin": {
"buffer.constants.MAX_LENGTH": true,
Expand Down Expand Up @@ -1791,6 +1791,14 @@
"webpack>tapable": true
}
},
"webpack>es-module-lexer": {
"globals": {
"Buffer": true,
"WebAssembly.compile": true,
"WebAssembly.instantiate": true,
"atob": true
}
},
"webpack>eslint-scope": {
"builtin": {
"assert": true
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"// Checks the lockfile for changes": "",
"check-lockfile": "./scripts/check-lockfile.sh",
"// Installs deps, runs allowed scripts, patches packages and generates lavamoat policies": "",
"setup": "yarn config set ignore-engines true && yarn install && yarn ds:install && yarn graphql-setup && yarn ds:generate-symbols && yarn allow-scripts && yarn patch-package && yarn policy",
"setup": "yarn install && yarn ds:install && yarn graphql-setup && yarn ds:generate-symbols && yarn allow-scripts && yarn patch-package && yarn policy",
"// runs audit against dep. tree": "",
"audit:ci": "yarn audit-ci --moderate --config audit-ci.jsonc",
"// Generates a zip file based on the build folder ready to upload to the chrome web store": "",
Expand Down Expand Up @@ -134,7 +134,7 @@
},
"devDependencies": {
"@foundry-rs/hardhat-anvil": "0.1.7",
"@lavamoat/allow-scripts": "2.0.3",
"@lavamoat/allow-scripts": "2.3.1",
"@lavamoat/preinstall-always-fail": "1.0.0",
"@peculiar/webcrypto": "1.4.1",
"@testing-library/react": "13.4.0",
Expand Down Expand Up @@ -178,8 +178,8 @@
"html-webpack-plugin": "5.5.0",
"husky": "8.0.1",
"jest": "29.2.0",
"lavamoat": "6.3.0",
"lavamoat-browserify": "15.3.0",
"lavamoat": "7.0.0",
"lavamoat-browserify": "15.6.0",
"lint-staged": "13.0.3",
"mini-css-extract-plugin": "2.6.1",
"msw": "0.47.4",
Expand Down
Loading

0 comments on commit 3e57f6d

Please sign in to comment.