diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index e3433d99ad..cb1883d3ed 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -2,7 +2,10 @@ var watch = require('gulp-watch'); var concat = require('gulp-concat'); var rename = require('gulp-rename'); -var wrap = require('gulp-wrap'); +var sourcemaps = require('gulp-sourcemaps'); +var wrap = require("gulp-wrap-js"); +var sort = require('gulp-sort'); +var uglify = require('gulp-uglify'); var _ = require('lodash'); var MergeStream = require('merge-stream'); @@ -21,8 +24,12 @@ Helper functions function processJs(files, out) { return gulp.src(files) + .pipe(sort()) + .pipe(sourcemaps.init()) .pipe(concat(out)) - .pipe(wrap('(function(){\n"use strict";\n<%= contents %>\n})();')) + .pipe(wrap('(function(){\n%= body %\n})();')) + .pipe(uglify({ mangle: false })) + .pipe(sourcemaps.write()) .pipe(gulp.dest(root + targets.js)); console.log(out + " compiled"); diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index b9b88090ee..4ca32e5f41 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -16,7 +16,8 @@ }, "scripts": { "install": "bower-installer", - "test": "karma start test/config/karma.conf.js --singlerun" + "test": "karma start test/config/karma.conf.js --singlerun", + "build": "gulp" }, "dependencies": {}, "devDependencies": { @@ -28,13 +29,16 @@ "gulp-less": "^3.1.0", "gulp-postcss": "^6.2.0", "gulp-rename": "^1.2.2", - "gulp-sourcemaps": "^1.6.0", + "gulp-sort": "^2.0.0", + "gulp-sourcemaps": "^2.6.0", + "gulp-uglify": "^3.0.0", "gulp-watch": "^4.3.10", "gulp-wrap": "^0.13.0", + "gulp-wrap-js": "^0.4.1", "jasmine-core": "^2.5.2", - "karma": "^1.3.0", - "karma-jasmine": "^0.1.0", - "karma-phantomjs-launcher": "^1.0.2", + "karma": "^1.7.0", + "karma-jasmine": "^1.1.0", + "karma-phantomjs-launcher": "^1.0.4", "lodash": "^4.16.3", "merge-stream": "^1.0.1" } diff --git a/src/Umbraco.Web.UI.Client/src/installer/_module.js b/src/Umbraco.Web.UI.Client/src/installer/_module.js new file mode 100644 index 0000000000..d031c60679 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/installer/_module.js @@ -0,0 +1 @@ +angular.module('umbraco.install', []); \ No newline at end of file