From 510f1c0bc1e2e58b1301b59475aee30c8cd24f24 Mon Sep 17 00:00:00 2001
From: "zude.hzd" <zude.hzd@alibaba-inc.com>
Date: Mon, 28 Sep 2020 14:26:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86monaco=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=8C=85=E5=85=A8=E9=83=A8=E7=A7=BB=E9=99=A4=EF=BC=8C=E9=87=87?=
 =?UTF-8?q?=E7=94=A8cdn=E5=BD=A2=E5=BC=8F=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/demo/build.json                      |  2 +
 packages/demo/build.plugin.js                 | 12 -----
 packages/demo/package.json                    |  2 -
 packages/demo/public/index.html               |  7 +++
 .../editor-setters/src/json-setter/index.tsx  | 48 +++++++++----------
 5 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/packages/demo/build.json b/packages/demo/build.json
index 42ade8d92..f0775c7bd 100644
--- a/packages/demo/build.json
+++ b/packages/demo/build.json
@@ -17,6 +17,8 @@
     "@alifd/next": "var window.Next",
     "@ali/visualengine": "var window.VisualEngine",
     "@ali/visualengine-utils": "var window.VisualEngineUtils",
+    "monaco-editor/esm/vs/editor/editor.api":"var window.monaco",
+    "monaco-editor/esm/vs/editor/editor.main.js":"var window.monaco",
     "rax": "var window.Rax"
   },
   "plugins": [
diff --git a/packages/demo/build.plugin.js b/packages/demo/build.plugin.js
index 9e95cbd09..ef0b1f4a7 100644
--- a/packages/demo/build.plugin.js
+++ b/packages/demo/build.plugin.js
@@ -1,5 +1,4 @@
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 module.exports = ({ onGetWebpackConfig }) => {
   onGetWebpackConfig((config) => {
@@ -9,17 +8,6 @@ module.exports = ({ onGetWebpackConfig }) => {
       },
     ]);
 
-    config
-      // 定义插件名称
-      .plugin('MonacoWebpackPlugin')
-      // 第一项为具体插件，第二项为插件参数
-      .use(
-        new MonacoWebpackPlugin({
-          languages: ['typescript', 'css', 'json'],
-        }),
-        [],
-      );
-
     config.plugins.delete('hot');
     config.devServer.hot(false);
   });
diff --git a/packages/demo/package.json b/packages/demo/package.json
index 3aa9df46a..9b409b5d4 100644
--- a/packages/demo/package.json
+++ b/packages/demo/package.json
@@ -39,7 +39,6 @@
     "@alife/theme-lowcode-light": "^0.1.0",
     "compare-versions": "^3.0.1",
     "react": "^16.8.1",
-    "monaco-editor": "0.21.0",
     "react-dom": "^16.8.1",
     "streamsaver": "^2.0.4",
     "web-streams-polyfill": "^2.1.1"
@@ -53,7 +52,6 @@
     "build-plugin-fusion": "^0.1.0",
     "build-plugin-moment-locales": "^0.1.0",
     "build-plugin-react-app": "^1.1.2",
-    "monaco-editor-webpack-plugin": "2.0.0",
     "tsconfig-paths-webpack-plugin": "^3.2.0"
   }
 }
diff --git a/packages/demo/public/index.html b/packages/demo/public/index.html
index 81b31c8fe..12d5207f6 100644
--- a/packages/demo/public/index.html
+++ b/packages/demo/public/index.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width" />
     <title>LowCodeEngine Editor DEMO</title>
     <link rel="shortcut icon" href="./favicon.png" />
+    <link rel="stylesheet"  data-name="vs/editor/editor.main" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.css"/>
     <script src="https://g.alicdn.com/code/lib/react/16.9.0/umd/react.development.js"></script>
     <script src="https://g.alicdn.com/code/lib/react-dom/16.9.0/umd/react-dom.development.js"></script>
     <script src="https://g.alicdn.com/code/lib/prop-types/15.7.2/prop-types.js"></script>
@@ -17,6 +18,12 @@
     <link rel="stylesheet" href="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.css" />
     <script src="https://unpkg.alibaba-inc.com/@alifd/next@1.20.25/dist/next.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/rax@1.1.3/dist/rax.js"></script>
+    <script>
+			var require = { paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs' } };
+		</script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/loader.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.nls.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.js"></script>
     <link rel="stylesheet" href="/css/editor-preset-vision.css" />
     <script>
       window.pageConfig = {
diff --git a/packages/editor-setters/src/json-setter/index.tsx b/packages/editor-setters/src/json-setter/index.tsx
index ae08d750d..d09ef038e 100644
--- a/packages/editor-setters/src/json-setter/index.tsx
+++ b/packages/editor-setters/src/json-setter/index.tsx
@@ -463,30 +463,30 @@ class MonacoEditorDefaultView extends PureComponent {
     });
   }
 }
-const prefix = 'data:text/javascript;charset=utf-8,';
-const baseUrl = 'https://g.alicdn.com/iceluna/iceluna-vendor/0.0.1/';
-window.MonacoEnvironment = {
-  getWorkerUrl(label: string) {
-    if (label === 'json') {
-      return `${prefix}${encodeURIComponent(`
-        importScripts('${baseUrl}json.worker.js');`)}`;
-    }
-    if (['css', 'less', 'scss'].includes(label)) {
-      return `${prefix}${encodeURIComponent(`
-        importScripts('${baseUrl}css.worker.js');`)}`;
-    }
-    if (label === 'html') {
-      return `${prefix}${encodeURIComponent(`
-        importScripts('${baseUrl}html.worker.js');`)}`;
-    }
-    if (['typescript', 'javascript'].includes(label)) {
-      return `${prefix}${encodeURIComponent(`
-        importScripts('${baseUrl}typescript.worker.js');`)}`;
-    }
-    return `${prefix}${encodeURIComponent(`
-      importScripts('${baseUrl}editor.worker.js');`)}`;
-  },
-};
+// const prefix = 'data:text/javascript;charset=utf-8,';
+// const baseUrl = 'https://g.alicdn.com/iceluna/iceluna-vendor/0.0.1/';
+// window.MonacoEnvironment = {
+//   getWorkerUrl(label: string) {
+//     if (label === 'json') {
+//       return `${prefix}${encodeURIComponent(`
+//         importScripts('${baseUrl}json.worker.js');`)}`;
+//     }
+//     if (['css', 'less', 'scss'].includes(label)) {
+//       return `${prefix}${encodeURIComponent(`
+//         importScripts('${baseUrl}css.worker.js');`)}`;
+//     }
+//     if (label === 'html') {
+//       return `${prefix}${encodeURIComponent(`
+//         importScripts('${baseUrl}html.worker.js');`)}`;
+//     }
+//     if (['typescript', 'javascript'].includes(label)) {
+//       return `${prefix}${encodeURIComponent(`
+//         importScripts('${baseUrl}typescript.worker.js');`)}`;
+//     }
+//     return `${prefix}${encodeURIComponent(`
+//       importScripts('${baseUrl}editor.worker.js');`)}`;
+//   },
+// };
 
 // eslint-disable-next-line react/no-multi-comp
 export default class MonacoEditorButtonView extends PureComponent {