添加依赖机制

Author: WanderWang

egret-webpack-bundler/src/index.ts

@@ -6,6 +6,7 @@ import { getLibsFileList } from './egretproject';
 import { Target_Type } from './egretproject/data';
 import ThemePlugin from './loaders/theme';
 import { openUrl } from './open';
+import { emitClassName, addDependency } from './ts-transformer';
 const middleware = require("webpack-dev-middleware");
 
 
@@ -141,7 +142,8 @@ function generateConfig(
             getCustomTransformers: function () {
                 return ({
                     before: [
-                        emitClassName()
+                        emitClassName(),
+                        addDependency('../resource/default.thm.js')
                     ]
                 });
             }
@@ -214,28 +216,3 @@ function startExpressServer(compilerApp: express.Express, port: number) {
 }
 
 
-function emitClassName() {
-    var ts = require('typescript');
-    return function (ctx: any) {
-        function visitClassDeclaration(node: any) {
-            // const isExport = node.modifiers ? node.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword) : false;
-            var clzNameNode = node.name;
-            var clzName = clzNameNode.getText();
-            var binaryExpression = ts.createIdentifier("window[\"" + clzName + "\"] = " + clzName + ";");
-            var arrays = [
-                node,
-                binaryExpression,
-            ];
-            return ts.createNodeArray(arrays);
-        }
-        var visitor = function (node: any) {
-            if (node.kind === ts.SyntaxKind.ClassDeclaration) {
-                return visitClassDeclaration(node);
-            }
-            else {
-                return ts.visitEachChild(node, visitor, ctx);
-            }
-        };
-        return function (sf: any) { return ts.visitNode(sf, visitor); };
-    };
-}

egret-webpack-bundler/src/loaders/theme.ts

@@ -131,11 +131,11 @@ export default class ThemePlugin {
         //     this.errors = [];
         // });
 
-        // // 监听文件目录
-        // compiler.hooks.afterCompile.tap(pluginName, compilation => {
-        //     this.dirs.forEach(item => {
-        //         compilation.contextDependencies.add(item);
-        //     });
-        // });
+        // 监听文件目录
+        compiler.hooks.afterCompile.tap(pluginName, compilation => {
+            this.dirs.forEach(item => {
+                compilation.contextDependencies.add(item);
+            });
+        });
     }
 }

egret-webpack-bundler/src/ts-transformer.ts

@@ -0,0 +1,74 @@
+import * as ts from 'typescript';
+
+export function emitClassName() {
+    return function (ctx: ts.TransformationContext) {
+        function visitClassDeclaration(node: ts.ClassDeclaration) {
+            // const isExport = node.modifiers ? node.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword) : false;
+            var clzNameNode = node.name;
+            var clzName = clzNameNode!.getText();
+            var binaryExpression = ts.createIdentifier("window[\"" + clzName + "\"] = " + clzName + ";");
+            var arrays = [
+                node,
+                binaryExpression,
+            ];
+            return ts.createNodeArray(arrays);
+        }
+        function visitor(node: ts.Node): any {
+            if (node.kind === ts.SyntaxKind.ClassDeclaration) {
+                return visitClassDeclaration(node as ts.ClassDeclaration);
+            }
+            else {
+                return ts.visitEachChild(node, visitor, ctx);
+            }
+        };
+        return function (sf: ts.SourceFile) { return ts.visitNode(sf, visitor); };
+    };
+}
+
+export function addDependency(moduleName: string) {
+    return function (ctx: ts.TransformationContext) {
+
+        function visitClassDeclaration(node: ts.ClassDeclaration) {
+            // const isExport = node.modifiers ? node.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword) : false;
+            var binaryExpression = ts.createIdentifier(`require("${moduleName}")`);
+            var arrays = [
+                binaryExpression,
+                node,
+
+            ];
+            return ts.createNodeArray(arrays);
+        }
+        function visitor(node: ts.Node): any {
+            if (node.kind === ts.SyntaxKind.ClassDeclaration) {
+                const clz = node as ts.ClassDeclaration;
+                if (clz.name && clz.name.getText() === "Main") {
+                    return visitClassDeclaration(node as ts.ClassDeclaration);
+                }
+                else {
+                    return ts.visitEachChild(node, visitor, ctx);
+                }
+
+            }
+            else {
+                return ts.visitEachChild(node, visitor, ctx);
+            }
+        };
+
+        function visitor2(node: ts.Node): any {
+            return ts.visitEachChild(node, visitor, ctx);
+        };
+
+        return function (sf: ts.SourceFile) {
+            if (sf.fileName.indexOf("Main.ts") >= 0) {
+                return ts.visitNode(sf, visitor);
+            }
+            else {
+                return ts.visitNode(sf, visitor2);
+            }
+
+
+
+        };
+    };
+
+}

test-egret-project/src/Main.ts

@@ -32,7 +32,6 @@ import { ThemeAdapter } from "./ThemeAdapter";
 import { platform } from "./Platform";
 import { LoadingUI } from "./LoadingUI";
 
-require('../resource/default.thm.js')
 
 declare function require(x: string): any