Ver 0.0.9 - Integrated ng2-mat css into production build.. Missing fonts

natarajs · Feb 11, 2016 · ff07c31 · ff07c31
1 parent 9bf7d32
commit ff07c31
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -29,6 +29,7 @@ module.exports = function(config) {
       { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
       { pattern: 'test/**/*.js', included: false, watched: true },
       { pattern: 'node_modules/systemjs/dist/system-polyfills.js', included: false, watched: false }, // PhantomJS2 (and possibly others) might require it
+      { pattern: 'node_modules/ng2-material/**/*.js', included: false, watched: false },
 
       'test-main.js'
     ],

diff --git a/package.json b/package.json
@@ -88,7 +88,6 @@
   },
   "dependencies": {
     "angular2": "2.0.0-beta.0",
-    "bootstrap": "^3.3.5",
     "es6-module-loader": "^0.17.8",
     "es6-shim": "^0.33.3",
     "ng2-material": "0.1.0",

diff --git a/src/index.html b/src/index.html
@@ -21,6 +21,9 @@
   <!-- libs:js -->
   <!-- endinject -->
 
+  <!-- inject:js -->
+  <!-- endinject -->
+
   <script>
     System.import('main')
       .catch(function (e) {
@@ -29,8 +32,5 @@
       });
   </script>
 
-  <!-- inject:js -->
-  <!-- endinject -->
-
 </body>
 </html>
diff --git a/test-main.js b/test-main.js
@@ -23,7 +23,8 @@ System.config({
   defaultJSExtensions: true,
   paths: {
     'angular2/*': 'node_modules/angular2/*.js',
-    'rxjs/*': 'node_modules/rxjs/*.js'
+    'rxjs/*': 'node_modules/rxjs/*.js',
+    'ng2-material/*': 'node_modules/ng2-material/*.js'
   }
 });
 

diff --git a/tools/config.ts b/tools/config.ts
@@ -22,7 +22,7 @@ export const HOT_LOADER_PORT      = 5578;
 
 export const BOOTSTRAP_MODULE     = ENABLE_HOT_LOADING ? 'hot_loader_main' : 'main';
 
-export const APP_TITLE            = 'My Angular2 App';
+export const APP_TITLE            = 'Data Prep App';
 
 export const APP_SRC              = 'src';
 export const ASSETS_SRC           = `${APP_SRC}/assets`;
@@ -62,14 +62,16 @@ export const DEV_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencie
   { src: 'angular2/bundles/angular2.js', inject: 'libs', dest: JS_DEST },
   { src: 'angular2/bundles/router.js', inject: 'libs', dest: JS_DEST },
   { src: 'angular2/bundles/http.js', inject: 'libs', dest: JS_DEST },
-  { src: 'bootstrap/dist/css/bootstrap.css', inject: true, dest: CSS_DEST }
+  { src: 'ng2-material/dist/ng2-material.css', inject: true, dest: CSS_DEST },
+  { src: 'ng2-material/dist/font.css', inject: true, dest: CSS_DEST }
 ]);
 
 export const PROD_NPM_DEPENDENCIES: InjectableDependency[] = normalizeDependencies([
   { src: 'reflect-metadata/Reflect.js', inject: 'shims' },
   { src: 'es6-shim/es6-shim.min.js', inject: 'shims' },
   { src: 'angular2/bundles/angular2-polyfills.min.js', inject: 'libs' },
-  { src: 'bootstrap/dist/css/bootstrap.min.css', inject: true }
+  { src: 'ng2-material/dist/ng2-material.css', inject: 'libs'},
+  { src: 'ng2-material/dist/font.css', inject: 'libs' }
 ]);
 
 // Declare local files that needs to be injected
@@ -89,6 +91,7 @@ const SYSTEM_CONFIG_DEV = {
   paths: {
     [BOOTSTRAP_MODULE]: `${APP_BASE}${BOOTSTRAP_MODULE}`,
     'angular2/*': `${APP_BASE}angular2/*`,
+    'ng2-material/*': `${APP_BASE}ng2-material/*`,
     'rxjs/*': `${APP_BASE}rxjs/*`,
     '*': `${APP_BASE}node_modules/*`
   },