From 78fc832ba6cfc7daa1fa2412b635d42986396921 Mon Sep 17 00:00:00 2001 From: BlackHole1 <158blackhole@gmail.com> Date: Fri, 10 Sep 2021 11:56:33 +0800 Subject: [PATCH] fix(project): run bootstrap script fail in linux agora-electron-sdk has npm install hook, it will read `process.env.npm_config_*` but our scripts to modify npmrc in preinstall. modifying npmrc in preinstall will not refresh the current `process.env_npm_config_*` immediately. this will cause agora-electron-sdk to use the default value, and agora-electron-sdk does not support linux, resulting in an error. so just let them execute in two processes. --- desktop/main-app/scripts/Download-agora-addon.js | 2 +- package.json | 6 +++--- .../agora-electron-options.js | 0 .../configure-agora-sdk.js | 0 scripts/{preinstall => init-agora-configure}/index.js | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename scripts/{preinstall => init-agora-configure}/agora-electron-options.js (100%) rename scripts/{preinstall => init-agora-configure}/configure-agora-sdk.js (100%) rename scripts/{preinstall => init-agora-configure}/index.js (100%) diff --git a/desktop/main-app/scripts/Download-agora-addon.js b/desktop/main-app/scripts/Download-agora-addon.js index 27a91e528e3..241df66d91d 100755 --- a/desktop/main-app/scripts/Download-agora-addon.js +++ b/desktop/main-app/scripts/Download-agora-addon.js @@ -19,7 +19,7 @@ const argv = { }; const electronVersion = - require("../../../scripts/preinstall/agora-electron-options").electron_version; + require("../../../scripts/init-agora-configure/agora-electron-options").electron_version; const agoraVersion = require(path.join(agoraElectronSdkPath, "package.json")).version; fs.removeSync(path.join(agoraElectronSdkPath, "build")); diff --git a/package.json b/package.json index 5a08947e62c..cb60765397c 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,8 @@ "name": "flat-monorepo", "private": true, "scripts": { - "preinstall": "node ./scripts/preinstall", "postinstall": "husky install", - "bootstrap": "yarn install --frozen-lockfile", + "bootstrap": "yarn run _init:agora-configure && yarn install --frozen-lockfile", "lint": "yarn workspaces run lint", "check-spelling": "cspell --no-progress \"**/*.{md,ts,tsx,js,css,less,json,yml,yaml,html,sh}\"", "storybook": "yarn workspace flat-components start", @@ -13,7 +12,8 @@ "ship": "yarn workspace renderer-app build && yarn workspace flat ship", "ship:mac": "yarn workspace renderer-app build && yarn workspace flat ship:mac", "ship:win": "yarn workspace renderer-app build && yarn workspace flat ship:win", - "ship:all": "yarn workspace renderer-app build && yarn workspace flat ship:win && yarn workspace flat pack:mac" + "ship:all": "yarn workspace renderer-app build && yarn workspace flat ship:win && yarn workspace flat pack:mac", + "_init:agora-configure": "node scripts/init-agora-configure" }, "workspaces": { "packages": [ diff --git a/scripts/preinstall/agora-electron-options.js b/scripts/init-agora-configure/agora-electron-options.js similarity index 100% rename from scripts/preinstall/agora-electron-options.js rename to scripts/init-agora-configure/agora-electron-options.js diff --git a/scripts/preinstall/configure-agora-sdk.js b/scripts/init-agora-configure/configure-agora-sdk.js similarity index 100% rename from scripts/preinstall/configure-agora-sdk.js rename to scripts/init-agora-configure/configure-agora-sdk.js diff --git a/scripts/preinstall/index.js b/scripts/init-agora-configure/index.js similarity index 100% rename from scripts/preinstall/index.js rename to scripts/init-agora-configure/index.js