From 0e803bb78eca8e7ea54d2036c50512b11f8dfe94 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Fri, 24 Dec 2021 12:58:00 +0800
Subject: [PATCH 1/3] houhaoyu@huawei.com

adapt to standard

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I393877b4ec8e6fc44d05a33dd6e23eb056a248c9
---
 ace-loader/src/loader-gen.js | 38 +++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ace-loader/src/loader-gen.js b/ace-loader/src/loader-gen.js
index fc566a2..9e5c6b6 100644
--- a/ace-loader/src/loader-gen.js
+++ b/ace-loader/src/loader-gen.js
@@ -16,6 +16,7 @@
 /**
  * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
  */
+import { generate } from 'escodegen'
 import loaderUtils from 'loader-utils'
 import path from 'path'
 
@@ -200,26 +201,9 @@ function codegenHmlAndCss() {
   } else {
     const that = this
     output = 'var $app_script$ = ' + generateOutput(that, 'script', jsFileName, isElement)
-
     output += 'var $app_template$ = ' + generateOutput(that, 'template', jsFileName, isElement)
-
     output += 'var $app_style$ = ' + generateOutput(that, 'style', jsFileName, isElement)
-
-    output += `
-    $app_define$('@app-component/${getNameByPath(this.resourcePath)}', [],
-      function($app_require$, $app_exports$, $app_module$) {
-    ` + `
-    $app_script$($app_module$, $app_exports$, $app_require$)
-    if ($app_exports$.__esModule && $app_exports$.default) {
-    $app_module$.exports = $app_exports$.default
-    }
-    ` + `
-    $app_module$.exports.template = $app_template$
-    ` + `
-    $app_module$.exports.style = $app_style$
-    ` + `
-    })
-    `
+    output += generateOutput(that, 'others', jsFileName, isElement)
     if (isEntry) {
       output += `$app_bootstrap$('@app-component/${getNameByPath(this.resourcePath)}'`
         + ',undefined' + ',undefined' + `)`
@@ -257,6 +241,24 @@ function generateOutput(that, type, jsFileName, isElement) {
         elementName: undefined,
         source: that.resourcePath
       }), that.resourcePath)
+      break
+    case 'others':
+      result = `
+      $app_define$('@app-component/${getNameByPath(that.resourcePath)}', [],
+        function($app_require$, $app_exports$, $app_module$) {
+      ` + `
+      $app_script$($app_module$, $app_exports$, $app_require$)
+      if ($app_exports$.__esModule && $app_exports$.default) {
+      $app_module$.exports = $app_exports$.default
+      }
+      ` + `
+      $app_module$.exports.template = $app_template$
+      ` + `
+      $app_module$.exports.style = $app_style$
+      ` + `
+      })
+      `
+      break
   }
   return result
 }

From c27db3a0a308b1913ee084f84e9ee8e0898aee00 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Fri, 24 Dec 2021 12:59:44 +0800
Subject: [PATCH 2/3] houhaoyu@huawei.com

adapt to standard

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I558cc9ffafc56dcdb4f88de9f56889cf9d0d7b7f
---
 ace-loader/src/loader-gen.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ace-loader/src/loader-gen.js b/ace-loader/src/loader-gen.js
index 9e5c6b6..f61c940 100644
--- a/ace-loader/src/loader-gen.js
+++ b/ace-loader/src/loader-gen.js
@@ -16,7 +16,6 @@
 /**
  * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
  */
-import { generate } from 'escodegen'
 import loaderUtils from 'loader-utils'
 import path from 'path'
 

From 27dcc338efd01de61fcf00ac9674abefef92770d Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Mon, 27 Dec 2021 20:15:29 +0800
Subject: [PATCH 3/3] houhaoyu@huawei.com

miss parameter

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: Icb6cbf44a6c2201feebfe0fe7638bae7326c078b
---
 ace-loader/src/loader-gen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ace-loader/src/loader-gen.js b/ace-loader/src/loader-gen.js
index f61c940..dde5da4 100644
--- a/ace-loader/src/loader-gen.js
+++ b/ace-loader/src/loader-gen.js
@@ -211,7 +211,7 @@ function codegenHmlAndCss() {
   return output
 }
 
-function generateOutput(that, type, jsFileName, isElement) {
+function generateOutput(that, type, jsFileName, isElement, customLang) {
   let result
   switch (type) {
     case 'script':