From c9567223138bd163c29f68a49d205ab170f20c17 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Sat, 4 Aug 2018 07:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4rollup=E6=89=93=E5=8C=85Circu?=
 =?UTF-8?q?lar=20dependency=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ShadowEditor.Web/ShadowEditor.Web.csproj      |  4 +++-
 .../src/serialization/app/ConfigSerializer.js | 19 ++++++++++--------
 .../src/serialization/app/ScriptSerializer.js | 20 +++++++++++--------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/ShadowEditor.Web/ShadowEditor.Web.csproj b/ShadowEditor.Web/ShadowEditor.Web.csproj
index 9e6b1d7b..423ec677 100644
--- a/ShadowEditor.Web/ShadowEditor.Web.csproj
+++ b/ShadowEditor.Web/ShadowEditor.Web.csproj
@@ -848,7 +848,9 @@
     <Content Include="third_party\WaterShader.js" />
     <Content Include="third_party\workers\OffscreenCanvas.js" />
     <Content Include="third_party\zlib_and_gzip.min.js" />
-    <Content Include="Web.config" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Global.asax.cs">
diff --git a/ShadowEditor.Web/src/serialization/app/ConfigSerializer.js b/ShadowEditor.Web/src/serialization/app/ConfigSerializer.js
index da2807ec..7b6f2bfd 100644
--- a/ShadowEditor.Web/src/serialization/app/ConfigSerializer.js
+++ b/ShadowEditor.Web/src/serialization/app/ConfigSerializer.js
@@ -1,5 +1,5 @@
 import BaseSerializer from '../BaseSerializer';
-import Application from '../../Application';
+// import Application from '../../Application';
 
 /**
  * 配置序列化器
@@ -12,13 +12,16 @@ ConfigSerializer.prototype = Object.create(BaseSerializer.prototype);
 ConfigSerializer.prototype.constructor = ConfigSerializer;
 
 ConfigSerializer.prototype.filter = function (obj) {
-    if (obj instanceof Application) {
-        return true;
-    } else if (obj.metadata && obj.metadata.generator === this.constructor.name) {
-        return true;
-    } else {
-        return false;
-    }
+    // TODO: 消除rollup打包Circular dependency警告
+
+    // if (obj instanceof Application) {
+    //     return true;
+    // } else if (obj.metadata && obj.metadata.generator === this.constructor.name) {
+    //     return true;
+    // } else {
+    //     return false;
+    // }
+    return false;
 };
 
 ConfigSerializer.prototype.toJSON = function (app) {
diff --git a/ShadowEditor.Web/src/serialization/app/ScriptSerializer.js b/ShadowEditor.Web/src/serialization/app/ScriptSerializer.js
index 97c93811..c5a43485 100644
--- a/ShadowEditor.Web/src/serialization/app/ScriptSerializer.js
+++ b/ShadowEditor.Web/src/serialization/app/ScriptSerializer.js
@@ -1,5 +1,5 @@
 import BaseSerializer from '../BaseSerializer';
-import Application from '../../Application';
+// import Application from '../../Application';
 
 /**
  * Object3D序列化器
@@ -12,13 +12,17 @@ ScriptSerializer.prototype = Object.create(BaseSerializer.prototype);
 ScriptSerializer.prototype.constructor = ScriptSerializer;
 
 ScriptSerializer.prototype.filter = function (obj) {
-    if (obj instanceof Application) {
-        return true;
-    } else if (obj.metadata && obj.metadata.generator === this.constructor.name) {
-        return true;
-    } else {
-        return false;
-    }
+    // TODO: 消除rollup打包Circular dependency警告
+
+    // if (obj instanceof Application) {
+    //     return true;
+    // } else if (obj.metadata && obj.metadata.generator === this.constructor.name) {
+    //     return true;
+    // } else {
+    //     return false;
+    // }
+
+    return false;
 };
 
 ScriptSerializer.prototype.toJSON = function (app) {