diff --git a/.erb/configs/webpack.config.main.prod.ts b/.erb/configs/webpack.config.main.prod.ts index 13e614ec..1ec04d65 100644 --- a/.erb/configs/webpack.config.main.prod.ts +++ b/.erb/configs/webpack.config.main.prod.ts @@ -68,6 +68,8 @@ export default merge(baseConfig, { DEBUG_PROD: false, START_MINIMIZED: false, IS_SETAPP_BUILD: false, + IS_BETA_BUILD: false, + PREVIEW_URL: '' }), ], diff --git a/package.json b/package.json index 9180b752..84fc2fe7 100644 --- a/package.json +++ b/package.json @@ -6,12 +6,16 @@ "private": true, "description": "Intercept & Modify HTTP Requests", "scripts": { - "build": "ts-node ./.erb/scripts/clean.js dist && concurrently \"npm run build:main\" \"npm run build:renderer\"", + "cleanup": "ts-node ./.erb/scripts/clean.js dist", + "build": "npm run cleanup && concurrently \"npm run build:main\" \"npm run build:renderer\"", + "build:beta": "npm run cleanup && concurrently \"npm run build:main:beta\" \"npm run build:renderer\"", "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts", + "build:main:beta": "cross-env IS_BETA_BUILD=true PREVIEW_URL=$PREVIEW_URL npm run build:main", "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts", "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src", "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx", "package": "npm run build && electron-builder build --publish never", + "package:beta": "npm run build:beta && electron-builder build --publish never", "package:setapp": "cross-env IS_SETAPP_BUILD=true npm run build && electron-builder build --config electron-builder-setapp.json --mac --universal --publish never", "deploy": "npm run build && electron-builder build --publish always", "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts", diff --git a/release/app/package-lock.json b/release/app/package-lock.json index d0eec57f..3befa11e 100644 --- a/release/app/package-lock.json +++ b/release/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "requestly", - "version": "26.1.6", + "version": "26.1.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "requestly", - "version": "26.1.6", + "version": "26.1.10", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -986,6 +986,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -1713,6 +1714,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } diff --git a/release/app/package.json b/release/app/package.json index 0ec69ba0..f4e2098e 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -1,7 +1,7 @@ { "name": "requestly", "productName": "Requestly", - "version": "26.1.6", + "version": "26.1.10", "private": true, "description": "Intercept & Modify HTTP Requests", "main": "./dist/main/main.js", diff --git a/src/main/main.ts b/src/main/main.ts index 3fbf2a6c..cddde1f3 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -68,6 +68,11 @@ const getAssetPath = (...paths: string[]): string => { const isDevelopment = process.env.NODE_ENV === "development" || process.env.DEBUG_PROD === "true"; +const DESKTOP_APP_URL = isDevelopment ? 'http://localhost:3000' : + process.env.IS_BETA_BUILD == "true" ? + process.env.PREVIEW_URL ? process.env.PREVIEW_URL : "https://beta.requestly.io" : + "https://app.requestly.io" + if (isDevelopment) { const sourceMapSupport = require("source-map-support"); sourceMapSupport.install(); @@ -232,10 +237,6 @@ const createWindow = async () => { new AutoUpdate(webAppWindow); remote.enable(webAppWindow.webContents); - // TODO @sahil: Prod and Local Urls should be supplied by @requestly/requestly-core-npm package. - const DESKTOP_APP_URL = isDevelopment - ? "http://localhost:3000" - : "https://app.requestly.io"; webAppWindow.loadURL(DESKTOP_APP_URL, { extraHeaders: "pragma: no-cache\n", });