Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rollup/rollup into sync-c…
Browse files Browse the repository at this point in the history
…e8f83c7
  • Loading branch information
docschina-bot committed Jul 12, 2024
2 parents 68e32de + ce8f83c commit 5572d72
Show file tree
Hide file tree
Showing 5 changed files with 240 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Lint
run: npm run ci:lint
- name: Vulnerabilities
run: npm audit
run: npm run check-audit
- name: Optional Dependencies
run: npm run test:package
- name: Generated Code
Expand Down
10 changes: 10 additions & 0 deletions audit-resolve.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"decisions": {
"1098122|requirejs": {
"decision": "ignore",
"madeAt": 1720680883374
}
},
"rules": {},
"version": 1
}
225 changes: 225 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"prepublish:napi": "napi prepublish --skip-gh-release",
"release": "node scripts/prepare-release.js",
"release:docs": "git fetch --update-head-ok origin master:master && git branch --force documentation-published master && git push origin documentation-published",
"check-audit": "check-audit",
"resolve-audit": "resolve-audit",
"test": "npm run build && npm run test:all",
"test:update-snapshots": "node scripts/update-snapshots.js",
"test:cjs": "npm run build:cjs && npm run test:only",
Expand Down Expand Up @@ -173,6 +175,7 @@
"magic-string": "^0.30.10",
"mocha": "^10.5.2",
"nodemon": "^3.1.4",
"npm-audit-resolver": "^3.0.0-RC.0",
"nyc": "^17.0.0",
"pinia": "^2.1.7",
"prettier": "^3.3.2",
Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ function getDummyLogSection(headline, pr) {
async function installDependenciesAndLint() {
await Promise.all([
runWithEcho('npm', ['ci', '--ignore-scripts']),
runWithEcho('npm', ['audit'])
runWithEcho('npm', ['run', 'check-audit'])
]);
await runWithEcho('npm', ['run', 'ci:lint']);
}
Expand Down

0 comments on commit 5572d72

Please sign in to comment.