Merge pull request #207 from entrylabs/develop

version up
entrylabs · Jun 18, 2024 · 138d7c4 · 138d7c4
2 parents da21c97 + a958aae
commit 138d7c4
Show file tree

Hide file tree

Showing 5 changed files with 154 additions and 57 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.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
@@ -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
@@ -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": {
@@ -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",
@@ -39,9 +39,10 @@
         "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",
+        "@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
@@ -1,58 +1,153 @@
 <!DOCTYPE html>
 <html lang="">
+    <head>
+        <meta charset="utf-8" />
+        <link rel="stylesheet" href="../../renderer/resources/modal/app.css" />
+        <link
+            rel="stylesheet"
+            href="../../renderer/resources/vendor/codemirror/addon/hint/show-hint.css"
+        />
+        <link
+            rel="stylesheet"
+            href="../../renderer/resources/vendor/codemirror/addon/lint/lint.css"
+        />
+        <link rel="stylesheet" href="../../../node_modules/entry-js/dist/entry.css" />
+        <link
+            rel="stylesheet"
+            href="../../../node_modules/literallycanvas-mobile/lib/css/literallycanvas.css"
+        />
+        <link rel="stylesheet" href="../../../node_modules/entry-tool/dist/entry-tool.css" />
+        <link rel="stylesheet" href="../../renderer_build/bundle.css" />
+    </head>
 
-<head>
-    <meta charset="utf-8">
-    <link rel='stylesheet' href='../../renderer/resources/modal/app.css'/>
-    <link rel='stylesheet' href='../../renderer/resources/vendor/codemirror/addon/hint/show-hint.css'/>
-    <link rel='stylesheet' href='../../renderer/resources/vendor/codemirror/addon/lint/lint.css'/>
-    <link rel='stylesheet' href='../../../node_modules/entry-js/dist/entry.css'/>
-    <link rel='stylesheet' href='../../../node_modules/literallycanvas-mobile/lib/css/literallycanvas.css'/>
-    <link rel='stylesheet' href='../../../node_modules/entry-tool/dist/entry-tool.css'/>
-    <link rel="stylesheet" href='../../renderer_build/bundle.css'/>
-</head>
+    <body>
+        <div id="__next"></div>
 
-<body>
-<div id='__next'></div>
+        <script type="text/javascript" src="../../../node_modules/lodash/lodash.min.js"></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/jquery/dist/jquery.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-tool/dist/entry-tool.js"
+        ></script>
+        <script src="../../renderer_build/init.bundle.js"></script>
 
-<script type="text/javascript" src='../../../node_modules/lodash/lodash.min.js'></script>
-<script type="text/javascript" src='../../../node_modules/jquery/dist/jquery.min.js'></script>
-<script type="text/javascript" src='../../../node_modules/entry-tool/dist/entry-tool.js'></script>
-<script src='../../renderer_build/init.bundle.js'></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/jquery-ui.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/socket.io.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/preloadjs-0.6.0.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/easeljs-0.8.0.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/soundjs-0.6.0.combined.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/flashaudioplugin-0.6.0.combined.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/velocity.min.js"
+        ></script>
 
-<script type='text/javascript' src='../../renderer/resources/vendor/jquery-ui.min.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/socket.io.min.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/preloadjs-0.6.0.min.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/easeljs-0.8.0.min.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/soundjs-0.6.0.combined.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/flashaudioplugin-0.6.0.combined.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/velocity.min.js'></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/lib/codemirror.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/addon/hint/show-hint.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/addon/hint/javascript-hint.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/addon/lint/lint.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/addon/lint/javascript-lint.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/addon/selection/active-line.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/mode/javascript/javascript.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/codemirror/mode/python/python.js"
+        ></script>
+        <script type="text/javascript" src="../../renderer/resources/vendor/fuzzy.js"></script>
 
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/lib/codemirror.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/hint/show-hint.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/hint/javascript-hint.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/lint/lint.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/lint/javascript-lint.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/addon/selection/active-line.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/mode/javascript/javascript.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/codemirror/mode/python/python.js'></script>
-<script type='text/javascript' src='../../renderer/resources/vendor/fuzzy.js'></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/blockly/blockly_compressed.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/util/bignumber.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/util/CanvasInput.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/util/handle.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/util/filbert.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/entry-js/extern/util/ndgmr.Collision.js"
+        ></script>
 
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/blockly/blockly_compressed.js'></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/bignumber.min.js'></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/CanvasInput.js'></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/handle.js'></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/filbert.js'></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/extern/util/ndgmr.Collision.js'></script>
-
-<script type='text/javascript' src='../../../node_modules/literallycanvas-mobile/lib/js/literallycanvas.js'></script>
-<script type='text/javascript' src="../../renderer/resources/vendor/react18/react.production.min.js"></script>
-<script type='text/javascript' src="../../renderer/resources/vendor/react18/react-dom.production.min.js"></script>
-<script type="text/javascript" src="../../renderer/resources/vendor/sound-editor.js"></script>
-<script type='text/javascript' src='../../../node_modules/entry-js/dist/entry.js'></script>
-<script type='text/javascript' src='../../renderer/resources/paint/static/js/entry-paint.js'></script>
-
-<script src='../../renderer_build/render.bundle.js'></script>
-</body>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/literallycanvas-mobile/lib/js/literallycanvas.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/react18/react.production.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/react18/react-dom.production.min.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/vendor/sound-editor.js"
+        ></script>
+        <script
+            type="text/javascript"
+            src="../../../node_modules/@entrylabs/legacy-video/dist/index.js"
+        ></script>
+        <script type="text/javascript" src="../../../node_modules/entry-js/dist/entry.js"></script>
+        <script
+            type="text/javascript"
+            src="../../renderer/resources/paint/static/js/entry-paint.js"
+        ></script>
 
+        <script src="../../renderer_build/render.bundle.js"></script>
+    </body>
 </html>
diff --git a/src/renderer/components/workspace.tsx b/src/renderer/components/workspace.tsx
@@ -39,6 +39,7 @@ class Workspace extends Component<IProps> {
         backpackDisable: true,
         libDir: '../../../node_modules',
         defaultDir: '../../renderer/resources',
+        entryDir: '/entry-js',
         baseUrl: 'https://playentry.org',
         fonts: EntryStatic.fonts,
         textCodingEnable: true,