v1.0.5
fixed watching for meta.json changes
This commit is contained in:
17
lib/build.js
17
lib/build.js
@@ -8,7 +8,7 @@ const fs_1 = require("fs");
|
||||
const readmeta_1 = __importDefault(require("./readmeta"));
|
||||
const prettier_1 = require("prettier");
|
||||
const main_1 = require("./main");
|
||||
async function runBuild(name, watchCallback) {
|
||||
async function runBuild(name) {
|
||||
//read meta file
|
||||
let { meta, metaString } = (0, readmeta_1.default)(name);
|
||||
let paths = main_1.AllPaths.script(name);
|
||||
@@ -28,12 +28,6 @@ async function runBuild(name, watchCallback) {
|
||||
UserScriptSupportURL: `'${meta.supportURL}'`,
|
||||
UserScriptHomepageURL: `'${meta.homepageURL}'`,
|
||||
},
|
||||
}, result => {
|
||||
let error = postBuild(name, result, metaString);
|
||||
watchCallback({
|
||||
meta,
|
||||
error,
|
||||
});
|
||||
});
|
||||
let error = postBuild(name, result, metaString);
|
||||
return {
|
||||
@@ -42,15 +36,8 @@ async function runBuild(name, watchCallback) {
|
||||
};
|
||||
}
|
||||
exports.default = runBuild;
|
||||
async function runEsbuild(opts, watchCallback) {
|
||||
async function runEsbuild(opts) {
|
||||
opts.write = false;
|
||||
if (main_1.CLIArgs.watch) {
|
||||
opts.watch = {
|
||||
onRebuild(err, res) {
|
||||
watchCallback(getResult(err, res));
|
||||
},
|
||||
};
|
||||
}
|
||||
try {
|
||||
let res = await (0, esbuild_1.build)(opts);
|
||||
return getResult(null, res);
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
|
||||
21
lib/main.js
21
lib/main.js
@@ -34,6 +34,7 @@ const readmefile_1 = require("./readmefile");
|
||||
const build_1 = __importDefault(require("./build"));
|
||||
const Path = __importStar(require("path"));
|
||||
const paths_1 = __importDefault(require("./paths"));
|
||||
const chokidar = __importStar(require("chokidar"));
|
||||
exports.CLIArgs = (0, command_line_args_1.default)([
|
||||
{ name: 'watch', alias: 'w', type: Boolean, defaultValue: false },
|
||||
{ name: 'minify', alias: 'm', type: Boolean, defaultValue: false },
|
||||
@@ -139,15 +140,23 @@ async function doCompile() {
|
||||
(0, fs_1.existsSync)(path.main) &&
|
||||
(0, fs_1.lstatSync)(path.main).isFile()) {
|
||||
let id = scriptMeta.length;
|
||||
function update(result) {
|
||||
console.log('WATCH', name, result.meta.version);
|
||||
scriptMeta[id] = result;
|
||||
scriptMeta[id] = await (0, build_1.default)(name);
|
||||
console.log(name, scriptMeta[id].meta.version);
|
||||
var running = false;
|
||||
async function update(eventName) {
|
||||
if (running) {
|
||||
return;
|
||||
}
|
||||
running = true;
|
||||
scriptMeta[id] = await (0, build_1.default)(name);
|
||||
console.log(`WATCH ${eventName}`, name, scriptMeta[id].meta.version);
|
||||
if (exports.CLIArgs.readme)
|
||||
(0, readmefile_1.updateReadmeFile)(scriptMeta);
|
||||
running = false;
|
||||
}
|
||||
if (exports.CLIArgs.watch) {
|
||||
chokidar.watch(path.dir).on('all', update);
|
||||
}
|
||||
let result = await (0, build_1.default)(name, update);
|
||||
console.log(name, result.meta.version);
|
||||
scriptMeta[id] = result;
|
||||
}
|
||||
}
|
||||
return scriptMeta;
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA8E;AAC9E,0EAA+C;AAC/C,6CAA+C;AAC/C,oDAAkD;AAClD,2CAA4B;AAC5B,oDAAiC;AAkBpB,QAAA,OAAO,GAAG,IAAA,2BAAe,EAAC;IACnC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IACjE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAClE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IACpE,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IACtE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE;IAElE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE;IAC3D,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE;IAClE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE;IACpE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE;IACjE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE;IAE/D,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE;CAC9C,CAAa,CAAA;AAED,QAAA,QAAQ,GAAG,IAAA,eAAW,EAAC;IAChC,OAAO,EAAE,eAAO,CAAC,GAAG,IAAI,EAAE;IAC1B,UAAU,EAAE,eAAO,CAAC,UAAU,IAAI,EAAE;IACpC,YAAY,EAAE,eAAO,CAAC,YAAY,IAAI,EAAE;IACxC,MAAM,EAAE,eAAO,CAAC,EAAE,IAAI,SAAS;IAC/B,OAAO,EAAE,eAAO,CAAC,GAAG,IAAI,MAAM;CACjC,CAAC,CAAA;AAEF,IAAI,eAAO,CAAC,IAAI,EAAE;IACd,IAAI,OAAO,GAAG,WAAW,CAAA;IACzB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;KAC7C;IACD,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7D,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAA;QAC/D,OAAO,GAAG,GAAG,OAAO,IAAI,IAAI,EAAE,CAAA;KACjC;IAED,OAAO,CAAC,GAAG,CAAC;SACP,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDf,CAAC,CAAA;IACE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAClB;AAED,oEAAoE;AACpE,IAAI,CAAC,IAAA,eAAU,EAAC,cAAc,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,cAAc,CAAC,CAAC,MAAM,EAAE,EAAE;IACpE,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;IACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAClB;AAED,oEAAoE;AACpE,IAAI,CAAC,IAAA,eAAU,EAAC,gBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;IAChC,IAAA,cAAS,EAAC,gBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;CAC/B;KAAM;IACH,IAAA,gBAAW,EAAC,gBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAC1C,IAAA,eAAU,EAAC,GAAG,gBAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,CAC7C,CAAA;CACJ;AAED,iBAAiB;AACjB,KAAK,UAAU,SAAS;IACpB,IAAI,OAAO,GAAG,IAAA,gBAAW,EAAC,gBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC3C,IAAI,UAAU,GAAqB,EAAE,CAAA;IAErC,KAAK,IAAI,IAAI,IAAI,OAAO,EAAE;QACtB,IAAI,IAAI,GAAG,gBAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEhC,IACI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnB,IAAA,eAAU,EAAC,IAAI,CAAC,GAAG,CAAC;YACpB,IAAA,cAAS,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YACjC,IAAA,eAAU,EAAC,IAAI,CAAC,IAAI,CAAC;YACrB,IAAA,cAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAC/B;YACE,IAAI,EAAE,GAAG,UAAU,CAAC,MAAM,CAAA;YAE1B,SAAS,MAAM,CAAC,MAAsB;gBAClC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC/C,UAAU,CAAC,EAAE,CAAC,GAAG,MAAM,CAAA;gBACvB,IAAI,eAAO,CAAC,MAAM;oBAAE,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;YACpD,CAAC;YAED,IAAI,MAAM,GAAG,MAAM,IAAA,eAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YACzC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEtC,UAAU,CAAC,EAAE,CAAC,GAAG,MAAM,CAAA;SAC1B;KACJ;IACD,OAAO,UAAU,CAAA;AACrB,CAAC;AACD,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;IAC1B,IAAI,eAAO,CAAC,MAAM;QAAE,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAA;IAEhD,OAAO,CAAC,GAAG,CACP,yBACI,eAAO,CAAC,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAChD,EAAE,CACL,CAAA;AACL,CAAC,CAAC,CAAA"}
|
||||
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "browser-scripts-builder",
|
||||
"version": "1.1.4",
|
||||
"version": "1.1.5",
|
||||
"description": "",
|
||||
"main": "./lib/main.js",
|
||||
"module": "./lib/main.js",
|
||||
@@ -9,7 +9,7 @@
|
||||
},
|
||||
"scripts": {
|
||||
"prettier": "prettier --write .",
|
||||
"build": "npm run prettier && tsc && printf \"%s\\n%s\" '#!/usr/bin/env node' \"$(cat lib/main.js)\" > lib/main.js",
|
||||
"build": "npm run prettier && tsc && node -e \"(async () => await fs.promises.writeFile('lib/main.js', '#!/usr/bin/env node\\n' + await fs.promises.readFile('lib/main.js')))()\" && chmod +x lib/main.js",
|
||||
"test": "node ./test/test.mjs"
|
||||
},
|
||||
"repository": {
|
||||
@@ -19,6 +19,7 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chokidar": "^3.6.0",
|
||||
"command-line-args": "^5.2.1",
|
||||
"esbuild": "^0.14.54",
|
||||
"prettier": "^2.8.4"
|
||||
|
||||
1345
pnpm-lock.yaml
generated
1345
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
28
src/build.ts
28
src/build.ts
@@ -10,16 +10,12 @@ export interface runBuildResult {
|
||||
error: string | null
|
||||
}
|
||||
|
||||
export default async function runBuild(
|
||||
name: string,
|
||||
watchCallback: (result: runBuildResult) => void
|
||||
) {
|
||||
export default async function runBuild(name: string) {
|
||||
//read meta file
|
||||
let { meta, metaString } = readMeta(name)
|
||||
let paths = AllPaths.script(name)
|
||||
|
||||
let result = await runEsbuild(
|
||||
{
|
||||
let result = await runEsbuild({
|
||||
entryPoints: [paths.main],
|
||||
outfile: paths.dist,
|
||||
|
||||
@@ -39,15 +35,7 @@ export default async function runBuild(
|
||||
UserScriptSupportURL: `'${meta.supportURL}'`,
|
||||
UserScriptHomepageURL: `'${meta.homepageURL}'`,
|
||||
},
|
||||
},
|
||||
result => {
|
||||
let error = postBuild(name, result, metaString)
|
||||
watchCallback({
|
||||
meta,
|
||||
error,
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
let error = postBuild(name, result, metaString)
|
||||
|
||||
@@ -63,18 +51,8 @@ interface RunEsbuildResult {
|
||||
errorRaw?: BuildFailure
|
||||
}
|
||||
|
||||
async function runEsbuild(
|
||||
opts: BuildOptions,
|
||||
watchCallback: (result: RunEsbuildResult) => void
|
||||
): Promise<RunEsbuildResult> {
|
||||
async function runEsbuild(opts: BuildOptions): Promise<RunEsbuildResult> {
|
||||
opts.write = false
|
||||
if (CLIArgs.watch) {
|
||||
opts.watch = {
|
||||
onRebuild(err, res) {
|
||||
watchCallback(getResult(err, res))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
let res = await build(opts)
|
||||
|
||||
30
src/main.ts
30
src/main.ts
@@ -4,6 +4,7 @@ import { updateReadmeFile } from './readmefile'
|
||||
import runBuild, { runBuildResult } from './build'
|
||||
import * as Path from 'path'
|
||||
import getAllPaths from './paths'
|
||||
import * as chokidar from 'chokidar'
|
||||
|
||||
export interface CLIArgsT {
|
||||
watch: boolean
|
||||
@@ -140,20 +141,35 @@ async function doCompile() {
|
||||
) {
|
||||
let id = scriptMeta.length
|
||||
|
||||
function update(result: runBuildResult) {
|
||||
console.log('WATCH', name, result.meta.version)
|
||||
scriptMeta[id] = result
|
||||
scriptMeta[id] = await runBuild(name)
|
||||
console.log(name, scriptMeta[id].meta.version)
|
||||
|
||||
var running = false
|
||||
async function update(eventName: string) {
|
||||
if (running) {
|
||||
return
|
||||
}
|
||||
running = true
|
||||
|
||||
scriptMeta[id] = await runBuild(name)
|
||||
console.log(
|
||||
`WATCH ${eventName}`,
|
||||
name,
|
||||
scriptMeta[id].meta.version
|
||||
)
|
||||
|
||||
if (CLIArgs.readme) updateReadmeFile(scriptMeta)
|
||||
running = false
|
||||
}
|
||||
|
||||
let result = await runBuild(name, update)
|
||||
console.log(name, result.meta.version)
|
||||
|
||||
scriptMeta[id] = result
|
||||
if (CLIArgs.watch) {
|
||||
chokidar.watch(path.dir).on('all', update)
|
||||
}
|
||||
}
|
||||
}
|
||||
return scriptMeta
|
||||
}
|
||||
|
||||
doCompile().then(scriptMeta => {
|
||||
if (CLIArgs.readme) updateReadmeFile(scriptMeta)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user