Fix client JS concat order (TypeStrong#43)

lddubeau · May 12, 2017 · e75a7e6 · e75a7e6
1 parent c7f16d9
commit e75a7e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -10,7 +10,14 @@ module.exports = function(grunt)
                     basePath: 'themes',
                     declaration: false
                 },
-                src: ['src/default/assets/js/src/**/*.ts'],
+                src: [
+                    'src/default/assets/js/src/lib/**/*.ts',
+                    'src/default/assets/js/src/typedoc/Application.ts',
+                    'src/default/assets/js/src/typedoc/components/**/*.ts',
+                    'src/default/assets/js/src/typedoc/services/**/*.ts',
+                    'src/default/assets/js/src/typedoc/utils/**/*.ts',
+                    'src/default/assets/js/src/~bootstrap.ts'
+                ],
                 out: 'src/default/assets/js/main.js'
             }
         },

diff --git a/src/default/assets/js/main.js b/src/default/assets/js/main.js
@@ -88,10 +88,6 @@ var typedoc;
     typedoc.Application = Application;
 })(typedoc || (typedoc = {}));
 var typedoc;
-(function (typedoc) {
-    typedoc.app = new typedoc.Application();
-})(typedoc || (typedoc = {}));
-var typedoc;
 (function (typedoc) {
     var FilterItem = (function () {
         function FilterItem(key, value) {
@@ -820,3 +816,7 @@ var typedoc;
     }
     typedoc.animateHeight = animateHeight;
 })(typedoc || (typedoc = {}));
+var typedoc;
+(function (typedoc) {
+    typedoc.app = new typedoc.Application();
+})(typedoc || (typedoc = {}));