Skip to content

Commit dadc871

Browse files
Tnks2UTnks2U
authored
Merge pull request #225 from entrylabs/develop
version up 2.1.29
2 parents b6dda3d + 7b32f2b commit dadc871

File tree

5 files changed

+34
-40
lines changed

5 files changed

+34
-40
lines changed

‎build/entryx64.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.1.28"
16+
!define PRODUCT_VERSION "2.1.29"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

‎build/entryx86.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
!define MUI_UNICON "icon.ico"
1414
!define PRODUCT_NAME "Entry"
1515
!define APP_NAME "Entry.exe"
16-
!define PRODUCT_VERSION "2.1.28"
16+
!define PRODUCT_VERSION "2.1.29"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"private": true,
33
"productName": "Entry",
44
"name": "entry",
5-
"version": "2.1.28",
5+
"version": "2.1.29",
66
"description": "Entry for offline",
77
"main": "src/main_build/main.bundle.js",
88
"scripts": {
9-
"start": "cross-env NODE_ENV=development SERVER_DOMAIN_DEV='http://local2.playentry.org' HW_LOG_ENDPOINT='/api/hwActionLog' electron . --debug",
9+
"start": "cross-env NODE_ENV=development SERVER_DOMAIN_DEV='http://local2.playentry.org/api/hwActionLog' electron . --debug",
1010
"debug": "cross-env NODE_ENV=development electron --inspect .",
1111
"prod:debug": "cross-env NODE_ENV=production electron --inspect . --debug",
1212
"prod:debug:brk": "cross-env NODE_ENV=production electron --inspect-brk=5858 .",
@@ -17,9 +17,9 @@
1717
"webpack:watch:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack -w",
1818
"dist:win32": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && electron-builder -c --win --ia32",
1919
"dist:win64": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && electron-builder -c --win --x64",
20-
"dist:win": "cross-env NODE_ENV=production HW_LOG_ENDPOINT='/api/hwActionLog' NODE_OPTIONS=--openssl-legacy-provider webpack && electron-builder -c --win --x64 && electron-builder -c --win --ia32",
21-
"dist:mac:notarize": "cross-env NODE_ENV=production HW_LOG_ENDPOINT='/api/hwActionLog' NODE_OPTIONS=--openssl-legacy-provider webpack && cross-env NOTARIZE=true electron-builder -c --mac",
22-
"dist:mac": "cross-env SERVER_DOMAIN_DEV='http://local2.playentry.org' HW_LOG_ENDPOINT='/api/hwActionLog' NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && cross-env NOTARIZE=false electron-builder -c --mac",
20+
"dist:win": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && electron-builder -c --win --x64 && electron-builder -c --win --ia32",
21+
"dist:mac:notarize": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && cross-env NOTARIZE=true electron-builder -c --mac",
22+
"dist:mac": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack && cross-env NOTARIZE=false electron-builder -c --mac",
2323
"rebuild": "electron-rebuild -f",
2424
"postinstall": "yarn run rebuild && yarn run webpack:dev"
2525
},
@@ -39,8 +39,8 @@
3939
"async-csv": "^2.1.3",
4040
"axios": "^0.19.2",
4141
"cross-spawn": "^7.0.3",
42-
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.67",
43-
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.28",
42+
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.68",
43+
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.29",
4444
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
4545
"@entrylabs/legacy-video": "^1.0.0",
4646
"excel4node": "^1.7.0",

‎src/main/commonUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ class CommonUtils {
7070

7171
static getEntryDomain() {
7272
if (process.env.NODE_ENV === 'production') {
73-
return 'https://playentry.org';
73+
return `https://playentry.org/api/hwActionLog`;
7474
} else {
75-
return process.env.SERVER_DOMAIN_DEV ? process.env.SERVER_DOMAIN_DEV : undefined;
75+
return process.env.SERVER_DOMAIN_DEV;
7676
}
7777
}
7878

‎yarn.lock‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,11 @@
895895
"@jridgewell/resolve-uri" "3.1.0"
896896
"@jridgewell/sourcemap-codec" "1.4.14"
897897

898+
"@juggle/resize-observer@^3.3.1":
899+
version "3.4.0"
900+
resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
901+
integrity sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==
902+
898903
"@malept/cross-spawn-promise@^1.1.0":
899904
version "1.1.1"
900905
resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
@@ -4259,10 +4264,10 @@ [email protected]:
42594264
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.29.1.tgz#40ff3b41588b091aaed19ca1aa5cb111803fa9a6"
42604265
integrity sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw==
42614266

4262-
core-js@^2.6.2:
4263-
version "2.6.12"
4264-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
4265-
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
4267+
core-js@^3.0.1:
4268+
version "3.44.0"
4269+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.44.0.tgz#db4fd4fa07933c1d6898c8b112a1119a9336e959"
4270+
integrity sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==
42664271

42674272
core-js@^3.6.4:
42684273
version "3.38.1"
@@ -5208,15 +5213,15 @@ entities@^2.0.0:
52085213

52095214
"entry-hw-server@git+https://github.com/entrylabs/entry-hw-server.git#master":
52105215
version "2.0.0"
5211-
resolved "git+https://github.com/entrylabs/entry-hw-server.git#c4718d51ac06b3f7e767561b335e946410378cf2"
5216+
resolved "git+https://github.com/entrylabs/entry-hw-server.git#92e0e60e2569881e68846884b4e4e4e034282553"
52125217
dependencies:
52135218
crypto-js "^4.0.0"
52145219
node-fetch "^2.7.0"
52155220
systeminformation "^5.22.11"
52165221

5217-
"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.67":
5218-
version "1.9.67"
5219-
resolved "git+https://github.com/entrylabs/entry-hw.git#bb5ab12e7cef580b09b8e8b06aa8b7ebb49d8249"
5222+
"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.68":
5223+
version "1.9.68"
5224+
resolved "git+https://github.com/entrylabs/entry-hw.git#dd9636b950987c681c976af9ff3056723cc2be0b"
52205225
dependencies:
52215226
cross-spawn "^7.0.0"
52225227
fs-extra "^8.1.0"
@@ -5231,9 +5236,9 @@ entities@^2.0.0:
52315236
winston "^3.2.1"
52325237
winston-daily-rotate-file "^4.4.2"
52335238

5234-
"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.28":
5235-
version "4.0.19"
5236-
resolved "git+https://github.com/entrylabs/entryjs.git#b0f6d80083487f29412977dfc5112d4f3e0d9613"
5239+
"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.29":
5240+
version "4.0.21"
5241+
resolved "git+https://github.com/entrylabs/entryjs.git#00d77a4fae50aad9f8f8ae90b0652efbcc8e79e1"
52375242
dependencies:
52385243
uid "^0.0.2"
52395244
"@entrylabs/event" "^1.0.3"
@@ -5263,7 +5268,7 @@ entities@^2.0.0:
52635268
ml-cart "^2.1.1"
52645269
pixi.js "5.3.12"
52655270
postcss-flexbugs-fixes "^4.1.0"
5266-
simplebar "^3.1.1"
5271+
simplebar "^5.3.0"
52675272
skmeans "^0.11.3"
52685273
socket.io-client "^2.3.0"
52695274
ua-parser-js "^1.0.38"
@@ -10795,11 +10800,6 @@ require-main-filename@^2.0.0:
1079510800
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
1079610801
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
1079710802

10798-
resize-observer-polyfill@^1.5.0:
10799-
version "1.5.1"
10800-
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
10801-
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
10802-
1080310803
resolve-alpn@^1.0.0:
1080410804
version "1.2.1"
1080510805
resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
@@ -11146,11 +11146,6 @@ schema-utils@^4.2.0:
1114611146
ajv-formats "^2.1.1"
1114711147
ajv-keywords "^5.1.0"
1114811148

11149-
scrollbarwidth@^0.1.3:
11150-
version "0.1.3"
11151-
resolved "https://registry.yarnpkg.com/scrollbarwidth/-/scrollbarwidth-0.1.3.tgz#1b0de64e288c38c427f4a01fe00a462a04b94fdf"
11152-
integrity sha512-edjn9izGjWKgnZo7A3OFsAI6otfGWp/0JLrIhe7vE/CbHZF6rwsHARwxXek0sd7ZoJxHKPl+OEA6jbqJiQQGtw==
11153-
1115411149
seed-random@^2.2.0:
1115511150
version "2.2.0"
1115611151
resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54"
@@ -11383,18 +11378,17 @@ simple-swizzle@^0.2.2:
1138311378
dependencies:
1138411379
is-arrayish "^0.3.1"
1138511380

11386-
simplebar@^3.1.1:
11387-
version "3.1.5"
11388-
resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-3.1.5.tgz#257f2d0836baa250cd2a8841892a10c3c3081b17"
11389-
integrity sha512-6hPEvcUEbgRWAyldqdd5yd1OcrnxelopEOKwMwOafLc0/Kc3Um2x1US8t+feUAA5ae+lTbrQwcGJvMH+9A23FA==
11381+
simplebar@^5.3.0:
11382+
version "5.3.9"
11383+
resolved "https://registry.yarnpkg.com/simplebar/-/simplebar-5.3.9.tgz#168ea0eb6d52f29f03960e40d9b69a1b28cf6318"
11384+
integrity sha512-1vIIpjDvY9sVH14e0LGeiCiTFU3ILqAghzO6OI9axeG+mvU/vMSrvXeAXkBolqFFz3XYaY8n5ahH9MeP3sp2Ag==
1139011385
dependencies:
11386+
"@juggle/resize-observer" "^3.3.1"
1139111387
can-use-dom "^0.1.0"
11392-
core-js "^2.6.2"
11388+
core-js "^3.0.1"
1139311389
lodash.debounce "^4.0.8"
1139411390
lodash.memoize "^4.1.2"
1139511391
lodash.throttle "^4.1.1"
11396-
resize-observer-polyfill "^1.5.0"
11397-
scrollbarwidth "^0.1.3"
1139811392

1139911393
sisteransi@^1.0.5:
1140011394
version "1.0.5"

0 commit comments

Comments
 (0)