-
Notifications
You must be signed in to change notification settings - Fork 393
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.
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
vufind-org:dev
Choose a base branch
from
crhallberg:v11-npm-scripts
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 11 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
b455e5d
feat: tools/build-css.js
crhallberg fc6b753
feat: no dependency warnings.
crhallberg 34bae4d
remove: grunt
crhallberg 701b109
tools: improve --help
crhallberg d952f67
tools: add --check-only. improve arguments and styles.
crhallberg 8067ca4
tools: check only now doesn't run minify by default.
crhallberg 077f5ea
ignore: add theme vendor, organize.
crhallberg 00035b1
tools: use npm workspaces to handle installDeps and updateDeps.
crhallberg aa75835
Merge remote-tracking branch 'origin/dev' into v11-npm-scripts
crhallberg 4fc37ef
fix: try catch in copyDependencies.
crhallberg ef4e7f4
chore: qa-js-and-scss
crhallberg 47f7db3
tools: split build deps back out. Revert gitignore.
crhallberg 8b199a3
feat: undo new dir
crhallberg d974d2f
feat: clearer time output
crhallberg b910754
fix: proper folder for bootstrap import
crhallberg 42931a3
Merge branch 'dev' into v11-npm-scripts
demiankatz a136e47
fix: white space, docs, and deprecation in package.json
crhallberg 2a63593
chore: npm lock (for comparison)
crhallberg 0f1217f
style: reduce package-lock diffs
crhallberg 14721dd
style: package.json indent
crhallberg b95905e
style: reorder package.json (diff reduction)
crhallberg 9d8dc21
style: scss install before compile (diff reduction)
crhallberg ab2c354
style: rename updateDeps
crhallberg 0108ab4
style: explain missing configs from reference CLI
crhallberg 1532a3f
Merge branch 'dev' into v11-npm-scripts
crhallberg 9bfeea3
Merge remote-tracking branch 'origin/dev' into v11-npm-scripts
demiankatz 124f548
Make eslint happy.
demiankatz 2590aff
Revert "ignore: add theme vendor, organize."
crhallberg 9086e4e
fix: even less diff
crhallberg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /*global __dirname, process, require */ | ||
| /*eslint-disable no-console -- console needed for CLI output */ | ||
|
|
||
| const { copyFileSync, cpSync, statSync } = require('node:fs'); | ||
| const path = require('node:path'); | ||
|
|
||
| /** | ||
| * Helper function to take from root, to theme | ||
| * @param {string} fromRelPath relative path to source | ||
| * @param {string} toRelPath relative path to destination | ||
| */ | ||
| function copy(fromRelPath, toRelPath) { | ||
| try { | ||
| const fromPath = path.join(process.env.VUFIND_HOME, fromRelPath); | ||
| const toPath = path.join(__dirname, "..", toRelPath); | ||
| console.log(`> ${toRelPath}`); | ||
|
|
||
| const stats = statSync(fromPath); | ||
| if (stats.isDirectory()) { | ||
| cpSync(fromPath, toPath, { recursive: true }); | ||
| } else { | ||
| copyFileSync(fromPath, toPath); | ||
| } | ||
| } catch (e) { | ||
| console.log(`X ${toRelPath} (${e})`); | ||
| } | ||
| } | ||
|
|
||
| console.log('Copying bootstrap5 dependencies...'); | ||
|
|
||
| // Bootstrap 5 | ||
| copy('node_modules/bootstrap/scss/.', 'scss/vendor/bootstrap/scss/'); | ||
| copy('node_modules/bootstrap/dist/js/bootstrap.min.js', 'js/vendor/bootstrap.min.js'); | ||
|
|
||
| // Popper (Bootstrap 5 dependency) | ||
| copy('node_modules/@popperjs/core/dist/umd/popper.min.js', 'js/vendor/popper.min.js'); | ||
|
|
||
| // autocomplete.js | ||
| copy('node_modules/autocomplete.js/autocomplete.js', 'js/vendor/autocomplete.js'); | ||
|
|
||
| // chart.js | ||
| copy('node_modules/chart.js/dist/chart.umd.js', 'js/vendor/chart.js'); | ||
|
|
||
| // jQuery | ||
| copy('node_modules/jquery/dist/jquery.min.js', 'js/vendor/jquery.min.js'); | ||
|
|
||
| // libphonenumber-js | ||
| copy('node_modules/libphonenumber-js/bundle/libphonenumber-js.min.js', 'js/vendor/libphonenumber.js'); | ||
| copy('node_modules/libphonenumber-js/LICENSE', 'js/vendor/libphonenumber-js_LICENSE'); | ||
|
|
||
| // nouislider | ||
| copy('node_modules/nouislider/LICENSE.md', 'js/vendor/nouislider_LICENSE.md'); | ||
| copy('node_modules/nouislider/dist/nouislider.min.js', 'js/vendor/nouislider.min.js'); | ||
| copy('node_modules/nouislider/dist/nouislider.min.css', 'css/vendor/nouislider.min.css'); | ||
|
|
||
| // simple-keyboard | ||
| copy('node_modules/simple-keyboard/build/index.js', 'js/vendor/simple-keyboard/index.js'); | ||
| copy('node_modules/simple-keyboard/build/css/index.css', 'css/vendor/simple-keyboard/index.css'); | ||
| copy('node_modules/simple-keyboard-layouts/build/index.js', 'js/vendor/simple-keyboard-layouts/index.js'); | ||
|
|
||
| // vanilla-cookieconsent | ||
| copy('node_modules/vanilla-cookieconsent/dist/cookieconsent.umd.js', 'js/vendor/cookieconsent.umd.js'); | ||
|
|
||
| console.log('= Done copying dependencies.'); |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might make sense to move this reorganization of .gitignore to a separate PR, and just focus on removing the obsolete lines in this one. I think it's useful, but it obscures what is actually changing here. I also think some of the lines currently under the "QA files" comment really belong elsewhere -- but I don't want to distract from the work at hand sorting all that out here. :-)