Lutz Roeder 4 лет назад
Родитель
Сommit
4077e287f3
4 измененных файлов с 11 добавлено и 5 удалено
  1. 2 1
      .eslintrc.json
  2. 1 1
      package.json
  3. 8 0
      source/electron.js
  4. 0 3
      source/view.js

+ 2 - 1
.eslintrc.json

@@ -19,6 +19,7 @@
     },
     "globals": {
         "flatbuffers": "readonly",
-        "protobuf": "readonly"
+        "protobuf": "readonly",
+        "d3": "readonly"
     }
 }

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
         "server": "[ -d node_modules ] || npm install && python setup.py --quiet build && python -c 'import sys, os; sys.path.insert(0, os.path.join(\"dist\", \"lib\")); import netron; netron.main()' $@"
     },
     "dependencies": {
-        "d3": "6.7.0",
+        "d3": "7.0.0",
         "dagre": "0.8.5",
         "electron-updater": "4.3.9"
     },

+ 8 - 0
source/electron.js

@@ -99,6 +99,14 @@ host.ElectronHost = class {
                     request();
                 });
             }
+        }).then(() => {
+            // d3.js
+            const Module = require('module');
+            var d3 = new Module('', module.main);
+            const location = path.join(path.dirname(__dirname), 'node_modules', 'd3', 'dist', 'd3.js');
+            const source = fs.readFileSync(location, 'utf-8');
+            d3._compile(source, '');
+            global.d3 = d3.exports;
         });
     }
 

+ 0 - 3
source/view.js

@@ -9,9 +9,6 @@ var tar = tar || require('./tar');
 var json = json || require('./json');
 var protobuf = protobuf || require('./protobuf');
 var python = python || require('./python');
-
-var d3 = d3 || require('d3');
-
 var sidebar = sidebar || require('./view-sidebar');
 var grapher = grapher || require('./view-grapher');