make build task useful

TrigerSoft · Jan 16, 2016 · d45fd75 · d45fd75
1 parent ec85458
commit d45fd75
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 41 deletions.
diff --git a/src/Umbraco.Web.UI.Client/.vscode/tasks.json b/src/Umbraco.Web.UI.Client/.vscode/tasks.json
@@ -14,6 +14,17 @@
                 "$jshint"
             ]
         },
+        {
+            "taskName": "build",
+            "args": ["--minify=true"],
+            "isBuildCommand": false,
+            "isWatching": false,
+            "problemMatcher": [
+                "$lessCompile",
+                "$tsc",
+                "$jshint"
+            ]
+        },
         {
             "taskName": "watch-test",
             "args": [],

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -18,10 +18,10 @@ module.exports = function (grunt) {
     grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
 
     //triggered from grunt dev or grunt
-    grunt.registerTask('build', ['clean:pre', 'concat', 'recess:min', 'recess:installer', 'recess:canvasdesigner', 'bower-install-simple', 'bower', 'copy', 'clean:post']);
+    grunt.registerTask('build', ['clean:pre', 'concat', 'recess:min', 'recess:installer', 'bower-install-simple', 'bower', 'sync', 'concat:loader', 'uglify']);
 
     //build-dev doesn't min - we are trying to speed this up and we don't want minified stuff when we are in dev mode
-    grunt.registerTask('build-dev', ['concat', 'recess:build', 'recess:installer', 'bower-install-simple', 'bower', 'sync']);
+    grunt.registerTask('build-dev', ['concat', 'recess:build', 'recess:installer', 'bower-install-simple', 'bower', 'sync', 'concat:loader']);
 
     //utillity tasks
     grunt.registerTask('docs', ['ngdocs']);
@@ -36,6 +36,7 @@ module.exports = function (grunt) {
     // Project configuration.
     grunt.initConfig({
         buildVersion: grunt.option('buildversion') || '7',
+        minify: grunt.option('minify'), //--minify=true
         connect: {
             devserver: {
                 options: {
@@ -122,20 +123,20 @@ module.exports = function (grunt) {
                 files: [{ dest: '<%= distdir %>/../config', src: '**', expand: true, cwd: 'src/config/' }]
             },
 
-            installer: {
-                files: [{ dest: '<%= distdir %>/views/install', src: '**/*.html', expand: true, cwd: 'src/installer/steps' }]
-            },
+            // installer: {
+            //     files: [{ dest: '<%= distdir %>/views/install', src: '**/*.html', expand: true, cwd: 'src/installer/steps' }]
+            // },
 
-            canvasdesigner: {
-                files: [
-                    { dest: '<%= distdir %>/preview', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner' },
-                    { dest: '<%= distdir %>/preview/editors', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner/editors' },
-                    { dest: '<%= distdir %>/assets/less', src: '**/*.less', expand: true, cwd: 'src/canvasdesigner/editors' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.config.js', expand: true, cwd: 'src/canvasdesigner/config' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.palettes.js', expand: true, cwd: 'src/canvasdesigner/config' },
-                    { dest: '<%= distdir %>/js', src: 'canvasdesigner.front.js', expand: true, cwd: 'src/canvasdesigner' }
-                ]
-            },
+            // canvasdesigner: {
+            //     files: [
+            //         { dest: '<%= distdir %>/preview', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner' },
+            //         { dest: '<%= distdir %>/preview/editors', src: '**/*.html', expand: true, cwd: 'src/canvasdesigner/editors' },
+            //         { dest: '<%= distdir %>/assets/less', src: '**/*.less', expand: true, cwd: 'src/canvasdesigner/editors' },
+            //         { dest: '<%= distdir %>/js', src: 'canvasdesigner.config.js', expand: true, cwd: 'src/canvasdesigner/config' },
+            //         { dest: '<%= distdir %>/js', src: 'canvasdesigner.palettes.js', expand: true, cwd: 'src/canvasdesigner/config' },
+            //         { dest: '<%= distdir %>/js', src: 'canvasdesigner.front.js', expand: true, cwd: 'src/canvasdesigner' }
+            //     ]
+            // },
 
             vendor: {
                 files: [{ dest: '<%= distdir %>/lib', src: '**', expand: true, cwd: 'lib/' }]
@@ -178,6 +179,13 @@ module.exports = function (grunt) {
                     process: true
                 }
             },
+            loader: {
+                src: ['src/loader.dev.js'],
+                dest: '<%= distdir %>/js/loader.dev.js',
+                options: {
+                    process: true
+                }
+            },
             install: {
                 src: ['src/installer/installer.html'],
                 dest: '<%= distdir %>/installer.html',
@@ -186,18 +194,18 @@ module.exports = function (grunt) {
                 }
             },
 
-            installJs: {
-                src: ['src/installer/**/*.js'],
-                dest: '<%= distdir %>/js/umbraco.installer.js',
-                options: {
-                    banner: "<%= banner %>\n(function() { \n\n angular.module('umbraco.install', []); \n",
-                    footer: "\n\n})();"
-                }
-            },
-            canvasdesignerJs: {
-                src: ['src/canvasdesigner/canvasdesigner.global.js', 'src/canvasdesigner/canvasdesigner.controller.js', 'src/canvasdesigner/editors/*.js', 'src/canvasdesigner/lib/*.js'],
-                dest: '<%= distdir %>/js/canvasdesigner.panel.js'
-            },
+            // installJs: {
+            //     src: ['src/installer/**/*.js'],
+            //     dest: '<%= distdir %>/js/umbraco.installer.js',
+            //     options: {
+            //         banner: "<%= banner %>\n(function() { \n\n angular.module('umbraco.install', []); \n",
+            //         footer: "\n\n})();"
+            //     }
+            // },
+            // canvasdesignerJs: {
+            //     src: ['src/canvasdesigner/canvasdesigner.global.js', 'src/canvasdesigner/canvasdesigner.controller.js', 'src/canvasdesigner/editors/*.js', 'src/canvasdesigner/lib/*.js'],
+            //     dest: '<%= distdir %>/js/canvasdesigner.panel.js'
+            // },
             controllers: {
                 src: ['src/controllers/**/*.controller.js', 'src/views/**/*.controller.js'],
                 dest: '<%= distdir %>/js/umbraco.controllers.js',
@@ -258,7 +266,7 @@ module.exports = function (grunt) {
 
         uglify: {
             options: {
-                mangle: true
+               mangle: false
             },
             combine: {
                 files: {

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
@@ -31,7 +31,7 @@
     "grunt-contrib-copy": "~0.7.0",
     "grunt-sync": "~0.4.1",
     "grunt-contrib-jshint": "~0.2.0",
-    "grunt-contrib-uglify": "~0.1.1",
+    "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.3.1",
     "grunt-html2js": "~0.1.0",
     "grunt-karma": "~0.5",

diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js
@@ -1,14 +1,15 @@
-LazyLoad.js(
-    [
+(function() {
+
+var deps = [
         'lib/jquery/jquery.min.js',
-        'lib/angular/1.1.5/angular.js',
+        'lib/angular/1.1.5/angular.min.js',
         'lib/underscore/underscore-min.js',
 
         'lib/jquery-ui/jquery-ui.min.js',
 
         'lib/angular/1.1.5/angular-cookies.min.js',
-        'lib/angular/1.1.5/angular-mobile.js',
-        'lib/angular/1.1.5/angular-sanitize.js',
+        'lib/angular/1.1.5/angular-mobile.min.js',
+        'lib/angular/1.1.5/angular-sanitize.min.js',
         'lib/angular/1.1.5/angular-mocks.js',
 
         'lib/angular/angular-ui-sortable.js',
@@ -28,9 +29,14 @@ LazyLoad.js(
         'lib/umbraco/NamespaceManager.js',
         'lib/umbraco/LegacyUmbClientMgr.js',
         'lib/umbraco/LegacySpeechBubble.js',
-
-        'js/umbraco.servervariables.js',
+
         'js/app.dev.js',
+        'js/routes.js',
+        'js/init.js'
+  ];
+
+  var umbFullDeps = [
+        'js/umbraco.servervariables.js',
         'js/umbraco.httpbackend.js',
         'js/umbraco.testing.js',
 
@@ -39,14 +45,24 @@ LazyLoad.js(
         'js/umbraco.resources.js',
         'js/umbraco.services.js',
         'js/umbraco.security.js',
-        'js/umbraco.controllers.js',
-        'js/routes.js',
-        'js/init.js'
-  ],
+        'js/umbraco.controllers.js'
+  ];
+
+  var umbMinDeps = [
+      'js/umbraco.min.js'
+  ];
+
+  var min = '<%=  minify%>';
+
+  deps.splice.apply(deps, [-2, 0].concat(min ? umbMinDeps : umbFullDeps));
+
+LazyLoad.js(
+    deps,
 
   function () {
     jQuery(document).ready(function () {
         angular.bootstrap(document, ['umbraco']);
     });
   }
-);
+);
+})();