Skip to content

fix(build): preserve watch paths and finish asset copies before returning #2843

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

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −11
Open

fix(build): preserve watch paths and finish asset copies before returning #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions scripts/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,9 @@ function buildFile(file, silent) {
!micromatch.isMatch(file, JS_FILES_PATTERN) &&
!micromatch.isMatch(file, TS_FILE_PATTERN)
) {
fs.copyFileSync(file, destPath);
if (FILES_WITH_755_PERMISSION.includes(fileName)) {
fs.createReadStream(file).pipe(
fs.createWriteStream(destPath, {mode: 0o755}),
);
} else {
fs.createReadStream(file).pipe(fs.createWriteStream(destPath));
fs.chmodSync(destPath, 0o755);
}
silent ||
process.stdout.write(
Expand Down
14 changes: 8 additions & 6 deletions scripts/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
*/

const fs = require('fs');
const {execSync} = require('child_process');
const {execFileSync} = require('child_process');
const path = require('path');
const pico = require('picocolors');
const chokidar = require('chokidar');
const {getPackages} = require('./helpers');

const BUILD_CMD = `node ${path.resolve(__dirname, './build.js')}`;
const BUILD_SCRIPT = path.resolve(__dirname, './build.js');

let filesToBuild = new Map();

Expand All @@ -33,9 +33,9 @@ const onChange = (srcDir) => {

const onUnlink = (srcDir) => {
return (filePath) => {
const buildFile = filePath
.replace(`${path.sep}src${path.sep}`, `${path.sep}build${path.sep}`)
.replace('.ts', '.js');
const buildFile = path
.join(path.dirname(srcDir), 'build', path.relative(srcDir, filePath))
.replace(/\.ts$/, '.js');

try {
fs.unlinkSync(buildFile);
Expand Down Expand Up @@ -73,7 +73,9 @@ setInterval(() => {
if (files.length) {
filesToBuild = new Map();
try {
execSync(`${BUILD_CMD} ${files.join(' ')}`, {stdio: [0, 1, 2]});
execFileSync(process.execPath, [BUILD_SCRIPT, ...files], {
stdio: [0, 1, 2],
});
} catch (e) {
// omit
}
Expand Down
Loading