Просмотр исходного кода

Have a more simple Electron sample

Alex Dima 6 лет назад
Родитель
Сommit
417c24347d
3 измененных файлов с 12 добавлено и 23 удалено
  1. 8 19
      electron-amd/electron-index.html
  2. 3 3
      package-lock.json
  3. 1 1
      package.json

+ 8 - 19
electron-amd/electron-index.html

@@ -10,20 +10,11 @@
 	</body>
 
 	<script>
-		// Monaco uses a custom amd loader that overrides node's require.
-		// Keep a reference to node's require so we can restore it after executing the amd loader file.
-		var nodeRequire = global.require;
-	</script>
-	<script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
-	<script>
-		// Save Monaco's amd require and restore Node's require
-		var amdRequire = global.require;
-		global.require = nodeRequire;
-	</script>
-
-	<script>
-		// require node modules before loader.js comes in
-		var path = require('path');
+	(function() {
+		const path = require('path');
+		const amdLoader = require('../node_modules/monaco-editor/min/vs/loader.js');
+		const amdRequire = amdLoader.require;
+		const amdDefine = amdLoader.require.define;
 
 		function uriFromPath(_path) {
 			var pathName = path.resolve(_path).replace(/\\/g, '/');
@@ -40,9 +31,6 @@
 		// workaround monaco-css not understanding the environment
 		self.module = undefined;
 
-		// workaround monaco-typescript not understanding the environment
-		self.process.browser = true;
-
 		amdRequire(['vs/editor/editor.main'], function() {
 			var editor = monaco.editor.create(document.getElementById('container'), {
 				value: [
@@ -50,8 +38,9 @@
 					'\tconsole.log("Hello world!");',
 					'}'
 				].join('\n'),
-				language: 'javascript'
+				language: 'css'
 			});
 		});
+	})();
 	</script>
-</html>
+</html>

+ 3 - 3
package-lock.json

@@ -98,9 +98,9 @@
       }
     },
     "monaco-editor": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.12.0.tgz",
-      "integrity": "sha512-mScjXSKwH5LCmx6JCABkVpMnRHhi86IJwEmEXkH5O61dDXadWBdWQdC8N+NLmKT17/ugZYITCajUAWNRyKKZ9g=="
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.14.3.tgz",
+      "integrity": "sha512-RhaO4xXmWn/p0WrkEOXe4PoZj6xOcvDYjoAh0e1kGUrQnP1IOpc0m86Ceuaa2CLEMDINqKijBSmqhvBQnsPLHQ=="
     },
     "ms": {
       "version": "2.0.0",

+ 1 - 1
package.json

@@ -10,6 +10,6 @@
   "license": "MIT",
   "dependencies": {
     "http-server": "^0.11.1",
-    "monaco-editor": "0.x.x"
+    "monaco-editor": "0.14.3"
   }
 }