From c3c871680cbbc0e136c4a551f6fd0d239752d548 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Mon, 17 Jun 2024 17:07:58 +0900 Subject: [PATCH 1/3] version up 2.1.16 --- build/entryx64.nsi | 2 +- build/entryx86.nsi | 2 +- package.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/entryx64.nsi b/build/entryx64.nsi index b33a8baa4..98e0a019b 100644 --- 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.15" +!define PRODUCT_VERSION "2.1.16" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/build/entryx86.nsi b/build/entryx86.nsi index 4734e8e8d..247d1372d 100644 --- 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.15" +!define PRODUCT_VERSION "2.1.16" !define PRODUCT_PUBLISHER "EntryLabs" !define PRODUCT_WEB_SITE "http://www.playentry.org/" diff --git a/package.json b/package.json index ff87181a2..20543e0fb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "productName": "Entry", "name": "entry", - "version": "2.1.15", + "version": "2.1.16", "description": "Entry for offline", "main": "src/main_build/main.bundle.js", "scripts": { @@ -39,8 +39,8 @@ "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.53", - "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.15", + "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.54", + "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.16", "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026", "excel4node": "^1.7.0", "fluent-ffmpeg": "^2.1.2", From 2a34f59bd030612ae3cc6d8670a966e4f3f750c3 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Tue, 18 Jun 2024 12:18:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20entry-lagacy=20=EC=B6=94=EA=B0=80,?= =?UTF-8?q?=20openssl-legacy-provider=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit node 버전 업데이트로 인한 openssl-legacy-provider 추가 --- package.json | 9 +- src/main/views/main.html | 191 +++++++++++++++++++++++++++++---------- 2 files changed, 148 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 20543e0fb..ee33881cd 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "prod:debug": "cross-env NODE_ENV=production electron --inspect . --debug", "prod:debug:brk": "cross-env NODE_ENV=production electron --inspect-brk=5858 .", "test": "mocha --require ts-node/register */**/*.spec.ts", - "webpack:dev": "cross-env NODE_ENV=development webpack", - "webpack:prod": "cross-env NODE_ENV=production webpack", - "webpack:watch": "cross-env NODE_ENV=development webpack -w", - "webpack:watch:prod": "cross-env NODE_ENV=production webpack -w", + "webpack:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider webpack", + "webpack:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack", + "webpack:watch": "cross-env NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider webpack -w", + "webpack:watch:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack -w", "dist:win32": "cross-env NODE_ENV=production webpack && electron-builder -c --win --ia32", "dist:win64": "cross-env NODE_ENV=production webpack && electron-builder -c --win --x64", "dist:win": "cross-env NODE_ENV=production webpack && electron-builder -c --win --x64 && electron-builder -c --win --ia32", @@ -42,6 +42,7 @@ "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.54", "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.16", "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026", + "@entrylabs/legacy-video": "^1.0.0", "excel4node": "^1.7.0", "fluent-ffmpeg": "^2.1.2", "fs-extra": "^8.1.0", diff --git a/src/main/views/main.html b/src/main/views/main.html index 98772f237..5e525263e 100644 --- a/src/main/views/main.html +++ b/src/main/views/main.html @@ -1,58 +1,153 @@ + + + + + + + + + + - - - - - - - - - - + +
- -
+ + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + From a958aae9280cddeba7bebb006662894854fb5007 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Tue, 18 Jun 2024 12:19:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20entry=20init=20option=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - entryjs의 모듈명 변경으로 인해 리소스 경로를 잘못잡는 현상 수정 --- src/renderer/components/workspace.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/components/workspace.tsx b/src/renderer/components/workspace.tsx index 3ea6e4dd6..9499861f0 100644 --- a/src/renderer/components/workspace.tsx +++ b/src/renderer/components/workspace.tsx @@ -39,6 +39,7 @@ class Workspace extends Component { backpackDisable: true, libDir: '../../../node_modules', defaultDir: '../../renderer/resources', + entryDir: '/entry-js', baseUrl: 'https://playentry.org', fonts: EntryStatic.fonts, textCodingEnable: true,