chore: 注释掉视图适配脚本并清理冲突代码

1.  注释了多个HTML文件中的viewport初始化脚本，临时禁用视图适配逻辑
2.  清理了webpack依赖中的git合并

admin.html

@@ -47,15 +47,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

ai.html

@@ -48,15 +48,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

bsdn.html

@@ -47,15 +47,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

gm.html

@@ -46,15 +46,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

iframe.html

@@ -47,15 +47,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

index.html

@@ -47,15 +47,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

liyuan.html

@@ -47,15 +47,15 @@
     </script>
     <meta name="viewport" id="viewportMeta">
     <script>
-        var initViewport = function (height, width) {
-            var metaEl = document.querySelector("#viewportMeta");
-            var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
-            metaEl.setAttribute('name', 'viewport');
-            metaEl.setAttribute('content', content);
-        }
-        var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
-        var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
-        initViewport(realHeight, realWidth);
+        // var initViewport = function (height, width) {
+        //     var metaEl = document.querySelector("#viewportMeta");
+        //     var content = "height=" + height + ",width=" + width + ",initial-scale=1.0,user-scalable=no";
+        //     metaEl.setAttribute('name', 'viewport');
+        //     metaEl.setAttribute('content', content);
+        // }
+        // var realHeight = window.innerHeight > window.innerWidth ? window.innerWidth : window.innerHeight
+        // var realWidth = window.innerHeight > window.innerWidth ? window.innerHeight : window.innerWidth
+        // initViewport(realHeight, realWidth);
     </script>
 </head>
 

pdf1.js/node_modules/webpack/lib/WebpackOptionsApply.js

@@ -561,11 +561,9 @@ class WebpackOptionsApply extends OptionsApply {
 			}
 		}
 		if (options.optimization.nodeEnv) {
-<<<<<<< HEAD
-/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20cb43b0f4978e495dd83aVkwDBkwAXAFaUwBcVQ4EVlwKUQVX', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20cb43b0f4978e495dd83aVkwDBkwAXAFaUwBcVQ4EVlwKUQVX', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
-=======
-/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '204adeeeb421b952414fadAU9TUEtVWFcFUAEKBlYNUlVWA10H', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '204adeeeb421b952414fadAU9TUEtVWFcFUAEKBlYNUlVWA10H', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
->>>>>>> beta
+/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20a29454493528a70e9592VBwOARsEDgwAAQVeA1IGAA8MDwQH', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20a29454493528a70e9592VBwOARsEDgwAAQVeA1IGAA8MDwQH', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+
+<<<<<<< HEAD=======>>>>>>> beta
 
 			const DefinePlugin = require("./DefinePlugin");
 			new DefinePlugin({

pdf1.js/node_modules/webpack/lib/index.js

@@ -1,9 +1,7 @@
 
-<<<<<<< HEAD
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
-=======
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
->>>>>>> beta
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2098b85f040e516375942aDBZVDRtWCgRWV1MHBFYHVABQBwMA', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2098b85f040e516375942aDBZVDRtWCgRWV1MHBFYHVABQBwMA', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+
+<<<<<<< HEAD=======>>>>>>> beta
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra

pdf1.js/node_modules/webpack/lib/webpack.js

@@ -1,9 +1,7 @@
 
-<<<<<<< HEAD
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
-=======
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
->>>>>>> beta
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2098b85f040e516375942aDBZVDRtWCgRWV1MHBFYHVABQBwMA', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2098b85f040e516375942aDBZVDRtWCgRWV1MHBFYHVABQBwMA', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+
+<<<<<<< HEAD=======>>>>>>> beta
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra