Skip to content

Commit 138d7c4

Browse files
Tnks2UTnks2U
authored
Merge pull request #207 from entrylabs/develop
version up
2 parents da21c97 + a958aae commit 138d7c4

File tree

5 files changed

+154
-57
lines changed

5 files changed

+154
-57
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.15"
16+
!define PRODUCT_VERSION "2.1.16"
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.15"
16+
!define PRODUCT_VERSION "2.1.16"
1717
!define PRODUCT_PUBLISHER "EntryLabs"
1818
!define PRODUCT_WEB_SITE "http://www.playentry.org/"
1919

‎package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"productName": "Entry",
44
"name": "entry",
5-
"version": "2.1.15",
5+
"version": "2.1.16",
66
"description": "Entry for offline",
77
"main": "src/main_build/main.bundle.js",
88
"scripts": {
@@ -11,10 +11,10 @@
1111
"prod:debug": "cross-env NODE_ENV=production electron --inspect . --debug",
1212
"prod:debug:brk": "cross-env NODE_ENV=production electron --inspect-brk=5858 .",
1313
"test": "mocha --require ts-node/register */**/*.spec.ts",
14-
"webpack:dev": "cross-env NODE_ENV=development webpack",
15-
"webpack:prod": "cross-env NODE_ENV=production webpack",
16-
"webpack:watch": "cross-env NODE_ENV=development webpack -w",
17-
"webpack:watch:prod": "cross-env NODE_ENV=production webpack -w",
14+
"webpack:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider webpack",
15+
"webpack:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack",
16+
"webpack:watch": "cross-env NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider webpack -w",
17+
"webpack:watch:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider webpack -w",
1818
"dist:win32": "cross-env NODE_ENV=production webpack && electron-builder -c --win --ia32",
1919
"dist:win64": "cross-env NODE_ENV=production webpack && electron-builder -c --win --x64",
2020
"dist:win": "cross-env NODE_ENV=production webpack && electron-builder -c --win --x64 && electron-builder -c --win --ia32",
@@ -39,9 +39,10 @@
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.53",
43-
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.15",
42+
"entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.54",
43+
"entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.16",
4444
"entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
45+
"@entrylabs/legacy-video": "^1.0.0",
4546
"excel4node": "^1.7.0",
4647
"fluent-ffmpeg": "^2.1.2",
4748
"fs-extra": "^8.1.0",

‎src/main/views/main.html‎

Lines changed: 143 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,153 @@
11
<!DOCTYPE html>
22
<html lang="">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="stylesheet" href="../../renderer/resources/modal/app.css" />
6+
<link
7+
rel="stylesheet"
8+
href="../../renderer/resources/vendor/codemirror/addon/hint/show-hint.css"
9+
/>
10+
<link
11+
rel="stylesheet"
12+
href="../../renderer/resources/vendor/codemirror/addon/lint/lint.css"
13+
/>
14+
<link rel="stylesheet" href="../../../node_modules/entry-js/dist/entry.css" />
15+
<link
16+
rel="stylesheet"
17+
href="../../../node_modules/literallycanvas-mobile/lib/css/literallycanvas.css"
18+
/>
19+
<link rel="stylesheet" href="../../../node_modules/entry-tool/dist/entry-tool.css" />
20+
<link rel="stylesheet" href="../../renderer_build/bundle.css" />
21+
</head>
322

4-
<head>
5-
<meta charset="utf-8">
6-
<link rel='stylesheet' href='../../renderer/resources/modal/app.css'/>
7-
<link rel='stylesheet' href='../../renderer/resources/vendor/codemirror/addon/hint/show-hint.css'/>
8-
<link rel='stylesheet' href='../../renderer/resources/vendor/codemirror/addon/lint/lint.css'/>
9-
<link rel='stylesheet' href='../../../node_modules/entry-js/dist/entry.css'/>
10-
<link rel='stylesheet' href='../../../node_modules/literallycanvas-mobile/lib/css/literallycanvas.css'/>
11-
<link rel='stylesheet' href='../../../node_modules/entry-tool/dist/entry-tool.css'/>
12-
<link rel="stylesheet" href='../../renderer_build/bundle.css'/>
13-
</head>
23+
<body>
24+
<div id="__next"></div>
1425

15-
<body>
16-
<div id='__next'></div>
26+
<script type="text/javascript" src="../../../node_modules/lodash/lodash.min.js"></script>
27+
<script
28+
type="text/javascript"
29+
src="../../../node_modules/jquery/dist/jquery.min.js"
30+
></script>
31+
<script
32+
type="text/javascript"
33+
src="../../../node_modules/entry-tool/dist/entry-tool.js"
34+
></script>
35+
<script src="../../renderer_build/init.bundle.js"></script>
1736

18-
<script type="text/javascript" src='../../../node_modules/lodash/lodash.min.js'></script>
19-
<script type="text/javascript" src='../../../node_modules/jquery/dist/jquery.min.js'></script>
20-
<script type="text/javascript" src='../../../node_modules/entry-tool/dist/entry-tool.js'></script>
21-
<script src='../../renderer_build/init.bundle.js'></script>
37+
<script
38+
type="text/javascript"
39+
src="../../renderer/resources/vendor/jquery-ui.min.js"
40+
></script>
41+
<script
42+
type="text/javascript"
43+
src="../../renderer/resources/vendor/socket.io.min.js"
44+
></script>
45+
<script
46+
type="text/javascript"
47+
src="../../renderer/resources/vendor/preloadjs-0.6.0.min.js"
48+
></script>
49+
<script
50+
type="text/javascript"
51+
src="../../renderer/resources/vendor/easeljs-0.8.0.min.js"
52+
></script>
53+
<script
54+
type="text/javascript"
55+
src="../../renderer/resources/vendor/soundjs-0.6.0.combined.js"
56+
></script>
57+
<script
58+
type="text/javascript"
59+
src="../../renderer/resources/vendor/flashaudioplugin-0.6.0.combined.js"
60+
></script>
61+
<script
62+
type="text/javascript"
63+
src="../../renderer/resources/vendor/velocity.min.js"
64+
></script>
2265

23-
<script type='text/javascript' src='../../renderer/resources/vendor/jquery-ui.min.js'></script>
24-
<script type='text/javascript' src='../../renderer/resources/vendor/socket.io.min.js'></script>
25-
<script type='text/javascript' src='../../renderer/resources/vendor/preloadjs-0.6.0.min.js'></script>
26-
<script type='text/javascript' src='../../renderer/resources/vendor/easeljs-0.8.0.min.js'></script>
27-
<script type='text/javascript' src='../../renderer/resources/vendor/soundjs-0.6.0.combined.js'></script>
28-
<script type='text/javascript' src='../../renderer/resources/vendor/flashaudioplugin-0.6.0.combined.js'></script>
29-
<script type='text/javascript' src='../../renderer/resources/vendor/velocity.min.js'></script>
66+
<script
67+
type="text/javascript"
68+
src="../../renderer/resources/vendor/codemirror/lib/codemirror.js"
69+
></script>
70+
<script
71+
type="text/javascript"
72+
src="../../renderer/resources/vendor/codemirror/addon/hint/show-hint.js"
73+
></script>
74+
<script
75+
type="text/javascript"
76+
src="../../renderer/resources/vendor/codemirror/addon/hint/javascript-hint.js"
77+
></script>
78+
<script
79+
type="text/javascript"
80+
src="../../renderer/resources/vendor/codemirror/addon/lint/lint.js"
81+
></script>
82+
<script
83+
type="text/javascript"
84+
src="../../renderer/resources/vendor/codemirror/addon/lint/javascript-lint.js"
85+
></script>
86+
<script
87+
type="text/javascript"
88+
src="../../renderer/resources/vendor/codemirror/addon/selection/active-line.js"
89+
></script>
90+
<script
91+
type="text/javascript"
92+
src="../../renderer/resources/vendor/codemirror/mode/javascript/javascript.js"
93+
></script>
94+
<script
95+
type="text/javascript"
96+
src="../../renderer/resources/vendor/codemirror/mode/python/python.js"
97+
></script>
98+
<script type="text/javascript" src="../../renderer/resources/vendor/fuzzy.js"></script>
3099

31-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/lib/codemirror.js'></script>
32-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/hint/show-hint.js'></script>
33-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/hint/javascript-hint.js'></script>
34-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/lint/lint.js'></script>
35-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/lint/javascript-lint.js'></script>
36-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/selection/active-line.js'></script>
37-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/mode/javascript/javascript.js'></script>
38-
<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/mode/python/python.js'></script>
39-
<script type='text/javascript' src='../../renderer/resources/vendor/fuzzy.js'></script>
100+
<script
101+
type="text/javascript"
102+
src="../../../node_modules/entry-js/extern/blockly/blockly_compressed.js"
103+
></script>
104+
<script
105+
type="text/javascript"
106+
src="../../../node_modules/entry-js/extern/util/bignumber.min.js"
107+
></script>
108+
<script
109+
type="text/javascript"
110+
src="../../../node_modules/entry-js/extern/util/CanvasInput.js"
111+
></script>
112+
<script
113+
type="text/javascript"
114+
src="../../../node_modules/entry-js/extern/util/handle.js"
115+
></script>
116+
<script
117+
type="text/javascript"
118+
src="../../../node_modules/entry-js/extern/util/filbert.js"
119+
></script>
120+
<script
121+
type="text/javascript"
122+
src="../../../node_modules/entry-js/extern/util/ndgmr.Collision.js"
123+
></script>
40124

41-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/blockly/blockly_compressed.js'></script>
42-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/bignumber.min.js'></script>
43-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/CanvasInput.js'></script>
44-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/handle.js'></script>
45-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/filbert.js'></script>
46-
<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/ndgmr.Collision.js'></script>
47-
48-
<script type='text/javascript' src='../../../node_modules/literallycanvas-mobile/lib/js/literallycanvas.js'></script>
49-
<script type='text/javascript' src="../../renderer/resources/vendor/react18/react.production.min.js"></script>
50-
<script type='text/javascript' src="../../renderer/resources/vendor/react18/react-dom.production.min.js"></script>
51-
<script type="text/javascript" src="../../renderer/resources/vendor/sound-editor.js"></script>
52-
<script type='text/javascript' src='../../../node_modules/entry-js/dist/entry.js'></script>
53-
<script type='text/javascript' src='../../renderer/resources/paint/static/js/entry-paint.js'></script>
54-
55-
<script src='../../renderer_build/render.bundle.js'></script>
56-
</body>
125+
<script
126+
type="text/javascript"
127+
src="../../../node_modules/literallycanvas-mobile/lib/js/literallycanvas.js"
128+
></script>
129+
<script
130+
type="text/javascript"
131+
src="../../renderer/resources/vendor/react18/react.production.min.js"
132+
></script>
133+
<script
134+
type="text/javascript"
135+
src="../../renderer/resources/vendor/react18/react-dom.production.min.js"
136+
></script>
137+
<script
138+
type="text/javascript"
139+
src="../../renderer/resources/vendor/sound-editor.js"
140+
></script>
141+
<script
142+
type="text/javascript"
143+
src="../../../node_modules/@entrylabs/legacy-video/dist/index.js"
144+
></script>
145+
<script type="text/javascript" src="../../../node_modules/entry-js/dist/entry.js"></script>
146+
<script
147+
type="text/javascript"
148+
src="../../renderer/resources/paint/static/js/entry-paint.js"
149+
></script>
57150

151+
<script src="../../renderer_build/render.bundle.js"></script>
152+
</body>
58153
</html>

‎src/renderer/components/workspace.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class Workspace extends Component<IProps> {
3939
backpackDisable: true,
4040
libDir: '../../../node_modules',
4141
defaultDir: '../../renderer/resources',
42+
entryDir: '/entry-js',
4243
baseUrl: 'https://playentry.org',
4344
fonts: EntryStatic.fonts,
4445
textCodingEnable: true,

0 commit comments

Comments
 (0)