Skip to content

Commit

Permalink
Merge pull request #135 from transcend-io/dmattia/dependabot
Browse files Browse the repository at this point in the history
Bump all the things
  • Loading branch information
dmattia authored Dec 5, 2023
2 parents 0279a02 + ee92fb9 commit a126642
Show file tree
Hide file tree
Showing 10 changed files with 5,218 additions and 5,541 deletions.
6 changes: 3 additions & 3 deletions .github/commands/dependencies/install_yarn_deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
# Install Yarn v2 dependencies
- uses: actions/setup-node@v2
with:
node-version: '14.17.3'
node-version: '20.9.0'
- run: npm install -g "[email protected]"
shell: bash
- uses: actions/cache@v2
Expand All @@ -17,9 +17,9 @@ runs:
.yarn/unplugged
.yarn/install-state.gz
.pnp.cjs
key: ${{ runner.os }}-${{ runner.arch }}-yarn-v3-${{ hashFiles('**/yarn.lock', '**/package.json') }}
key: ${{ runner.os }}-${{ runner.arch }}-yarn-v4-${{ hashFiles('**/yarn.lock', '**/package.json') }}
restore-keys: |
${{ runner.os }}-${{ runner.arch }}-yarn-v3-
${{ runner.os }}-${{ runner.arch }}-yarn-v4-
- run: yarn install --immutable
name: Install yarn deps
shell: bash
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: ./.github/commands/dependencies/install_yarn_deps
- run: yarn pnpify depcheck
- run: yarn depcheck

run-pre-commits:
runs-on: ubuntu-latest
Expand All @@ -40,9 +40,7 @@ jobs:
fetch-depth: 100 # need the history to do a changed files check below (source, origin)
- uses: actions/setup-python@v2
- uses: ./.github/commands/dependencies/install_yarn_deps
- uses: pre-commit/[email protected]
with:
extra_args: --source ${{ github.event.pull_request.base.sha || 'HEAD~1' }} --origin ${{ github.event.pull_request.head.sha || 'HEAD' }}
- uses: pre-commit/[email protected]

build-to-npm:
if: github.ref == 'refs/heads/main'
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.3
20.9.0
546 changes: 0 additions & 546 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@ nodeLinker: node-modules

npmPublishAccess: public

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

yarnPath: .yarn/releases/yarn-3.3.1.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@transcend-io/conflux",
"version": "4.0.3",
"version": "4.1.0",
"description": "Build zip files out of readable streams in the browser",
"main": "dist/conflux.umd.min.js",
"jsdelivr": "dist/conflux.umd.min.js",
Expand All @@ -17,7 +17,7 @@
"report-coverage": "codecov",
"rebuild-fixtures": "node test/build.js",
"####### Build #######": "",
"build": "rollup -c"
"build": "rollup -c --bundleConfigAsCjs"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -65,44 +65,44 @@
"glob-parent": "5.1.2"
},
"devDependencies": {
"@babel/core": "^7.18.2",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
"@babel/plugin-transform-classes": "^7.18.4",
"@babel/plugin-transform-runtime": "^7.18.2",
"@babel/preset-env": "^7.18.2",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^14.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.4.0",
"@yarnpkg/pnpify": "^3.1.3",
"@yarnpkg/sdks": "^2.6.2",
"@babel/core": "^7.23.5",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-transform-classes": "^7.23.5",
"@babel/plugin-transform-runtime": "^7.23.4",
"@babel/preset-env": "^7.23.5",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@yarnpkg/pnpify": "^4.0.1",
"@yarnpkg/sdks": "^3.1.0",
"buffer": "^6.0.3",
"codecov": "^3.8.3",
"depcheck": "^1.4.3",
"eslint": "^8.17.0",
"depcheck": "^1.4.7",
"eslint": "^8.55.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-import": "2.29.0",
"git-rev-sync": "^3.0.2",
"karma": "^6.3.20",
"karma": "^6.4.2",
"karma-browserstack-launcher": "^1.6.0",
"karma-chrome-launcher": "^3.1.1",
"karma-coverage": "^2.2.0",
"karma-chrome-launcher": "^3.2.0",
"karma-coverage": "^2.2.1",
"karma-firefox-launcher": "^2.1.2",
"karma-rollup-preprocessor": "^7.0.8",
"karma-tap": "^4.2.0",
"live-server": "^1.2.2",
"prettier": "^2.6.2",
"rollup": "^2.75.6",
"prettier": "^3.1.0",
"rollup": "^4.6.1",
"rollup-plugin-node-polyfills": "^0.2.1",
"rollup-plugin-terser": "^6.1.0",
"tape": "^5.5.3"
"rollup-plugin-terser": "^7.0.2",
"tape": "^5.7.2"
},
"dependencies": {
"@babel/runtime-corejs3": "^7.18.3",
"jsbi": "^3.2.5",
"pako": "^1.0.11",
"@babel/runtime-corejs3": "^7.23.5",
"jsbi": "^4.3.0",
"pako": "^2.1.0",
"web-streams-polyfill": "^3.2.1"
},
"packageManager": "yarn@3.3.1"
"packageManager": "yarn@4.0.2"
}
Loading

0 comments on commit a126642

Please sign in to comment.