diff --git a/EFB/efb-html.patch b/EFB/efb-html.patch index 39e4ff5..ec0341b 100644 --- a/EFB/efb-html.patch +++ b/EFB/efb-html.patch @@ -8,7 +8,7 @@ Index: EFB.html - -+ ++ + - diff --git a/EFB/efb-index-js.patch b/EFB/efb-index-js.patch new file mode 100644 index 0000000..ddae1e9 --- /dev/null +++ b/EFB/efb-index-js.patch @@ -0,0 +1,15 @@ +Index: EFB.index.js +=================================================================== +--- EFB.index.js ++++ EFB.index.js +@@ -27,9 +27,9 @@ + } + + connectedCallback() { + super.connectedCallback(); +- Include.addScript("/Pages/VCockpit/Instruments/aircraft_efb/TFDi_MD11_efb/efb.js"); ++ Include.addScript("/Pages/VCockpit/Instruments/aircraft_efb/KH_TFDi_MD11_efb/efb.js"); + } + + Update() { + super.Update(); diff --git a/EFB/efb-js.patch b/EFB/efb-js.patch index 0070f61..bd79b0b 100644 --- a/EFB/efb-js.patch +++ b/EFB/efb-js.patch @@ -43,7 +43,7 @@ Index: EFB.js icon: Weight }, - page: PayloadPage -+ page: App ++ page: window.KH_LM }, "/perf": { button: { diff --git a/EFB/generatePatches.js b/EFB/generatePatches.js index 1f833e4..87321f5 100644 --- a/EFB/generatePatches.js +++ b/EFB/generatePatches.js @@ -15,6 +15,11 @@ fs.writeFileSync("efb-html.patch", patch); // JS +file1Contents = fs.readFileSync("EFB.index.js").toString(); +file2Contents = fs.readFileSync("patched/EFB.index.js").toString(); +patch = createTwoFilesPatch("EFB.index.js", "EFB.index.js", file1Contents, file2Contents); +fs.writeFileSync("efb-index-js.patch", patch); + file1Contents = fs.readFileSync("EFB.js").toString(); file2Contents = fs.readFileSync("patched/EFB.js").toString(); patch = createTwoFilesPatch("EFB.js", "EFB.js", file1Contents, file2Contents); diff --git a/PackageSources/js-bundle/package.json b/PackageSources/js-bundle/package.json index b552183..4a983a5 100644 --- a/PackageSources/js-bundle/package.json +++ b/PackageSources/js-bundle/package.json @@ -1,6 +1,6 @@ { "name": "tfdidesign-md11-load-manager", - "version": "0.1.145", + "version": "0.1.149", "description": "", "main": "index.js", "type": "module", diff --git a/PackageSources/js-bundle/src/assets/licenses_node.md b/PackageSources/js-bundle/src/assets/licenses_node.md index f5f13a3..e74696c 100644 --- a/PackageSources/js-bundle/src/assets/licenses_node.md +++ b/PackageSources/js-bundle/src/assets/licenses_node.md @@ -4,15 +4,15 @@ | kessler | stuff | react-dom | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.2.0 | 19.1.0 | ^19.1.0 | n/a | | kessler | stuff | uuid | perpetual | material | MIT | git+https://github.com/uuidjs/uuid.git | 11.1.0 | 11.1.0 | ^11.1.0 | n/a | | kessler | stuff | @microsoft/msfs-types | perpetual | material | MIT | git+https://github.com/microsoft/msfs-avionics-mirror.git | 1.14.6 | 1.14.6 | ^1.14.6 | Asobo Studio / Working Title Simulations | -| kessler | stuff | @rollup/plugin-commonjs | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 28.0.6 | 28.0.3 | ^28.0.3 | Rich Harris | +| kessler | stuff | @rollup/plugin-commonjs | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 28.0.9 | 28.0.3 | ^28.0.3 | Rich Harris | | kessler | stuff | @rollup/plugin-json | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.1.0 | 6.1.0 | ^6.1.0 | rollup | -| kessler | stuff | @rollup/plugin-node-resolve | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 16.0.1 | 16.0.1 | ^16.0.1 | Rich Harris | -| kessler | stuff | @rollup/plugin-replace | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.0.2 | 6.0.2 | ^6.0.2 | Rich Harris | +| kessler | stuff | @rollup/plugin-node-resolve | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 16.0.3 | 16.0.1 | ^16.0.1 | Rich Harris | +| kessler | stuff | @rollup/plugin-replace | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.0.3 | 6.0.2 | ^6.0.2 | Rich Harris | | kessler | stuff | @rollup/plugin-terser | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 0.4.4 | 0.4.4 | ^0.4.4 | Peter Placzek | -| kessler | stuff | @rollup/plugin-typescript | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 12.1.4 | 12.1.2 | ^12.1.2 | Oskar Segersvärd | -| kessler | stuff | @types/node | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 24.6.2 | 24.3.1 | ^24.3.1 | n/a | -| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.0 | 19.1.6 | ^19.1.6 | n/a | -| kessler | stuff | @types/react-dom | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.0 | 19.1.6 | ^19.1.6 | n/a | +| kessler | stuff | @rollup/plugin-typescript | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 12.3.0 | 12.1.2 | ^12.1.2 | Oskar Segersvärd | +| kessler | stuff | @types/node | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 24.10.0 | 24.3.1 | ^24.3.1 | n/a | +| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.2 | 19.1.6 | ^19.1.6 | n/a | +| kessler | stuff | @types/react-dom | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.2.2 | 19.1.6 | ^19.1.6 | n/a | | kessler | stuff | @types/uuid | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 10.0.0 | 10.0.0 | ^10.0.0 | n/a | | kessler | stuff | @typescript-eslint/eslint-plugin | perpetual | material | MIT | git+https://github.com/typescript-eslint/typescript-eslint.git | 6.21.0 | 6.21.0 | ^6.21.0 | n/a | | kessler | stuff | @typescript-eslint/parser | perpetual | material | BSD-2-Clause | git+https://github.com/typescript-eslint/typescript-eslint.git | 6.21.0 | 6.21.0 | ^6.21.0 | n/a | @@ -22,18 +22,18 @@ | kessler | stuff | eslint-plugin-import | perpetual | material | MIT | git+https://github.com/import-js/eslint-plugin-import.git | 2.32.0 | 2.31.0 | ^2.31.0 | Ben Mosher | | kessler | stuff | eslint-plugin-react | perpetual | material | MIT | git+https://github.com/jsx-eslint/eslint-plugin-react.git | 7.37.5 | 7.37.5 | ^7.37.5 | Yannick Croissant | | kessler | stuff | eslint-plugin-react-hooks | perpetual | material | MIT | git+https://github.com/facebook/react.git | 4.6.2 | 4.6.2 | ^4.6.2 | n/a | -| kessler | stuff | license-report | perpetual | material | MIT | git+https://github.com/kessler/license-report.git | 6.8.0 | 6.7.2 | ^6.7.2 | Yaniv Kessler | +| kessler | stuff | license-report | perpetual | material | MIT | git+https://github.com/kessler/license-report.git | 6.8.1 | 6.7.2 | ^6.7.2 | Yaniv Kessler | | kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.5.6 | 8.5.4 | ^8.5.4 | Andrey Sitnik | | kessler | stuff | postcss-import | perpetual | material | MIT | git+https://github.com/postcss/postcss-import.git | 16.1.1 | 16.1.0 | ^16.1.0 | Maxime Thirouin | | kessler | stuff | prettier | perpetual | material | MIT | git+https://github.com/prettier/prettier.git | 3.6.2 | 3.5.3 | ^3.5.3 | James Long | | kessler | stuff | prettier-plugin-organize-imports | perpetual | material | MIT | git+https://github.com/simonhaenisch/prettier-plugin-organize-imports.git | 4.3.0 | 4.1.0 | ^4.1.0 | Simon Haenisch (https://github.com/simonhaenisch) | -| kessler | stuff | rimraf | perpetual | material | ISC | git://github.com/isaacs/rimraf.git | 6.0.1 | 6.0.1 | ^6.0.1 | Isaac Z. Schlueter (http://blog.izs.me/) | -| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.52.3 | 4.42.0 | ^4.42.0 | Rich Harris | +| kessler | stuff | rimraf | perpetual | material | ISC | git+ssh://git@github.com/isaacs/rimraf.git | 6.1.0 | 6.0.1 | ^6.0.1 | Isaac Z. Schlueter (http://blog.izs.me/) | +| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.52.5 | 4.42.0 | ^4.42.0 | Rich Harris | | kessler | stuff | rollup-plugin-copy | perpetual | material | MIT | git+https://github.com/vladshcherbin/rollup-plugin-copy.git | 3.5.0 | 3.5.0 | ^3.5.0 | Vlad Shcherbin | | kessler | stuff | rollup-plugin-postcss | perpetual | material | MIT | git+https://github.com/egoist/rollup-plugin-postcss.git | 4.0.2 | 4.0.2 | ^4.0.2 | EGOIST <0x142857@gmail.com> | | kessler | stuff | rollup-plugin-react-svg | perpetual | material | MIT | git+https://github.com/boopathi/react-svg-loader.git | 3.0.3 | 3.0.3 | ^3.0.3 | boopathi | | kessler | stuff | rollup-plugin-version-injector | perpetual | material | ISC | git+https://github.com/djhouseknecht/rollup-plugin-version-injector.git | 1.3.3 | 1.3.3 | ^1.3.3 | David Houseknecht | -| kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.93.2 | 1.89.1 | ^1.89.1 | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 | +| kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.93.3 | 1.89.1 | ^1.89.1 | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 | | kessler | stuff | tslib | perpetual | material | 0BSD | git+https://github.com/Microsoft/tslib.git | 2.8.1 | 2.8.1 | ^2.8.1 | Microsoft Corp. | | kessler | stuff | typed-scss-modules | perpetual | material | MIT | git+https://github.com/skovy/typed-scss-modules.git | 8.1.1 | 8.1.1 | ^8.1.1 | Spencer Miskoviak | | kessler | stuff | typescript | perpetual | material | Apache-2.0 | git+https://github.com/microsoft/TypeScript.git | 5.8.3 | 5.8.3 | 5.8.3 | Microsoft Corp. | diff --git a/insert-efb.js b/insert-efb.js index 4a90866..1543f9c 100644 --- a/insert-efb.js +++ b/insert-efb.js @@ -14,6 +14,11 @@ let patch = fs.readFileSync("./EFB/efb-js.patch").toString(); let patchedFile = applyPatch(file1Contents, patch); fs.writeFileSync(`${outPath}/efb.js`, patchedFile); +file1Contents = fs.readFileSync("./EFB/efb.index.js").toString(); +patch = fs.readFileSync("./EFB/efb-index-js.patch").toString(); +patchedFile = applyPatch(file1Contents, patch); +fs.writeFileSync(`${outPath}/efb.index.js`, patchedFile); + file1Contents = fs.readFileSync("./EFB/efb.html").toString(); patch = fs.readFileSync("./EFB/efb-html.patch").toString(); patchedFile = applyPatch(file1Contents, patch); @@ -24,8 +29,10 @@ var lineReader = readline.createInterface({ input: fs.createReadStream(`${outPath}/App.js`), }); lineReader.on("line", (line) => { - if (line.startsWith("import") || line.startsWith("export")) { + if (line.startsWith("import")) { output += "// " + line + "\n"; + } else if (line.startsWith("export")) { + output += "window.KH_LM = App;\n"; } else { output += line + "\n"; }