🐞 fix(打包): 适配打包

Author: summerscar

.github/workflows/release.yml

@@ -1,9 +1,7 @@
 name: Release
 
 on:
-  push:
-    tags:
-    - 'v*'
+  workflow_dispatch:
 
 jobs:
   release:
@@ -15,19 +13,46 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        persist-credentials: false
     - name: Install Node.js
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
+    - name: Set Personal Access Token
+      run: git config --global url."https://${{ secrets.USER_TOKEN }}@github.com/".insteadOf ssh://git@github.com/
+
     - name: Install Dependencies
-      run: npm ci
+      run: npm install
     - name: Download Library Files
       run: npm run fetch
+
+    - name: Checkout e-ducation/scratch-vm
+      uses: actions/checkout@v2
+      with:
+        repository: e-ducation/scratch-vm
+        token: ${{ secrets.USER_TOKEN }}
+        ref: dev
+        path: scratch-vm
+
+    - name: Checkout e-ducation/scratch-gui
+      uses: actions/checkout@v2
+      with:
+        repository: e-ducation/scratch-gui
+        token: ${{ secrets.USER_TOKEN }}
+        ref: dev
+        path: scratch-gui
+
+    - name: resolve extension files
+      run: |
+        cp -r ./scratch-vm/src/extensions ./node_modules/scratch-vm/src
+        cp -r ./scratch-gui/src/lib/libraries/extensions ./node_modules/scratch-gui/src/lib/libraries
+
     - name: Compile
       run: npm run compile
       env:
-        NODE_OPTIONS: --max-old-space-size=4096
+        NODE_OPTIONS: --max-old-space-size=10000
     - name: Package and Publish
       run: npx --no-install electron-builder --publish always
       env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ secrets.USER_TOKEN }}

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "turbowarp-desktop",
+  "name": "codelab-turbowarp-desktop",
   "description": "Desktop app for TurboWarp",
-  "version": "0.5.0",
+  "version": "0.1.1",
   "license": "GPL-3.0",
   "author": {
     "email": "contact@turbowarp.org",
@@ -21,6 +21,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.12.16",
     "@babel/preset-react": "^7.13.13",
+    "@babel/plugin-transform-modules-commonjs": "7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "css-loader": "^5.0.2",
     "electron": "^12.0.7",
     "electron-builder": "22.10.5",
@@ -30,7 +32,7 @@
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.2.0",
     "postcss-simple-vars": "^6.0.3",
-    "scratch-gui": "github:TurboWarp/scratch-gui#desktop",
+    "scratch-gui": "github:CodeLabClub/scratch-gui-turbowarp#desktop",
     "semver": "^7.3.4",
     "webpack": "~4.46.0",
     "write-file-atomic": "^3.0.3"
@@ -45,8 +47,8 @@
     "email": "contact@turbowarp.org"
   },
   "build": {
-    "appId": "org.turbowarp.desktop",
-    "productName": "TurboWarp",
+    "appId": "org.codelab.turbowarp.desktop",
+    "productName": "CodeLab TurboWarp",
     "win": {
       "artifactName": "${productName} Setup ${version}.${ext}",
       "icon": "build/icon.ico",
@@ -154,7 +156,7 @@
       {
         "provider": "github",
         "repo": "desktop",
-        "owner": "TurboWarp"
+        "owner": "CodeLabClub"
       }
     ]
   },

src/main/index.js

@@ -34,6 +34,10 @@ extensionNames.set('sprite3', 'Scratch 3 Sprite');
 extensionNames.set('txt', 'Text Document');
 extensionNames.set('webm', 'WebM Video');
 
+app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
+
+const isSafeOpenExternal = () => true
+/*
 const isSafeOpenExternal = (url) => {
   try {
     const parsedUrl = new URL(url);
@@ -51,6 +55,7 @@ const isSafeOpenExternal = (url) => {
   }
   return false;
 };
+*/
 
 if (isMac) {
   Menu.setApplicationMenu(Menu.buildFromTemplate([
@@ -554,7 +559,7 @@ if (acquiredLock) {
   });
 
   app.on('ready', () => {
-    checkForUpdate();
+    // checkForUpdate();
     autoCreateEditorWindows();
   });
 } else {

src/main/preload.js

@@ -16,3 +16,16 @@ contextBridge.exposeInMainWorld('electron', {
     }
   }
 });
+
+contextBridge.exposeInMainWorld(
+  'preload',
+  {
+    init: () => {
+      if (process.env.NODE_ENV !== 'development') {
+        return require('path').join(__dirname, '/static').replace(/\\/g, '\\\\');
+      } else {
+        return '/static';
+      }
+    }
+  }
+)

src/renderer/index.js

@@ -1,6 +1,12 @@
 import './normalize.css';
 import './prompt-impl';
 
+window.__static = window.preload.init()
+
+if (!window.globalThis) {
+  window.globalThis = window;
+}
+
 const searchParams = new URLSearchParams(location.search);
 const route = searchParams.get('route');
 

src/renderer/template.html

@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'unsafe-eval' 'unsafe-inline' 'self' blob:; style-src 'unsafe-inline' 'self'; img-src 'self' data:; media-src 'self'; font-src data:; connect-src 'self' data: https://synthesis-service.scratch.mit.edu https://translate-service.scratch.mit.edu/ wss://device-manager.scratch.mit.edu:20110">
     <!-- electron-webpack always inserts some weird scripts, stub require() to avoid errors -->
     <script>
       window.require = (m) => {
@@ -11,6 +10,18 @@
         throw new Error("That's something I can not allow.");
       };
     </script>
+    <script id="syncload">
+      function loadScriptAsync(url) {
+          var head = document.getElementsByTagName("head")[0];
+          var s = document.createElement("script");
+          s.src = url;
+          let referenceNode = document.querySelector('script#syncload')
+          referenceNode.parentNode.insertBefore(s, referenceNode.nextSibling);
+      }
+      loadScriptAsync('./static/jquery/jquery.min.js')
+      loadScriptAsync('./static/toio/toio.js')
+      loadScriptAsync('./static/speech//microsoft.cognitiveservices.speech.sdk.bundle.js')
+    </script>
     <style>
       #splash {
         position: absolute; width: 100%; height: 100%; top: 0; left: 0;

webpack.renderer.js

@@ -17,9 +17,17 @@ module.exports = defaultConfig => {
                 {
                     test: /\.jsx?$/,
                     loader: 'babel-loader',
+                    include: [
+                        path.resolve(__dirname, 'src', 'renderer'),
+                        /node_modules[\\/]scratch-[^\\/]+[\\/]src/
+                    ],
                     options: {
                         presets: ['@babel/preset-env', '@babel/preset-react'],
-                        plugins: ['@babel/plugin-proposal-optional-chaining']
+                        plugins: [
+                            '@babel/plugin-proposal-optional-chaining',
+                            '@babel/plugin-transform-modules-commonjs',
+                            '@babel/plugin-proposal-object-rest-spread'
+                        ]
                     }
                 },
                 {
@@ -32,6 +40,7 @@ module.exports = defaultConfig => {
                 },
                 {
                     test: /\.css$/,
+                    exclude: /\.min\.css$/,
                     use: [
                         {
                             loader: 'style-loader'
@@ -57,7 +66,11 @@ module.exports = defaultConfig => {
                                 }
                             }
                         }
-                    ]
+                    ],
+                },
+                {
+                    test: /\.min\.css$/,
+                    use: ['style-loader', 'css-loader']
                 }
             ],
         },
@@ -70,8 +83,12 @@ module.exports = defaultConfig => {
                 {
                     from: libraryFilesFolder,
                     to: 'library-files'
-                }
+                },
                 // TODO: copy extension worker?
+                {
+                    from: path.resolve(__dirname, 'node_modules', 'scratch-gui', 'static'),
+                    to: 'static'
+                }
             ])
         ],
         resolve: {