diff --git a/.pnp.cjs b/.pnp.cjs index 5ca9a9fc..718baae0 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -68,6 +68,7 @@ const RAW_RUNTIME_STATE = ["@xterm/addon-web-links", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:0.11.0"],\ ["@xterm/addon-webgl", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:0.18.0"],\ ["@xterm/xterm", "npm:5.5.0"],\ + ["acorn", "npm:8.14.1"],\ ["args", "npm:5.0.3"],\ ["ava", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#https://github.com/quine-global/ava.git#commit=38aebe3badef8d54f68e8315e9849cfa83d531fe"],\ ["babel-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:9.2.1"],\ @@ -96,6 +97,7 @@ const RAW_RUNTIME_STATE = ["eslint-plugin-lodash", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.4.0"],\ ["eslint-plugin-prettier", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:5.2.6"],\ ["eslint-plugin-react", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.37.2"],\ + ["fs-extra", "npm:11.3.0"],\ ["got", "npm:12.4.1"],\ ["husky", "npm:9.1.7"],\ ["husky-init", "npm:8.0.0"],\ @@ -8057,6 +8059,7 @@ const RAW_RUNTIME_STATE = ["@xterm/addon-web-links", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:0.11.0"],\ ["@xterm/addon-webgl", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:0.18.0"],\ ["@xterm/xterm", "npm:5.5.0"],\ + ["acorn", "npm:8.14.1"],\ ["args", "npm:5.0.3"],\ ["ava", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#https://github.com/quine-global/ava.git#commit=38aebe3badef8d54f68e8315e9849cfa83d531fe"],\ ["babel-loader", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:9.2.1"],\ @@ -8085,6 +8088,7 @@ const RAW_RUNTIME_STATE = ["eslint-plugin-lodash", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.4.0"],\ ["eslint-plugin-prettier", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:5.2.6"],\ ["eslint-plugin-react", "virtual:10fae7a043ccd231630f94a65503420470de4ae67433d574f9d2d8a25b0881495f548c527bc570bb5feb199f52f9c2d492ebaf378fb1b066878b8d28b0733f55#npm:7.37.2"],\ + ["fs-extra", "npm:11.3.0"],\ ["got", "npm:12.4.1"],\ ["husky", "npm:9.1.7"],\ ["husky-init", "npm:8.0.0"],\ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 9e6d6f04..a8298346 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/.yarnrc.yml b/.yarnrc.yml index 53d1158a..fe7ac650 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -9,3 +9,4 @@ nodeLinker: pnp npmRegistryServer: "https://registry.yarnpkg.com" yarnPath: .yarn/releases/yarn-4.9.1.cjs + diff --git a/package.json b/package.json index a81f9db8..c2564680 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,7 @@ "@types/uuid": "10.0.0", "@typescript-eslint/eslint-plugin": "7.0.0", "@typescript-eslint/parser": "6.21.0", + "acorn": "^8.14.1", "babel-loader": "9.2.1", "concurrently": "9.1.0", "copy-webpack-plugin": "12.0.2", @@ -130,6 +131,7 @@ "eslint-plugin-lodash": "^7.4.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "7.37.2", + "fs-extra": "^11.3.0", "husky": "^9.1.7", "husky-init": "^8.0.0", "inquirer": "10.1.8", @@ -160,5 +162,10 @@ "@types/retry": "0.12.5", "node-abi": "^3.67.0" }, - "packageManager": "yarn@4.9.1" + "packageManager": "yarn@4.9.1", + "dependenciesMeta": { + "electron-mksnapshot@34.5.1": { + "unplugged": true + } + } } diff --git a/scripts/mk-snapshot.js b/scripts/mk-snapshot.js index 56a85c7d..9d6b006d 100644 --- a/scripts/mk-snapshot.js +++ b/scripts/mk-snapshot.js @@ -1,5 +1,7 @@ const { execSync } = require("child_process"); const pkg = require("../package.json"); +const path = require("path"); +const pnp = require("pnpapi"); const version = pkg.devDependencies.electron; if (!version) { @@ -8,5 +10,10 @@ if (!version) { } process.env.ELECTRON_CUSTOM_VERSION = version; -execSync("node node_modules/electron-mksnapshot/download-mksnapshot.js", { stdio: "inherit" }); -execSync("node bin/mk-snapshot.js", { stdio: "inherit" }); + + +const downloadScript = pnp.resolveToUnqualified("electron-mksnapshot/download-mksnapshot.js", __filename); +const mkSnapshotScript = path.resolve(__dirname, "../bin/mk-snapshot.js"); + +execSync(`node ${downloadScript}`, { stdio: "inherit" }); +execSync(`node ${mkSnapshotScript}`, { stdio: "inherit" }); diff --git a/yarn.lock b/yarn.lock index 3280173f..43f2760a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2545,7 +2545,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.11.0, acorn@npm:^8.13.0, acorn@npm:^8.14.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.8.2, acorn@npm:^8.9.0": +"acorn@npm:^8.0.4, acorn@npm:^8.11.0, acorn@npm:^8.13.0, acorn@npm:^8.14.0, acorn@npm:^8.14.1, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.14.1 resolution: "acorn@npm:8.14.1" bin: @@ -5689,7 +5689,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.1.1": +"fs-extra@npm:^11.1.1, fs-extra@npm:^11.3.0": version: 11.3.0 resolution: "fs-extra@npm:11.3.0" dependencies: @@ -6405,6 +6405,7 @@ __metadata: "@xterm/addon-web-links": "npm:0.11.0" "@xterm/addon-webgl": "npm:0.18.0" "@xterm/xterm": "npm:5.5.0" + acorn: "npm:^8.14.1" args: "npm:5.0.3" ava: "https://github.com/quine-global/ava#38aebe3badef8d54f68e8315e9849cfa83d531fe" babel-loader: "npm:9.2.1" @@ -6433,6 +6434,7 @@ __metadata: eslint-plugin-lodash: "npm:^7.4.0" eslint-plugin-prettier: "npm:^5.2.1" eslint-plugin-react: "npm:7.37.2" + fs-extra: "npm:^11.3.0" got: "npm:12.4.1" husky: "npm:^9.1.7" husky-init: "npm:^8.0.0" @@ -6476,6 +6478,9 @@ __metadata: uuid: "npm:10.0.0" webpack: "npm:5.96.1" webpack-cli: "npm:5.1.4" + dependenciesMeta: + electron-mksnapshot@34.5.1: + unplugged: true languageName: unknown linkType: soft