Browse Source

Merge pull request #280 in FUI/fineui from ~WINDY/fui:master to master

* commit '46888c16469a4389a41495bb93b9b179fbb8c37f':
  grunt
es6
guy 7 years ago
parent
commit
1c1399ae18
  1. 23
      Gruntfile.js
  2. 50
      dist/_fineui.min.js
  3. 299
      dist/fineui.min.js
  4. 3
      package.json

23
Gruntfile.js

@ -111,8 +111,8 @@ module.exports = function (grunt) {
}, },
fineuiJs: { fineuiJs: {
src: ["dist/polyfill.js", "dist/core.js", "dist/fix/fix.js", "dist/fix/fix.compact.js", "dist/base.js", "dist/case.js", "dist/widget.js", "dist/router.js", "ui/js/**/*.js"], src: ["dist/_fineui.min.js", "src/base/formula/formulaeditor.js"],
dest: "dist/fineui.js" dest: "dist/fineui.min.js"
}, },
fineuiCss: { fineuiCss: {
@ -199,7 +199,23 @@ module.exports = function (grunt) {
dist: { dist: {
files: { files: {
"dist/bundle.min.js": ["<%= concat.bundleJs.dest %>"], "dist/bundle.min.js": ["<%= concat.bundleJs.dest %>"],
"dist/fineui.min.js": ["<%= concat.fineuiJs.dest %>"] "dist/_fineui.min.js": ["dist/polyfill.js", "dist/core.js", "dist/fix/fix.js", "dist/fix/fix.compact.js", "src/third/**/*.js",
"src/base/formula/config.js",
"src/base/pane.js",
"src/base/single/single.js",
"src/base/single/text.js",
"src/base/single/button/button.basic.js",
"src/base/single/button/button.node.js",
"src/base/single/tip/tip.js",
"src/base/combination/group.button.js",
"src/base/combination/tree.button.js",
"src/base/combination/map.button.js",
"src/base/tree/treeview.js",
"src/base/tree/asynctree.js",
"src/base/tree/parttree.js",
"src/base/**/*.js",
"!src/base/formula/formulaeditor.js",
"dist/case.js", "dist/widget.js", "dist/router.js", "ui/js/**/*.js"]
} }
} }
}, },
@ -254,4 +270,5 @@ module.exports = function (grunt) {
grunt.registerTask("default", ["less", "concat", "watch"]); grunt.registerTask("default", ["less", "concat", "watch"]);
grunt.registerTask("min", ["less", "concat", "uglify", "cssmin"]); grunt.registerTask("min", ["less", "concat", "uglify", "cssmin"]);
grunt.registerTask("build", ["less", "concat", "uglify", "cssmin", "uglify", "concat"]);
}; };

50
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

299
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
package.json

@ -18,7 +18,8 @@
"scripts": { "scripts": {
"grunt": "grunt", "grunt": "grunt",
"start": "node server.js", "start": "node server.js",
"uglify": "grunt min" "uglify": "grunt min",
"build": "grunt build"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

Loading…
Cancel
Save