From 5af944c9265475ad2f2824359649d4ed8a569b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Maih=C3=B6fer?= Date: Wed, 28 Feb 2024 15:54:35 +0100 Subject: [PATCH] talkerapi from shared repo, do not sign build --- package.json | 34 ++++++++++++++++++++------------- src/cables.js | 2 +- src/utils/doc_util.js | 2 +- src/utils/helper_util.js | 2 +- src/utils/logger.js | 2 +- src/utils/ops_util.js | 2 +- src/utils/projects_util.js | 2 +- src/utils/subpatchop_util.js | 2 +- src_client/standalone_editor.js | 9 ++++----- 9 files changed, 32 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 2d6ec62..80c8ea7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cables_standalone", - "version": "0.0.1", + "version": "0.0.3", "author": "undefined development", "description": "current templates for the different exe-exports in cables.gl", "repository": { @@ -17,8 +17,14 @@ "start": "electron .", "build": "gulp build", "build:source": "gulp build:source", - "pack": "electron-builder --dir --config -c.mac.identity=null", - "dist": "electron-builder -mwl --config -c.mac.identity=null" + "pack": "electron-builder -mwl --dir", + "pack:mac": "electron-builder -m --dir", + "pack:win": "electron-builder -w --dir", + "pack:linux": "electron-builder -l --dir", + "dist": "electron-builder -mwl", + "dist:mac": "electron-builder -m", + "dist:win": "electron-builder -w", + "dist:linux": "electron-builder -l" }, "build": { "productName": "cables", @@ -33,16 +39,12 @@ }, "extraResources": [ { - "from": "../cables/src/ops/base/", + "from": "./ops/base/", "to": "cables/src/ops/base/" }, { - "from": "./public/libs/", - "to": "public/libs/" - }, - { - "from": "../cables/build/libs/", - "to": "public/libs_core/" + "from": "./public/", + "to": "public/" }, { "from": "../shared/client", @@ -50,9 +52,14 @@ } ], "mac": { + "identity": null, "target": ["zip"], "category": "public.app-category.developer-tools" }, + "win": { + "verifyUpdateCodeSignature": false, + "signAndEditExecutable": false + }, "nodeVersion": "18.14.2", "electronLanguages": "en" }, @@ -61,12 +68,13 @@ "marked": "1.2.9", "mkdirp": "2.1.3", "jsonfile": "6.1.0", - "cables-shared": "file:../shared", + "cables-shared-api": "file:../shared/api", + "cables-shared-client": "file:../shared/client", "sanitize-filename": "1.6.3" }, "devDependencies": { - "electron": "29.0.0", - "electron-builder": "24.12.0", + "electron": "29.1.0", + "electron-builder": "24.13.2", "git-repo-info": "2.1.1", "gulp": "4.0.2", "webpack": "5.75.0", diff --git a/src/cables.js b/src/cables.js index 2c31e2e..affe022 100644 --- a/src/cables.js +++ b/src/cables.js @@ -1,5 +1,5 @@ // hallo1234 -import { utilProvider, Cables } from "cables-shared"; +import { utilProvider, Cables } from "cables-shared-api"; import { app } from "electron"; import path from "path"; import fs from "fs"; diff --git a/src/utils/doc_util.js b/src/utils/doc_util.js index f83f41e..a8a695b 100644 --- a/src/utils/doc_util.js +++ b/src/utils/doc_util.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedDocUtil } from "cables-shared"; +import { utilProvider, SharedDocUtil } from "cables-shared-api"; class DocUtil extends SharedDocUtil {} export default new DocUtil(utilProvider); diff --git a/src/utils/helper_util.js b/src/utils/helper_util.js index 5ed2148..ad08216 100644 --- a/src/utils/helper_util.js +++ b/src/utils/helper_util.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedHelperUtil } from "cables-shared"; +import { utilProvider, SharedHelperUtil } from "cables-shared-api"; class HelperUtil extends SharedHelperUtil {} export default new HelperUtil(utilProvider); diff --git a/src/utils/logger.js b/src/utils/logger.js index 7105d5c..b4af266 100644 --- a/src/utils/logger.js +++ b/src/utils/logger.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedLogger } from "cables-shared"; +import { utilProvider, SharedLogger } from "cables-shared-api"; class Logger extends SharedLogger { diff --git a/src/utils/ops_util.js b/src/utils/ops_util.js index 2cc8ffd..6f79a3d 100644 --- a/src/utils/ops_util.js +++ b/src/utils/ops_util.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedOpsUtil } from "cables-shared"; +import { utilProvider, SharedOpsUtil } from "cables-shared-api"; class OpsUtil extends SharedOpsUtil { diff --git a/src/utils/projects_util.js b/src/utils/projects_util.js index 7564004..11d39d2 100644 --- a/src/utils/projects_util.js +++ b/src/utils/projects_util.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedProjectsUtil } from "cables-shared"; +import { utilProvider, SharedProjectsUtil } from "cables-shared-api"; import store from "../electron/electron_store.js"; class ProjectsUtil extends SharedProjectsUtil diff --git a/src/utils/subpatchop_util.js b/src/utils/subpatchop_util.js index 8580cce..ea4c84f 100644 --- a/src/utils/subpatchop_util.js +++ b/src/utils/subpatchop_util.js @@ -1,4 +1,4 @@ -import { utilProvider, SharedSubPatchOpUtil } from "cables-shared"; +import { utilProvider, SharedSubPatchOpUtil } from "cables-shared-api"; class SubPatchOpUtil extends SharedSubPatchOpUtil {} diff --git a/src_client/standalone_editor.js b/src_client/standalone_editor.js index 3823640..6b80791 100644 --- a/src_client/standalone_editor.js +++ b/src_client/standalone_editor.js @@ -1,5 +1,4 @@ -// eslint-disable-next-line import/no-relative-packages -import TalkerAPI from "../../shared/client/src/talkerapi.js"; +import { TalkerAPI } from "cables-shared-client"; export default class ElectronEditor { @@ -10,12 +9,12 @@ export default class ElectronEditor this._patchId = params.config.patchId; this._patchVersion = params.config.patchVersion; - this._talker.addEventListener("requestPatchData", function (data, next) + this._talker.addEventListener("requestPatchData", (data, next) => { if (next) next(params.config); }); - this._talker.addEventListener("sendBrowserInfo", function (data, next) + this._talker.addEventListener("sendBrowserInfo", (data, next) => { if (next) next(platform); }); @@ -56,7 +55,7 @@ export default class ElectronEditor talkerTopics.forEach((talkerTopic) => { - this._talker.addEventListener(talkerTopic, function (data, next) + this._talker.addEventListener(talkerTopic, (data, next) => { window.ipcRenderer.invoke("talkerMessage", talkerTopic, data).then((r) => {