Skip to content

Replace grunt with npm scripts (post BS5) #4591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
crhallberg wants to merge 29 commits into
base: dev
Choose a base branch
from
Draft

Replace grunt with npm scripts (post BS5) #4591

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b455e5d
feat: tools/build-css.js
crhallberg Sep 5, 2025
fc6b753
feat: no dependency warnings.
crhallberg Sep 5, 2025
34bae4d
remove: grunt
crhallberg Sep 5, 2025
701b109
tools: improve --help
crhallberg Sep 5, 2025
d952f67
tools: add --check-only. improve arguments and styles.
crhallberg Sep 5, 2025
8067ca4
tools: check only now doesn't run minify by default.
crhallberg Sep 8, 2025
077f5ea
ignore: add theme vendor, organize.
crhallberg Sep 9, 2025
00035b1
tools: use npm workspaces to handle installDeps and updateDeps.
crhallberg Sep 9, 2025
aa75835
Merge remote-tracking branch 'origin/dev' into v11-npm-scripts
crhallberg Sep 9, 2025
4fc37ef
fix: try catch in copyDependencies.
crhallberg Sep 9, 2025
ef4e7f4
chore: qa-js-and-scss
crhallberg Sep 9, 2025
47f7db3
tools: split build deps back out. Revert gitignore.
crhallberg Sep 17, 2025
8b199a3
feat: undo new dir
crhallberg Dec 2, 2025
d974d2f
feat: clearer time output
crhallberg Dec 2, 2025
b910754
fix: proper folder for bootstrap import
crhallberg Dec 2, 2025
42931a3
Merge branch 'dev' into v11-npm-scripts
demiankatz May 6, 2026
a136e47
fix: white space, docs, and deprecation in package.json
crhallberg May 7, 2026
2a63593
chore: npm lock (for comparison)
crhallberg May 7, 2026
0f1217f
style: reduce package-lock diffs
crhallberg May 7, 2026
14721dd
style: package.json indent
crhallberg May 7, 2026
b95905e
style: reorder package.json (diff reduction)
crhallberg May 7, 2026
9d8dc21
style: scss install before compile (diff reduction)
crhallberg May 7, 2026
ab2c354
style: rename updateDeps
crhallberg May 7, 2026
0108ab4
style: explain missing configs from reference CLI
crhallberg May 7, 2026
1532a3f
Merge branch 'dev' into v11-npm-scripts
crhallberg May 7, 2026
9bfeea3
Merge remote-tracking branch 'origin/dev' into v11-npm-scripts
demiankatz May 12, 2026
124f548
Make eslint happy.
demiankatz May 12, 2026
2590aff
Revert "ignore: add theme vendor, organize."
crhallberg May 12, 2026
9086e4e
fix: even less diff
crhallberg May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 0 additions & 141 deletions Gruntfile.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Gruntfile.local.js.dist
View file
Open in desktop

This file was deleted.

23 changes: 11 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,28 @@
"url": "https://vufind.org/jira"
},
"scripts": {
"build": "npm run build:css",
"watch": "npm run watch:css",
"build": "npm-run-all install:scss-dependencies build:scss",
Copy link
Copy Markdown
Member

@demiankatz demiankatz Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're not using wildcards, could we just revert to npm run install:scss-dependencies ; npm run build:scss so we can eliminate the npm-run-all2 dependency? If you strongly feel that it's useful, I don't mind having it, but if it's not essential, it's always nice to minimize dependencies.

"watch": "npm-run-all install:scss-dependencies watch:scss",

"build:css": "npm run build:scss",
"watch:css": "npm run watch:scss",
"build:scss": "node tools/build-css.js --minify",
"check:scss": "node tools/build-css.js --check-only",
"watch:scss": "nodemon --watch tools/ --watch themes/ --ext scss,js --exec \"node tools/build-css.js\" --",

"install:scss-dependencies": "cd themes/bootstrap5 && npm run installBuildDeps",
"build:scss": "npm run install:scss-dependencies && grunt scss",
"check:scss": "npm run install:scss-dependencies && grunt check:scss",
"watch:scss": "npm run install:scss-dependencies && grunt watch:scss"
"install:scss-dependencies": "cd themes/bootstrap5 && npm run installBuildDeps"
},
"dependencies": {
"grunt": "^1.0.4",
"grunt-dart-sass": "^2.0.1",
"jit-grunt": "^0.10.0",
"clean-css": "^5.3.3",
Comment thread
demiankatz marked this conversation as resolved.
"clean-css-cli": "^5.6.3",
"commander": "^14.0.0",
"nodemon": "^3.1.10",
"npm-run-all2": "^8.0.4",
"sass": "1.72.0"
},
"devDependencies": {
"all-iso-language-codes": "^1.0.13",
"eslint": "^8.15.0",
"eslint-plugin-jsdoc": "50.2.2",
"eslint-plugin-no-jquery": "^2.7.0",
"grunt-contrib-watch": "^1.1.0",
"jshint": "^2.13.4"
}
}
2 changes: 1 addition & 1 deletion themes/bootstrap5/tools/copyDependencies.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process.argv.forEach(arg => {
console.log('Copying dependencies...');

// Bootstrap 5
await cp('node_modules/bootstrap/scss/.', 'scss/vendor/bootstrap/', { recursive: true });
await cp('node_modules/bootstrap/scss/.', 'scss/vendor/bootstrap/scss/', { recursive: true });
Copy link
Copy Markdown
Member

@demiankatz demiankatz Sep 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need the double scss in the path?

Copy link
Copy Markdown
Contributor Author

@crhallberg crhallberg Sep 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, for the new scss compiler which tries to resolve the Bootstrap dependencies in this folder. I can try without again with updated loadPaths. Nope that didn't work.

Copy link
Copy Markdown
Member

@demiankatz demiankatz Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we can't avoid this change, I imagine we'll need to commit the result of moving those files, won't we?


if (buildDepsOnly) {
console.log('Done copying build dependencies.');
Expand Down
Loading