fix systemjs

index.js

@@ -6,16 +6,35 @@ const isDev = require('electron-is-dev');
 const child_process = require('child_process');
 const path = require('path');
 
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow;
+
+// 单实例
+const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
+    // Someone tried to run a second instance, we should focus our window.
+    if (mainWindow) {
+        if (mainWindow.isMinimized()) {
+            mainWindow.restore()
+        }
+        mainWindow.focus()
+    }
+})
+if (shouldQuit) {
+    app.quit()
+}
+
+// 调试模式
 if (!process.env['NODE_ENV']) {
     process.env['NODE_ENV'] = isDev ? 'development' : 'production'
 }
 
+// 自动更新
+let updateWindow;
+global.autoUpdater = autoUpdater;
 if (process.env['NODE_ENV'] == 'production' && process.platform == 'darwin') {
     autoUpdater.setFeedURL("https://wudizhanche.mycard.moe/update/darwin/" + app.getVersion());
 }
-
-global.autoUpdater = autoUpdater;
-
 autoUpdater.on('error', (event) => {
     console.log('autoUpdater', 'error', event);
 });
@@ -28,27 +47,22 @@ autoUpdater.on('update-available', () => {
 autoUpdater.on('update-not-available', () => {
     console.log('autoUpdater', 'update-not-available');
 });
-
-let updateWindow;
 autoUpdater.on('update-downloaded', (event) => {
     console.log('autoUpdater', 'update-downloaded', event);
-
     updateWindow = new BrowserWindow({
         width: 640,
         height: 480,
     });
-
     updateWindow.loadURL(`file://${__dirname}/update.html`);
-
     updateWindow.on('closed', function () {
         updateWindow = null
     });
-
     ipcMain.on('update', (event, arg) => {
         autoUpdater.quitAndInstall()
     })
 });
 
+// 处理提权
 function handleElevate() {
 
     // for debug
@@ -75,11 +89,11 @@ function handleElevate() {
         return true;
     }
 }
-
 if (handleElevate()) {
     return;
 }
 
+// Aria2c
 function createAria2c() {
     let aria2c_path;
     switch (process.platform) {
@@ -102,13 +116,9 @@ function createAria2c() {
     }
     return child_process.spawn(aria2c_path, ['--enable-rpc', '--rpc-allow-origin-all', "--continue", "--split=10", "--min-split-size=1M", "--max-connection-per-server=10"], {stdio: 'ignore'});
 }
-
 const aria2c = createAria2c();
 
-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow;
-
+// 主窗口
 function createWindow() {
     // Create the browser window.
     mainWindow = new BrowserWindow({

package.json

@@ -38,7 +38,8 @@
     "raw-socket": "latest",
     "reflect-metadata": "latest",
     "rxjs": "5.0.0-beta.12",
-    "systemjs": "latest",
+    "systemjs": "mycard/systemjs#mycard",
+    "systemjs-plugin-text":"latest",
     "tether": "latest",
     "zone.js": "^0.6.26"
   },

systemjs-text-plugin.js

-/*
- SystemJS Text plugin from
- https://github.com/systemjs/plugin-text/blob/master/text.js
- */
-exports.translate = function(load) {
-    if (this.builder && this.transpiler) {
-        load.metadata.format = 'esm';
-        return 'exp' + 'ort var __useDefault = true; exp' + 'ort default ' + JSON.stringify(load.source) + ';';
-    }
-
-    load.metadata.format = 'amd';
-    return 'def' + 'ine(function() {\nreturn ' + JSON.stringify(load.source) + ';\n});';
-}

systemjs.config.js

@@ -13,7 +13,7 @@ System.config({
         app: 'app',
 
         // systemjs plugins
-        'text': 'systemjs-text-plugin.js',
+        'text': 'npm:systemjs-text-plugin.js',
 
         // angular bundles
         '@angular/core': 'npm:@angular/core/bundles/core.umd.js',