Skip to content

Commit

Permalink
talkerapi from shared repo, do not sign build
Browse files Browse the repository at this point in the history
  • Loading branch information
steam0r committed Feb 28, 2024
1 parent ae28a96 commit 5af944c
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 25 deletions.
34 changes: 21 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand All @@ -33,26 +39,27 @@
},
"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",
"to": "shared/client"
}
],
"mac": {
"identity": null,
"target": ["zip"],
"category": "public.app-category.developer-tools"
},
"win": {
"verifyUpdateCodeSignature": false,
"signAndEditExecutable": false
},
"nodeVersion": "18.14.2",
"electronLanguages": "en"
},
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/cables.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/utils/doc_util.js
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 1 addition & 1 deletion src/utils/helper_util.js
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 1 addition & 1 deletion src/utils/logger.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { utilProvider, SharedLogger } from "cables-shared";
import { utilProvider, SharedLogger } from "cables-shared-api";

class Logger extends SharedLogger
{
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ops_util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { utilProvider, SharedOpsUtil } from "cables-shared";
import { utilProvider, SharedOpsUtil } from "cables-shared-api";

class OpsUtil extends SharedOpsUtil
{
Expand Down
2 changes: 1 addition & 1 deletion src/utils/projects_util.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/utils/subpatchop_util.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { utilProvider, SharedSubPatchOpUtil } from "cables-shared";
import { utilProvider, SharedSubPatchOpUtil } from "cables-shared-api";

class SubPatchOpUtil extends SharedSubPatchOpUtil {}

Expand Down
9 changes: 4 additions & 5 deletions src_client/standalone_editor.js
Original file line number Diff line number Diff line change
@@ -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
{
Expand All @@ -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);
});
Expand Down Expand Up @@ -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) =>
{
Expand Down

0 comments on commit 5af944c

Please sign in to comment.