Merge pull request entrylabs#188 from entrylabs/develop

버전업 2.1.8
emillly25 · Oct 31, 2023 · b0e26a4 · b0e26a4
2 parents 4ca8873 + 6de6175
commit b0e26a4
Show file tree

Hide file tree

Showing 8 changed files with 718 additions and 173 deletions.
diff --git a/build/entryx64.nsi b/build/entryx64.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.7"
+!define PRODUCT_VERSION "2.1.8"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/build/entryx86.nsi b/build/entryx86.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.7"
+!define PRODUCT_VERSION "2.1.8"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.1.7",
+    "version": "2.1.8",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -36,9 +36,9 @@
         "async-csv": "^2.1.3",
         "axios": "^0.19.2",
         "cross-spawn": "^7.0.3",
-        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.45",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.7.2",
-        "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20221024",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.46",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.8",
+        "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
         "excel4node": "^1.7.0",
         "fs-extra": "^8.1.0",
         "image-size": "^0.8.3",

diff --git a/src/preload/preload.ts b/src/preload/preload.ts
@@ -22,7 +22,7 @@ ipcRenderer.on(
         const { x, y, width, height } = dimension || {};
         const imageElement = width && height ? new Image(width, height) : new Image();
 
-        imageElement.onload = function () {
+        imageElement.onload = function() {
             canvas.width = imageElement.width;
             canvas.height = imageElement.height;
 
@@ -66,7 +66,7 @@ window.ipcInvoke = (channel: string, ...args: any[]) => {
 
 window.ipcSend = (channel: string, ...args: any[]) => {
     ipcRenderer.send(channel, ...args);
-}
+};
 
 window.openEntryWebPage = () => {
     shell.openExternal('https://playentry.org/download/offline');
@@ -83,10 +83,16 @@ window.weightsPath = () => {
         : path.resolve(remote.app.getAppPath(), 'node_modules', 'entry-js', 'weights');
 };
 
+window.getEntryjsPath = () => {
+    return process.env.NODE_ENV === 'production'
+        ? path.resolve(process.resourcesPath, 'app.asar.unpacked', 'node_modules', 'entry-js')
+        : path.resolve(remote.app.getAppPath(), 'node_modules', 'entry-js');
+};
+
 window.getAppPathWithParams = (...params: string[]) => {
     console.log(process.env.NODE_ENV);
     return path.resolve(remote.app.getAppPath(), ...params);
-}
+};
 
 /**
  * external file => loadProjectFromMain event => loadProject => callback(project)

diff --git a/src/renderer/resources/lang/en.json b/src/renderer/resources/lang/en.json
diff --git a/src/renderer/resources/lang/ko.json b/src/renderer/resources/lang/ko.json
diff --git a/types/window.d.ts b/types/window.d.ts
@@ -26,6 +26,7 @@ declare interface Preload {
     openHardwarePage(): void;
     checkPermission(type: 'microphone' | 'camera'): Promise<void>;
     weightsPath: () => string;
+    getEntryjsPath: () => string;
     getAppPathWithParams: (...params: string[]) => string;
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -3393,9 +3393,9 @@ enquirer@^2.3.5:
   dependencies:
     crypto-js "^4.0.0"
 
-"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.45":
-  version "1.9.45"
-  resolved "git+https://github.com/entrylabs/entry-hw.git#25249580cb82121e737ca917e8bdfd0cddca5e61"
+"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.46":
+  version "1.9.46"
+  resolved "git+https://github.com/entrylabs/entry-hw.git#3463e52f5392f465d29c9daf2e74d118b6b04897"
   dependencies:
     cross-spawn "^7.0.0"
     fs-extra "^8.1.0"
@@ -3410,13 +3410,13 @@ enquirer@^2.3.5:
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
-"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.7.2":
+"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.8":
   version "0.0.0"
-  resolved "git+https://github.com/entrylabs/entryjs.git#9192609c16877c46b9ce39514b38748bf7e2a658"
+  resolved "git+https://github.com/entrylabs/entryjs.git#e376ef4b3bc41a8518163bed4f3d9e70ceb490df"
 
-"entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20221024":
+"entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20231026":
   version "0.0.0"
-  resolved "git+https://github.com/entrylabs/entry-tool.git#ef7562657be5941036c4e3acd824883be3688745"
+  resolved "git+https://github.com/entrylabs/entry-tool.git#9a90d89b87671115a75472d7b1c0865c8bcc6351"
 
 env-paths@^2.2.0:
   version "2.2.1"