优化打包

songyumeng · songyumeng · commit 3bb77231b3b7 · 2017-02-17T17:13:22.000+08:00
diff --git a/build/pack.js b/build/pack.js
@@ -13,8 +13,9 @@ program
             console.log(key + "值输入有误，可选值为leaflet或ol3");
             return;
         }
+
         var modulePaths = "";
-        if (key === "core" && modules === "Core") {
+        if (key === "core") {
             modulePaths = getCoreModulePaths();
             shell.exec('npm run deploy ' + modulePaths);
             return;
@@ -38,7 +39,7 @@ program
                     }
                 }
             }
-            shell.exec('npm run deploy ' + modulePaths);
+            shell.exec('npm run deploy-'+key+' '    + modulePaths);
             return;
         }
         if (modules.indexOf("Core") !== -1) {
diff --git a/package.json b/package.json
@@ -9,24 +9,39 @@
   },
   "scripts": {
     "deploy": "webpack",
+    "deploy-leaflet": "webpack --config webpack.config.leaflet.js ",
+    "deploy-ol3": "webpack --config webpack.config.ol3.js ",
+    "compress": "webpack -p",
     "package": "node ./build/pack.js"
   },
   "keywords": [
     "SuperMap",
     "leaflet",
-    "Openlayers"
+    "Openlayers3"
   ],
   "author": "SuperMap",
   "license": "Apache-2.0",
   "devDependencies": {
-    "webpack": "^1.14.0",
     "commander": "2.9.0",
+    "commonjs": "0.0.1",
+    "jasmine-core": "^2.5.2",
+    "jquery": "^3.1.1",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-cli": "^1.0.1",
+    "karma-commonjs": "^1.0.0",
+    "karma-coverage": "^1.1.1",
+    "karma-jasmine": "^1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-teamcity-reporter": "^1.0.0",
     "shelljs": "0.7.6",
-    "css-loader": "^0.23.1",
-    "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "file-loader":"0.10.0",
-    "extract-text-webpack-plugin": "^1.0.1"
+    "underscore": "^1.8.3",
+    "webpack": "^1.14.0",
+    "extract-text-webpack-plugin":"^1.0.1",
+    "file-loader":"^0.10.0",
+    "style-loader":"^0.13.1",
+    "css-loader":"^0.26.1",
+    "imports-loader":"^0.7.0"
   },
   "dependencies": {
     "openlayers": "4.0.0",
diff --git a/webpack.config.js b/webpack.config.js
@@ -20,7 +20,7 @@ module.exports = {
         //加载器配置
         loaders: [
             // {test: /\.css$/, loader: 'style-loader!css-loader'},
-            {test: /\.css$/, loader:  ExtractTextPlugin.extract("style", "css")},
+            {test: /\.css$/, loader:  ExtractTextPlugin.extract("style-loader", "css-loader")},
             {test: /\.(png|jpg)$/, loader: "file-loader?name=images/[name].[ext]"}
         ]
     },
diff --git a/webpack.config.leaflet.js b/webpack.config.leaflet.js
@@ -0,0 +1,32 @@
+var webpack = require('webpack');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+module.exports = {
+
+
+    //页面入口文件配置
+    entry: {},
+    //入口文件输出配置
+    output: {
+        path: './dist/',
+        filename: 'SuperMapiClient9 for Leaflet.js'
+    },
+
+    //其它解决方案配置
+    resolve: {
+        extensions: ['', '.js', '.json', '.css']
+    },
+
+    module: {
+        //加载器配置
+        loaders: [
+            // {test: /\.css$/, loader: 'style-loader!css-loader'},
+            {test: /\.css$/, loader:  ExtractTextPlugin.extract("style-loader", "css-loader")},
+            {test: /\.(png|jpg)$/, loader: "file-loader?name=images/[name].[ext]"}
+        ]
+    },
+
+    //插件项
+    plugins: [
+        new ExtractTextPlugin("SuperMapiClient9 for Leaflet.css")
+    ]
+};
diff --git a/webpack.config.ol3.js b/webpack.config.ol3.js
@@ -0,0 +1,33 @@
+var webpack = require('webpack');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+module.exports = {
+
+
+    //页面入口文件配置
+    entry: {},
+    //入口文件输出配置
+    output: {
+        path: './dist/',
+        filename: 'SuperMapiClient9 for OL3.js'
+    },
+
+    //其它解决方案配置
+    resolve: {
+        extensions: ['', '.js', '.json', '.css']
+    },
+
+    module: {
+        //加载器配置
+        loaders: [
+            // {test: /\.css$/, loader: 'style-loader!css-loader'},
+            {test: /\.css$/, loader:  ExtractTextPlugin.extract("style-loader", "css-loader")},
+            {test: /\.(png|jpg)$/, loader: "file-loader?name=images/[name].[ext]"}
+        ],
+        noParse: '/node_modules/openlayers/dist/ol.js'
+    },
+
+    //插件项
+    plugins: [
+        new ExtractTextPlugin("SuperMapiClient9 for OL3.css")
+    ]
+};

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@ program`
`13`	`13`	`console.log(key + "值输入有误，可选值为leaflet或ol3");`
`14`	`14`	`return;`
`15`	`15`	`}`
	`16`	`+`
`16`	`17`	`var modulePaths = "";`
`17`		`- if (key === "core" && modules === "Core") {`
	`18`	`+ if (key === "core") {`
`18`	`19`	`modulePaths = getCoreModulePaths();`
`19`	`20`	`shell.exec('npm run deploy ' + modulePaths);`
`20`	`21`	`return;`
`@@ -38,7 +39,7 @@ program`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`}`
`41`		`- shell.exec('npm run deploy ' + modulePaths);`
	`42`	`+ shell.exec('npm run deploy-'+key+' ' + modulePaths);`
`42`	`43`	`return;`
`43`	`44`	`}`
`44`	`45`	`if (modules.indexOf("Core") !== -1) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ module.exports = {`
`20`	`20`	`//加载器配置`
`21`	`21`	`loaders: [`
`22`	`22`	`// {test: /\.css$/, loader: 'style-loader!css-loader'},`
`23`		`- {test: /\.css$/, loader: ExtractTextPlugin.extract("style", "css")},`
	`23`	`+ {test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader")},`
`24`	`24`	`{test: /\.(png\|jpg)$/, loader: "file-loader?name=images/[name].[ext]"}`
`25`	`25`	`]`
`26`	`26`	`},`