diff --git a/README.md b/README.md index eb8159f..8ad93ea 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ yarn run start ```bash # install dependencies yarn -# rebuild native dependencies for electron -yarn run electron-rebuild +# rebuild native dependencies for web +yarn run web-rebuild # build web yarn run build-web # start project diff --git a/build/rebuild.ts b/build/rebuild.ts index e646334..413e242 100644 --- a/build/rebuild.ts +++ b/build/rebuild.ts @@ -2,8 +2,12 @@ import * as path from 'node:path'; import { version as electronVersion } from 'electron/package.json' import { nativeDeps, postInstallDeps } from './deps' import { exec } from './util' +import { parseArgv } from '@opensumi/ide-utils/lib/argv' + +const argv = parseArgv(process.argv) export const rebuild = async (config?: { arch?: string, cwd?: string, silent?: boolean, loglevel?: string }) => { + const target = argv.target || 'electron' const arch = config?.arch || process.arch const cwd = config?.cwd || process.cwd() const loglevel = config?.loglevel || 'info' @@ -15,11 +19,13 @@ export const rebuild = async (config?: { arch?: string, cwd?: string, silent?: b 'npx', 'node-gyp', 'rebuild', - '--runtime=electron', - `--target=${electronVersion}`, - `--arch=${arch}`, - `--dist-url=https://electronjs.org/headers`, - `--loglevel=${loglevel}` + ...target == 'electron' ? [ + '--runtime=electron', + `--target=${electronVersion}`, + `--arch=${arch}`, + `--dist-url=https://electronjs.org/headers`, + `--loglevel=${loglevel}` + ] : [] ].join(' '), null, { diff --git a/build/webpack-web/webpack.browser.config.ts b/build/webpack-web/webpack.browser.config.ts index 98b832e..f0d9cdf 100644 --- a/build/webpack-web/webpack.browser.config.ts +++ b/build/webpack-web/webpack.browser.config.ts @@ -8,7 +8,7 @@ import fs from 'fs' import { createConfig, webpackDir, devServerPort } from './webpack.base.config'; import {config} from 'dotenv' config({ - path: path.join(__dirname, '../../.env') + path: path.join(__dirname, '../../.env.sample') }) const srcDir = path.resolve('src/bootstrap-web/browser'); diff --git a/build/webpack-web/webpack.config.ts b/build/webpack-web/webpack.config.ts new file mode 100644 index 0000000..a7b963c --- /dev/null +++ b/build/webpack-web/webpack.config.ts @@ -0,0 +1,7 @@ +import browser from './webpack.browser.config'; +import webview from './webpack.webview.config'; +import extHost from './webpack.ext-host.config'; +import workerHost from './webpack.worker-host.config' +import node from './webpack.node.config'; + +export default [browser, webview, extHost, workerHost, node]; \ No newline at end of file diff --git a/build/webpack-web/webpack.ext-host.config.ts b/build/webpack-web/webpack.ext-host.config.ts index df0ba37..fe47b8c 100644 --- a/build/webpack-web/webpack.ext-host.config.ts +++ b/build/webpack-web/webpack.ext-host.config.ts @@ -5,7 +5,7 @@ import { asarDeps } from '../deps' const srcDir = path.resolve('src/bootstrap-web/ext-host'); const outDir = path.join(webpackDir, 'ext-host'); -module.exports = createConfig((_, argv) => ({ +export default createConfig((_, argv) => ({ entry: srcDir, output: { filename: 'index.js', diff --git a/build/webpack-web/webpack.webview.config.ts b/build/webpack-web/webpack.webview.config.ts index a21a15e..1495b39 100644 --- a/build/webpack-web/webpack.webview.config.ts +++ b/build/webpack-web/webpack.webview.config.ts @@ -10,7 +10,7 @@ const tsConfigPath = path.join(__dirname, '../../tsconfig.json'); const distDir = path.join(webpackDir, 'webview'); const port = 8899; -module.exports = { +export default { entry, output: { filename: 'webview.js', diff --git a/build/webpack-web/webpack.worker-host.config.ts b/build/webpack-web/webpack.worker-host.config.ts index 6617e78..0fd6115 100644 --- a/build/webpack-web/webpack.worker-host.config.ts +++ b/build/webpack-web/webpack.worker-host.config.ts @@ -4,7 +4,7 @@ import {webpackDir} from "./webpack.base.config"; import {createConfig} from "../webpack/webpack.base.config"; const outDir = path.join(webpackDir, 'ext-host'); -module.exports = createConfig({ +export default createConfig({ entry: require.resolve('@opensumi/ide-extension/lib/hosted/worker.host-preload'), output: { filename: 'worker-host.js', diff --git a/package.json b/package.json index c0234ec..87ed6ac 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,15 @@ "main": "out/main", "scripts": { "start": "electron-forge start", + "start-web": "ts-node build/webpack-web/web-start.ts", + "electron-rebuild": "node -r ts-node/register ./build/rebuild.ts", + "web-rebuild": "node -r ts-node/register ./build/rebuild.ts --target=web", + "build-web": "webpack --config ./build/webpack-web/webpack.config.ts --progress --color", "package": "electron-forge package", "make": "electron-forge make", - "electron-rebuild": "node -r ts-node/register ./build/rebuild.ts", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "release": "standard-version", - "release:minor": "npm run release -- --release-as minor", - "build-web": "webpack --config ./build/webpack-web/webpack.browser.config.ts --progress --color && webpack --config ./build/webpack-web/webpack.webview.config.ts --progress --color && webpack --config ./build/webpack-web/webpack.ext-host.config.ts --progress --color && webpack --config ./build/webpack-web/webpack.worker-host.config.ts --progress --color && webpack --config ./build/webpack-web/webpack.node.config.ts --progress --color", - "start-web": "ts-node build/webpack-web/web-start.ts" + "release:minor": "npm run release -- --release-as minor" }, "repository": { "type": "git", diff --git a/src/bootstrap-web/common/index.ts b/src/bootstrap-web/common/index.ts index 602b1bc..0b43f07 100644 --- a/src/bootstrap-web/common/index.ts +++ b/src/bootstrap-web/common/index.ts @@ -2,5 +2,5 @@ import {config} from 'dotenv' import path from "path"; config({ - path: path.resolve(__dirname, '../../../.env') + path: path.resolve(__dirname, '../../../..env.sample') }) diff --git a/src/logger/node/log-manager.ts b/src/logger/node/log-manager.ts index d1cc168..b587e2e 100644 --- a/src/logger/node/log-manager.ts +++ b/src/logger/node/log-manager.ts @@ -10,6 +10,6 @@ export class LogServiceManager extends AbstractLogServiceManager { } getLogFolder(): string { - return path.join(process.env.IDE_LOG_HOME!, `window${process.env.CODE_WINDOW_CLIENT_ID!.slice('CODE_WINDOW_CLIENT_ID:'.length)}`) + return path.join(process.env.IDE_LOG_HOME || '', `window${process.env.CODE_WINDOW_CLIENT_ID?.slice('CODE_WINDOW_CLIENT_ID:'?.length)}`) } } diff --git a/yarn.lock b/yarn.lock index f5ec97f..020a9ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -142,7 +142,7 @@ __metadata: languageName: node linkType: hard -"@electron-forge/cli@npm:^7.4.0": +"@electron-forge/cli@npm:^7.5.0": version: 7.6.0 resolution: "@electron-forge/cli@npm:7.6.0" dependencies: @@ -464,18 +464,7 @@ __metadata: languageName: node linkType: hard -"@electron/notarize@npm:2.2.1": - version: 2.2.1 - resolution: "@electron/notarize@npm:2.2.1" - dependencies: - debug: "npm:^4.1.1" - fs-extra: "npm:^9.0.1" - promise-retry: "npm:^2.0.1" - checksum: 10/6d5bb78a0ba0af59a07daf01ace17a33869893641639c94d0f74ca060698d8cf61fca4002c61592a70f6f20e03987fc1138625853d947394749b1bd46ed2db3c - languageName: node - linkType: hard - -"@electron/notarize@npm:^2.1.0": +"@electron/notarize@npm:2.5.0, @electron/notarize@npm:^2.1.0": version: 2.5.0 resolution: "@electron/notarize@npm:2.5.0" dependencies: @@ -486,24 +475,7 @@ __metadata: languageName: node linkType: hard -"@electron/osx-sign@npm:1.0.5": - version: 1.0.5 - resolution: "@electron/osx-sign@npm:1.0.5" - dependencies: - compare-version: "npm:^0.1.2" - debug: "npm:^4.3.4" - fs-extra: "npm:^10.0.0" - isbinaryfile: "npm:^4.0.8" - minimist: "npm:^1.2.6" - plist: "npm:^3.0.5" - bin: - electron-osx-flat: bin/electron-osx-flat.js - electron-osx-sign: bin/electron-osx-sign.js - checksum: 10/b8df7c097954e754fec99544d5c6787bcc53de5125557399978ec17084bfb7e8d94b6857b5b2b14f6b2c030cd1086f05f816615a6480a7b581ac8584e2120fcf - languageName: node - linkType: hard - -"@electron/osx-sign@npm:^1.0.5": +"@electron/osx-sign@npm:1.3.1, @electron/osx-sign@npm:^1.0.5": version: 1.3.1 resolution: "@electron/osx-sign@npm:1.3.1" dependencies: @@ -549,6 +521,30 @@ __metadata: languageName: node linkType: hard +"@electron/rebuild@npm:3.6.1": + version: 3.6.1 + resolution: "@electron/rebuild@npm:3.6.1" + dependencies: + "@malept/cross-spawn-promise": "npm:^2.0.0" + chalk: "npm:^4.0.0" + debug: "npm:^4.1.1" + detect-libc: "npm:^2.0.1" + fs-extra: "npm:^10.0.0" + got: "npm:^11.7.0" + node-abi: "npm:^3.45.0" + node-api-version: "npm:^0.2.0" + node-gyp: "npm:^9.0.0" + ora: "npm:^5.1.0" + read-binary-file-arch: "npm:^1.0.6" + semver: "npm:^7.3.5" + tar: "npm:^6.0.5" + yargs: "npm:^17.0.1" + bin: + electron-rebuild: lib/cli.js + checksum: 10/baedb09a8b109347fd1e7ee16559b4519ebc56a4ec624b3eec5215282a66def5fa4b96c19a26df0f53cd3ab60f077e88cd03429b46ddc63e70279f30c8e20c8a + languageName: node + linkType: hard + "@electron/rebuild@npm:^3.7.0": version: 3.7.1 resolution: "@electron/rebuild@npm:3.7.1" @@ -574,22 +570,7 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.5.1": - version: 1.5.1 - resolution: "@electron/universal@npm:1.5.1" - dependencies: - "@electron/asar": "npm:^3.2.1" - "@malept/cross-spawn-promise": "npm:^1.1.0" - debug: "npm:^4.3.1" - dir-compare: "npm:^3.0.0" - fs-extra: "npm:^9.0.1" - minimatch: "npm:^3.0.4" - plist: "npm:^3.0.4" - checksum: 10/9e6cd5dbc05350c1a0e9a947651171de5d5e36976094f9dd2267451b872cd6b6759cb40cf222bf8b4383a7d86103cacb5eeeeb532f27c64c439c77ba50fa61f1 - languageName: node - linkType: hard - -"@electron/universal@npm:^2.0.1": +"@electron/universal@npm:2.0.1, @electron/universal@npm:^2.0.1": version: 2.0.1 resolution: "@electron/universal@npm:2.0.1" dependencies: @@ -774,15 +755,6 @@ __metadata: languageName: node linkType: hard -"@malept/cross-spawn-promise@npm:^1.1.0": - version: 1.1.1 - resolution: "@malept/cross-spawn-promise@npm:1.1.1" - dependencies: - cross-spawn: "npm:^7.0.1" - checksum: 10/8f04dcbe023e7ee4e82040e32aa29c1774a2d79a36d4a1df2da381281f99419e51a950c77d54662cfd2bc9195db2fbb0068e0f790ac08d7ad981180687051e96 - languageName: node - linkType: hard - "@malept/cross-spawn-promise@npm:^2.0.0": version: 2.0.0 resolution: "@malept/cross-spawn-promise@npm:2.0.0" @@ -2879,10 +2851,10 @@ __metadata: languageName: node linkType: hard -"app-builder-bin@npm:4.0.0": - version: 4.0.0 - resolution: "app-builder-bin@npm:4.0.0" - checksum: 10/5d401b2670acb381c76f96467320af0569748c66950adacc239ef85f5ac9d7b44e93c387ad3fea22c25d42ca9f6f6ccd53e827cdf9eb6b6cddd2091d88c5289d +"app-builder-bin@npm:5.0.0-alpha.10": + version: 5.0.0-alpha.10 + resolution: "app-builder-bin@npm:5.0.0-alpha.10" + checksum: 10/842dc0cade3f1dc2c3fc2809511a4ecb86146d17d22e35d97a493bf3c8bd131552e935abd8ed8df40f6f62d8b231b7b705c81df709becdd55dc28dc6f247af31 languageName: node linkType: hard @@ -2893,41 +2865,46 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:24.13.3": - version: 24.13.3 - resolution: "app-builder-lib@npm:24.13.3" +"app-builder-lib@npm:25.1.8": + version: 25.1.8 + resolution: "app-builder-lib@npm:25.1.8" dependencies: "@develar/schema-utils": "npm:~2.6.5" - "@electron/notarize": "npm:2.2.1" - "@electron/osx-sign": "npm:1.0.5" - "@electron/universal": "npm:1.5.1" + "@electron/notarize": "npm:2.5.0" + "@electron/osx-sign": "npm:1.3.1" + "@electron/rebuild": "npm:3.6.1" + "@electron/universal": "npm:2.0.1" "@malept/flatpak-bundler": "npm:^0.4.0" "@types/fs-extra": "npm:9.0.13" async-exit-hook: "npm:^2.0.1" bluebird-lst: "npm:^1.0.9" - builder-util: "npm:24.13.1" - builder-util-runtime: "npm:9.2.4" + builder-util: "npm:25.1.7" + builder-util-runtime: "npm:9.2.10" chromium-pickle-js: "npm:^0.2.0" + config-file-ts: "npm:0.2.8-rc1" debug: "npm:^4.3.4" + dotenv: "npm:^16.4.5" + dotenv-expand: "npm:^11.0.6" ejs: "npm:^3.1.8" - electron-publish: "npm:24.13.1" + electron-publish: "npm:25.1.7" form-data: "npm:^4.0.0" fs-extra: "npm:^10.1.0" hosted-git-info: "npm:^4.1.0" is-ci: "npm:^3.0.0" isbinaryfile: "npm:^5.0.0" js-yaml: "npm:^4.1.0" + json5: "npm:^2.2.3" lazy-val: "npm:^1.0.5" - minimatch: "npm:^5.1.1" - read-config-file: "npm:6.3.2" + minimatch: "npm:^10.0.0" + resedit: "npm:^1.7.0" sanitize-filename: "npm:^1.6.3" semver: "npm:^7.3.8" tar: "npm:^6.1.12" temp-file: "npm:^3.4.0" peerDependencies: - dmg-builder: 24.13.3 - electron-builder-squirrel-windows: 24.13.3 - checksum: 10/4379dc87e0e037a8e11eead68195673680fb4f90570bdc19fffa301d4c5bf5dcac2d38738885fed2cae5eeb5be9be0c93d682ee25e376322a25d0767dec4a415 + dmg-builder: 25.1.8 + electron-builder-squirrel-windows: 25.1.8 + checksum: 10/0af82ffd8389b6dbacffd0ee3191ed056b411f069c362e0f676bf00413d8cb14f0d6d9047e1ab388a578e7f41c8338daa489a259de1203d4b9fc465254dda685 languageName: node linkType: hard @@ -3426,13 +3403,6 @@ __metadata: languageName: node linkType: hard -"buffer-equal@npm:^1.0.0": - version: 1.0.1 - resolution: "buffer-equal@npm:1.0.1" - checksum: 10/0d56dbeec3d862b16f07fe1cc27751adab26219ff37b90fb0be1fe5c870ce1ce3ed45aad9d9b8c631dfc0e147315d02385ddefaf7f6cb24f067f91a2f8def324 - languageName: node - linkType: hard - "buffer-fill@npm:^1.0.0": version: 1.0.0 resolution: "buffer-fill@npm:1.0.0" @@ -3484,37 +3454,27 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.2.4": - version: 9.2.4 - resolution: "builder-util-runtime@npm:9.2.4" - dependencies: - debug: "npm:^4.3.4" - sax: "npm:^1.2.4" - checksum: 10/6b4b6518f8859a90cd6b49ff8053134d731438a588496e5f517ec6d12baef3f1a1c74aaa3142f9d4c61979fca1addc3e47432a956c122cfad582b2145a3df077 - languageName: node - linkType: hard - -"builder-util@npm:24.13.1": - version: 24.13.1 - resolution: "builder-util@npm:24.13.1" +"builder-util@npm:25.1.7": + version: 25.1.7 + resolution: "builder-util@npm:25.1.7" dependencies: 7zip-bin: "npm:~5.2.0" "@types/debug": "npm:^4.1.6" - app-builder-bin: "npm:4.0.0" + app-builder-bin: "npm:5.0.0-alpha.10" bluebird-lst: "npm:^1.0.9" - builder-util-runtime: "npm:9.2.4" + builder-util-runtime: "npm:9.2.10" chalk: "npm:^4.1.2" cross-spawn: "npm:^7.0.3" debug: "npm:^4.3.4" fs-extra: "npm:^10.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.1" + http-proxy-agent: "npm:^7.0.0" + https-proxy-agent: "npm:^7.0.0" is-ci: "npm:^3.0.0" js-yaml: "npm:^4.1.0" source-map-support: "npm:^0.5.19" stat-mode: "npm:^1.0.0" temp-file: "npm:^3.4.0" - checksum: 10/e63836c92010868e9ec8f06e7bfed9b4029915f4375e5173a46f14189204d2eacc1043495208f31d762ef519bcaaf70af625dc5db74290c551654afbb2aad0fd + checksum: 10/180817a9f5e24770050a2b23acb6b47e55156ee83c7296329ee538a1ec202cf21a626de9d731f4b674ab1d63bd995b152b02d8e8a4b3133a1964a586f0cc9037 languageName: node linkType: hard @@ -3949,7 +3909,7 @@ __metadata: version: 0.0.0-use.local resolution: "codefuse-ide@workspace:." dependencies: - "@electron-forge/cli": "npm:^7.4.0" + "@electron-forge/cli": "npm:^7.5.0" "@electron-forge/maker-squirrel": "npm:^7.5.0" "@electron-forge/maker-zip": "npm:^7.4.0" "@electron-forge/plugin-base": "npm:^7.4.0" @@ -4016,7 +3976,7 @@ __metadata: "@types/react-dom": "npm:^18.3.1" "@vscode/spdlog": "npm:^0.15.0" app-builder-bin: "npm:^4.2.0" - app-builder-lib: "npm:24.13.3" + app-builder-lib: "npm:25.1.8" asar: "npm:^3.2.0" buffer: "npm:^6.0.3" chalk: "npm:^4.0.0" @@ -4070,7 +4030,7 @@ __metadata: keytar: built: false node-pty: - built: true + built: false nsfw: built: false spdlog: @@ -4314,13 +4274,13 @@ __metadata: languageName: node linkType: hard -"config-file-ts@npm:^0.2.4": - version: 0.2.6 - resolution: "config-file-ts@npm:0.2.6" +"config-file-ts@npm:0.2.8-rc1": + version: 0.2.8-rc1 + resolution: "config-file-ts@npm:0.2.8-rc1" dependencies: - glob: "npm:^10.3.10" - typescript: "npm:^5.3.3" - checksum: 10/825342ad226109606c701ccd8cb6a874142c0e3369d64ebc7d5a2c3f380ea9008cf20f807634d7943e42c0caa54227381e702f1deed9bb3b8d4a3e3483535117 + glob: "npm:^10.3.12" + typescript: "npm:^5.4.3" + checksum: 10/30884f67de343e2fa7914246c14296c6f4ed6dfcf86c833698fb97be46bc7d8cc9897b53a559d2267e711fbd83deda05d0baeba499151353bd245bfe10f23387 languageName: node linkType: hard @@ -5376,16 +5336,6 @@ __metadata: languageName: node linkType: hard -"dir-compare@npm:^3.0.0": - version: 3.3.0 - resolution: "dir-compare@npm:3.3.0" - dependencies: - buffer-equal: "npm:^1.0.0" - minimatch: "npm:^3.0.4" - checksum: 10/4e4ca87564bd1fe86d5b704842e1ba069b172ae507e0420e5cef68dbbc9c5a42753416be38488587bc2c7944a4b4a580af724a686e9ad79150012d1d02efe769 - languageName: node - linkType: hard - "dir-compare@npm:^4.2.0": version: 4.2.0 resolution: "dir-compare@npm:4.2.0" @@ -5505,17 +5455,19 @@ __metadata: languageName: node linkType: hard -"dotenv-expand@npm:^5.1.0": - version: 5.1.0 - resolution: "dotenv-expand@npm:5.1.0" - checksum: 10/d52af2a6e4642979ae4221408f1b75102508dbe4f5bac1c0613f92a3cf3880d5c31f86b2f5cff3273f7c23e10421e75028546e8b6cd0376fcd20e3803b374e15 +"dotenv-expand@npm:^11.0.6": + version: 11.0.7 + resolution: "dotenv-expand@npm:11.0.7" + dependencies: + dotenv: "npm:^16.4.5" + checksum: 10/1cd981e2b925e746919e9fca16fa5e953955d021b5d5fea0a4ae96dc61fcc76bc95874e7730f8ceca22f5e3df5a47eb1fc626c3f45e98019ceba54fd58521971 languageName: node linkType: hard -"dotenv@npm:^9.0.2": - version: 9.0.2 - resolution: "dotenv@npm:9.0.2" - checksum: 10/8a31ab90b097907a42932b972228e10470e8f0de9aea58c7f2134582e7810f229a2ce5861af40efeb7751c7bf2aae0c8347d72ba3935b72c834fbbac30f80f08 +"dotenv@npm:^16.4.5": + version: 16.4.7 + resolution: "dotenv@npm:16.4.7" + checksum: 10/f13bfe97db88f0df4ec505eeffb8925ec51f2d56a3d0b6d916964d8b4af494e6fb1633ba5d09089b552e77ab2a25de58d70259b2c5ed45ec148221835fc99a0c languageName: node linkType: hard @@ -5565,18 +5517,18 @@ __metadata: languageName: node linkType: hard -"electron-publish@npm:24.13.1": - version: 24.13.1 - resolution: "electron-publish@npm:24.13.1" +"electron-publish@npm:25.1.7": + version: 25.1.7 + resolution: "electron-publish@npm:25.1.7" dependencies: "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:24.13.1" - builder-util-runtime: "npm:9.2.4" + builder-util: "npm:25.1.7" + builder-util-runtime: "npm:9.2.10" chalk: "npm:^4.1.2" fs-extra: "npm:^10.1.0" lazy-val: "npm:^1.0.5" mime: "npm:^2.5.2" - checksum: 10/60133b51bf186a70f710d6f656901d0ec358bcd688294c675711107d947fe961ebaf99fee7108f3a48270b09e0ef71568b0148df363de2dfb09a3c7bb1475c62 + checksum: 10/75a3e6bcb796423456e01fb79d7c39257ae9a9ea9820ddbc64321ac888867da33198693af87366137d6c13b66a4273e89d15c268184bbddc24db6585d16067c1 languageName: node linkType: hard @@ -6816,7 +6768,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": +"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.12, glob@npm:^10.3.7": version: 10.4.5 resolution: "glob@npm:10.4.5" dependencies: @@ -7384,7 +7336,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": +"https-proxy-agent@npm:^5.0.0": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -7394,7 +7346,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^7.0.1": +"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1": version: 7.0.6 resolution: "https-proxy-agent@npm:7.0.6" dependencies: @@ -8268,7 +8220,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.1.2, json5@npm:^2.2.0, json5@npm:^2.2.2": +"json5@npm:^2.1.2, json5@npm:^2.2.2, json5@npm:^2.2.3": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -8472,7 +8424,7 @@ __metadata: languageName: node linkType: hard -"lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": +"lazy-val@npm:^1.0.5": version: 1.0.5 resolution: "lazy-val@npm:1.0.5" checksum: 10/31e12e0b118826dfae74f8f3ff8ebcddfe4200ff88d0d448db175c7265ee537e0ba55488d411728246337f3ed3c9ec68416f10889f632a2ce28fb7a970909fb5 @@ -9260,7 +9212,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^5.0.1, minimatch@npm:^5.1.1": +"minimatch@npm:^5.0.1": version: 5.1.6 resolution: "minimatch@npm:5.1.6" dependencies: @@ -9731,7 +9683,7 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:^9.4.0": +"node-gyp@npm:^9.0.0, node-gyp@npm:^9.4.0": version: 9.4.1 resolution: "node-gyp@npm:9.4.1" dependencies: @@ -10591,6 +10543,13 @@ __metadata: languageName: node linkType: hard +"pe-library@npm:^0.4.1": + version: 0.4.1 + resolution: "pe-library@npm:0.4.1" + checksum: 10/39aa0a756a6521b23326fbb2ccaa157406feb695146aa32f9a2b901c6a6d788ae290a2d3272880df2bc514ad73cd9b2e5fcd4ef4968bcaf626d7a9459a8c7d31 + languageName: node + linkType: hard + "pe-library@npm:^1.0.1": version: 1.0.1 resolution: "pe-library@npm:1.0.1" @@ -10697,7 +10656,7 @@ __metadata: languageName: node linkType: hard -"plist@npm:^3.0.0, plist@npm:^3.0.4, plist@npm:^3.0.5, plist@npm:^3.1.0": +"plist@npm:^3.0.0, plist@npm:^3.0.5, plist@npm:^3.1.0": version: 3.1.0 resolution: "plist@npm:3.1.0" dependencies: @@ -11766,20 +11725,6 @@ __metadata: languageName: node linkType: hard -"read-config-file@npm:6.3.2": - version: 6.3.2 - resolution: "read-config-file@npm:6.3.2" - dependencies: - config-file-ts: "npm:^0.2.4" - dotenv: "npm:^9.0.2" - dotenv-expand: "npm:^5.1.0" - js-yaml: "npm:^4.1.0" - json5: "npm:^2.2.0" - lazy-val: "npm:^1.0.4" - checksum: 10/c3a6444105fc1736d6fa15979d1d18e9f0a1165bf3966f1751af676d153f92df9fc7c07158162b62d222919e561e135bdd6155c6fff79f1ed8b78a5a394a579b - languageName: node - linkType: hard - "read-package-up@npm:^11.0.0": version: 11.0.0 resolution: "read-package-up@npm:11.0.0" @@ -12029,6 +11974,15 @@ __metadata: languageName: node linkType: hard +"resedit@npm:^1.7.0": + version: 1.7.2 + resolution: "resedit@npm:1.7.2" + dependencies: + pe-library: "npm:^0.4.1" + checksum: 10/0fc470cb320a6dbbc85c38abd695cb90ca075d9dbea96846fa5f84ab8add23aa39a02520d70f14c93c84181ba4812a5513da7c79df7491826e7b423cee4e058f + languageName: node + linkType: hard + "resedit@npm:^2.0.0": version: 2.0.3 resolution: "resedit@npm:2.0.3" @@ -13883,7 +13837,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.3.3, typescript@npm:^5.5.3": +"typescript@npm:^5.4.3, typescript@npm:^5.5.3": version: 5.7.2 resolution: "typescript@npm:5.7.2" bin: @@ -13893,7 +13847,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^5.3.3#optional!builtin, typescript@patch:typescript@npm%3A^5.5.3#optional!builtin": +"typescript@patch:typescript@npm%3A^5.4.3#optional!builtin, typescript@patch:typescript@npm%3A^5.5.3#optional!builtin": version: 5.7.2 resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin::version=5.7.2&hash=379a07" bin: @@ -14963,4 +14917,4 @@ __metadata: resolution: "yocto-queue@npm:0.1.0" checksum: 10/f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700 languageName: node - linkType: hard \ No newline at end of file + linkType: hard