diff --git a/.erb/configs/webpack.config.base.ts b/.erb/configs/webpack.config.base.ts index d01faba..9dd7298 100644 --- a/.erb/configs/webpack.config.base.ts +++ b/.erb/configs/webpack.config.base.ts @@ -20,6 +20,10 @@ export default { loader: "ts-loader", }, }, + { + test: /\.node$/, + loader: "node-loader", + }, ], }, diff --git a/package.json b/package.json index 70461c5..3cba2cc 100644 --- a/package.json +++ b/package.json @@ -243,6 +243,7 @@ "jest": "^27.2.5", "lint-staged": "^11.2.3", "mini-css-extract-plugin": "^2.4.2", + "node-loader": "^2.1.0", "prettier": "^2.4.1", "react-refresh": "^0.14.0", "rimraf": "^3.0.2", @@ -343,4 +344,4 @@ "pre-commit": "lint-staged" } } -} \ No newline at end of file +} diff --git a/release/app/package.json b/release/app/package.json index d46b8cc..8f221c5 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -24,7 +24,7 @@ "ws": "^8.16.0" }, "optionalDependencies": { - "@setapp/framework-wrapper": "^4.3.3" + "@setapp/framework-wrapper": "^4.3.4" }, "devDependencies": { "electron": "^27.3.8", @@ -34,4 +34,4 @@ "bufferutil": "4.0.3", "utf-8-validate": "5.0.6" } -} \ No newline at end of file +} diff --git a/src/main/main.ts b/src/main/main.ts index 307c5a4..7319bd1 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -30,6 +30,14 @@ import logger from "../utils/logger"; import { setupIPCForwardingToWebApp } from "./actions/setupIPCForwarding"; import { saveCookies } from "./actions/cookiesHelpers"; +if (process.env.IS_SETAPP_BUILD === "true") { + log.log("[SETAPP] build identified") + const setappFramework = require("@setapp/framework-wrapper"); + setappFramework.SetappManager.shared.reportUsageEvent(setappFramework.SETAPP_USAGE_EVENT.USER_INTERACTION); + log.log("[SETAPP] integration complete") +} + + // Init remote so that it could be consumed in renderer const remote = require("@electron/remote/main"); remote.initialize(); @@ -427,15 +435,7 @@ app.on("window-all-closed", () => { app .whenReady() .then(() => { - if (process.env.IS_SETAPP_BUILD === "true") { - log.log("[SETAPP] build identified") - const setappFramework = require("@setapp/framework-wrapper"); - setappFramework.SetappManager.shared.reportUsageEvent(setappFramework.SETAPP_USAGE_EVENT.USER_INTERACTION); - log.log("[SETAPP] integration complete") - } - app.on("activate", () => { - // On macOS it's common to re-create a window in the app when the // dock icon is clicked and there are no other windows open. if (BrowserWindow.getAllWindows().length === 0) {