Skip to content

Commit

Permalink
Merge pull request #4113 from relative-ci/fix-rollup-v4
Browse files Browse the repository at this point in the history
chore(rollup-plugin): Add Rollup@4 as a peerDependency
  • Loading branch information
vio authored Dec 26, 2023
2 parents 4cd0235 + 5f78ca1 commit 66c66f6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
node: [16]
node: [16, 18]
rollup: [3, 4]
exclude:
- rollup: 3
node: 18
- rollup: 4
node: 16
runs-on: ${{ matrix.os }}
name: rollup plugin ${{ matrix.os }} nodejs ${{ matrix.node }}
name: rollup ${{ matrix.rollup}} plugin nodejs ${{ matrix.node }}
steps:
- uses: actions/checkout@v4

Expand All @@ -285,12 +291,18 @@ jobs:
with:
name: local-registry

- name: Install dependencies
- name: Install verdaccio
run: npm install -g verdaccio

- name: Run local npm registry
run: ./scripts/local-registry.sh &

- name: Install test dependencies
run: |
npm install --force
npm install --no-save --force rollup@${{ matrix.rollup }}
working-directory: packages/rollup-plugin/test/package

- name: Test package
run: npm run test:package
working-directory: packages/rollup-plugin
Expand Down
2 changes: 1 addition & 1 deletion packages/rollup-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
"typescript": "5.1.6"
},
"peerDependencies": {
"rollup": "^3.0.0"
"rollup": "^3.0.0 || ^4.0.0"
}
}
2 changes: 0 additions & 2 deletions packages/rollup-plugin/test/package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
"version": "1.0.0",
"scripts": {
"build": "rollup -c",
"pretest": "npm install --force",
"test": "jest"
},
"devDependencies": {
"memfs": "4.2.1",
"rollup-plugin-bundle-stats": "*",
"rollup": "3.10.1",
"jest": "^29.6.1"
}
}

0 comments on commit 66c66f6

Please sign in to comment.