forked from cockpit-project/cockpit
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename tools/webpack-make.js to ./build.js
This is our primary and only interaction point with building bundles, so it
should be in the top-level directory. Also, we are going to switch to esbuild
soon, so naming it "webpack" will be confusing. Move it to ./build.js like
cockpit-podman already did.
Keep tools/webpack-{make.js,watch} as a shell shim for a little while, which
points to the new tool and the documentation.- Loading branch information
1 parent
54d54f3
commit 4b97d35
Showing
5 changed files
with
101 additions
and
103 deletions.
There are no files selected for viewing
This file contains 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 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 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,89 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| import child_process from 'child_process'; | ||
| import path from 'path'; | ||
| import process from 'process'; | ||
|
|
||
| // ensure node_modules is present and up to date | ||
| child_process.spawnSync('tools/node-modules', ['make_package_lock_json'], { stdio: 'inherit' }); | ||
|
|
||
| const parser = (await import('argparse')).default.ArgumentParser(); | ||
| parser.add_argument('-c', '--config', { help: "Path to webpack.config.js", default: "webpack.config.js" }); | ||
| parser.add_argument('-r', '--rsync', { help: "rsync webpack to ssh target after build", metavar: "HOST" }); | ||
| parser.add_argument('-w', '--watch', { action: 'store_true', help: "Enable webpack watch mode" }); | ||
| parser.add_argument('-e', '--no-eslint', { action: 'store_true', help: "Disable eslint linting" }); | ||
| parser.add_argument('-s', '--no-stylelint', { action: 'store_true', help: "Disable stylelint linting" }); | ||
| parser.add_argument('onlydir', { nargs: '?', help: "The pkg/<DIRECTORY> to build (eg. base1, shell, ...)", metavar: "DIRECTORY" }); | ||
| const args = parser.parse_args(); | ||
|
|
||
| if (args.no_eslint) { | ||
| process.env.ESLINT = "0"; | ||
| } else if (args.watch) { | ||
| process.env.ESLINT = "1"; | ||
| } | ||
|
|
||
| if (args.no_stylelint) { | ||
| process.env.STYLELINT = "0"; | ||
| } else if (args.watch) { | ||
| process.env.STYLELINT = "1"; | ||
| } | ||
|
|
||
| if (args.onlydir?.includes('/')) { | ||
| parser.error("Directory must not contain '/'"); | ||
| } | ||
|
|
||
| if (args.onlydir) | ||
| process.env.ONLYDIR = args.onlydir; | ||
|
|
||
| const cwd = process.cwd(); | ||
| const config_path = path.resolve(cwd, args.config); | ||
|
|
||
| function process_result(err, stats) { | ||
| // process.stdout.write(stats.toString({colors: true}) + "\n"); | ||
|
|
||
| if (err) { | ||
| console.log(JSON.stringify(err)); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| if (args.watch) { | ||
| const info = stats.toJson(); | ||
| const time = new Date().toTimeString().split(' ')[0]; | ||
| process.stdout.write(`${time} Build succeeded, took ${info.time / 1000}s\n`); | ||
| } | ||
|
|
||
| // Failure exit code when compilation fails | ||
| if (stats.hasErrors() || stats.hasWarnings()) | ||
| console.log(stats.toString("normal")); | ||
|
|
||
| if (stats.hasErrors()) { | ||
| if (!args.watch) | ||
| process.exit(1); | ||
| } | ||
| } | ||
|
|
||
| async function build() { | ||
| // dynamic imports which need node_modules | ||
| const config = (await import(config_path)).default; | ||
| const webpack = (await import('webpack')).default; | ||
| const cockpit_rsync = (await import('./pkg/lib/cockpit-rsync-plugin.js')); | ||
|
|
||
| if (args.rsync) { | ||
| process.env.RSYNC = args.rsync; | ||
| config.plugins.push(new cockpit_rsync.CockpitRsyncWebpackPlugin({ source: "dist/" + (args.onlydir || "") })); | ||
| } | ||
|
|
||
| const compiler = webpack(config); | ||
|
|
||
| if (args.watch) { | ||
| compiler.hooks.watchRun.tap("WebpackInfo", compilation => { | ||
| const time = new Date().toTimeString().split(' ')[0]; | ||
| process.stdout.write(`${time} Build started\n`); | ||
| }); | ||
| compiler.watch(config.watchOptions, process_result); | ||
| } else { | ||
| compiler.run(process_result); | ||
| } | ||
| } | ||
|
|
||
| build(); |
This file contains 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 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 |
|---|---|---|
| @@ -1,92 +1,3 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| import child_process from 'child_process'; | ||
| import path from 'path'; | ||
| import process from 'process'; | ||
|
|
||
| // ensure node_modules is present and up to date | ||
| child_process.spawnSync('tools/node-modules', ['make_package_lock_json'], { stdio: 'inherit' }); | ||
|
|
||
| // argv0 is node | ||
| const webpack_watch = process.argv[1].includes('webpack-watch'); | ||
|
|
||
| const parser = (await import('argparse')).default.ArgumentParser(); | ||
| parser.add_argument('-c', '--config', { help: "Path to webpack.config.js", default: "webpack.config.js" }); | ||
| parser.add_argument('-r', '--rsync', { help: "rsync webpack to ssh target after build", metavar: "HOST" }); | ||
| parser.add_argument('-w', '--watch', { action: 'store_true', help: "Enable webpack watch mode", default: webpack_watch }); | ||
| parser.add_argument('-e', '--no-eslint', { action: 'store_true', help: "Disable eslint linting" }); | ||
| parser.add_argument('-s', '--no-stylelint', { action: 'store_true', help: "Disable stylelint linting" }); | ||
| parser.add_argument('onlydir', { nargs: '?', help: "The pkg/<DIRECTORY> to build (eg. base1, shell, ...)", metavar: "DIRECTORY" }); | ||
| const args = parser.parse_args(); | ||
|
|
||
| if (args.no_eslint) { | ||
| process.env.ESLINT = "0"; | ||
| } else if (args.watch) { | ||
| process.env.ESLINT = "1"; | ||
| } | ||
|
|
||
| if (args.no_stylelint) { | ||
| process.env.STYLELINT = "0"; | ||
| } else if (args.watch) { | ||
| process.env.STYLELINT = "1"; | ||
| } | ||
|
|
||
| if (args.onlydir?.includes('/')) { | ||
| parser.error("Directory must not contain '/'"); | ||
| } | ||
|
|
||
| if (args.onlydir) | ||
| process.env.ONLYDIR = args.onlydir; | ||
|
|
||
| const cwd = process.cwd(); | ||
| const config_path = path.resolve(cwd, args.config); | ||
|
|
||
| function process_result(err, stats) { | ||
| // process.stdout.write(stats.toString({colors: true}) + "\n"); | ||
|
|
||
| if (err) { | ||
| console.log(JSON.stringify(err)); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| if (args.watch) { | ||
| const info = stats.toJson(); | ||
| const time = new Date().toTimeString().split(' ')[0]; | ||
| process.stdout.write(`${time} Build succeeded, took ${info.time / 1000}s\n`); | ||
| } | ||
|
|
||
| // Failure exit code when compilation fails | ||
| if (stats.hasErrors() || stats.hasWarnings()) | ||
| console.log(stats.toString("normal")); | ||
|
|
||
| if (stats.hasErrors()) { | ||
| if (!args.watch) | ||
| process.exit(1); | ||
| } | ||
| } | ||
|
|
||
| async function build() { | ||
| // dynamic imports which need node_modules | ||
| const config = (await import(config_path)).default; | ||
| const webpack = (await import('webpack')).default; | ||
| const cockpit_rsync = (await import('../pkg/lib/cockpit-rsync-plugin.js')); | ||
|
|
||
| if (args.rsync) { | ||
| process.env.RSYNC = args.rsync; | ||
| config.plugins.push(new cockpit_rsync.CockpitRsyncWebpackPlugin({ source: "dist/" + (args.onlydir || "") })); | ||
| } | ||
|
|
||
| const compiler = webpack(config); | ||
|
|
||
| if (args.watch) { | ||
| compiler.hooks.watchRun.tap("WebpackInfo", compilation => { | ||
| const time = new Date().toTimeString().split(' ')[0]; | ||
| process.stdout.write(`${time} Build started\n`); | ||
| }); | ||
| compiler.watch(config.watchOptions, process_result); | ||
| } else { | ||
| compiler.run(process_result); | ||
| } | ||
| } | ||
|
|
||
| build(); | ||
| #!/bin/sh | ||
| echo "This got renamed to ./build.js. Please see HACKING.md" | ||
| exit 1 |