chore: fix build process and unit testing

Kamil Kisiela · Kamil Kisiela · commit 8b10b29d49cb · 2015-11-29T15:34:44.000+01:00
diff --git a/dist/formly-material.js b/dist/formly-material.js
diff --git a/dist/formly-material.min.js b/dist/formly-material.min.js
diff --git a/dist/formly-material.min.js.map b/dist/formly-material.min.js.map
diff --git a/karma.conf.js b/karma.conf.js
@@ -73,7 +73,7 @@ module.exports = function (config) {
 
 
         // enable / disable watching file and executing tests whenever any file changes
-        autoWatch: false,
+        autoWatch: !ciEnv,
 
 
         // start these browsers
diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
     "codacy-coverage": "^1.1.3",
     "codecov.io": "^0.1.6",
     "coveralls": "^2.11.4",
+    "html-loader": "^0.4.0",
     "isparta": "^4.0.0",
     "isparta-loader": "1.0.0",
     "jasmine-core": "^2.3.4",
@@ -54,8 +55,7 @@
     "karma-jasmine": "^0.3.6",
     "karma-sourcemap-loader": "^0.3.6",
     "karma-webpack": "^1.7.0",
-    "path": "^0.12.7",
-    "underscore": "^1.8.3",
+    "lodash": "^3.10.1",
     "webpack": "^1.12.9"
   }
 }
diff --git a/src/types/checkbox/checkbox.html b/src/types/checkbox/checkbox.html
@@ -0,0 +1,5 @@
+<div>
+    <md-checkbox ng-model="model[options.key]">
+        {{to.label}}
+    </md-checkbox>
+</div>
diff --git a/src/types/checkbox/checkbox.js b/src/types/checkbox/checkbox.js
@@ -1,11 +1,8 @@
+import template from './checkbox.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'checkbox',
-        template: `
-            <div>
-                <md-checkbox ng-model="model[options.key]">
-                    {{to.label}}
-                </md-checkbox>
-            </div>`
+        template: template
     });
 }
diff --git a/src/types/chips/chips.html b/src/types/chips/chips.html
@@ -0,0 +1 @@
+<md-chips ng-model="model[options.key]"></md-chips>
diff --git a/src/types/chips/chips.js b/src/types/chips/chips.js
@@ -1,7 +1,9 @@
+import template from './chips.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'chips',
-        template: `<md-chips ng-model="model[options.key]"></md-chips>`,
+        template: template,
         defaultOptions: {
             defaultValue: [],
             ngModelAttrs: {
diff --git a/src/types/datepicker/datepicker.js b/src/types/datepicker/datepicker.js
@@ -1,10 +1,9 @@
+import template from './datepicker.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'datepicker',
-        template: `
-        <div>
-            <md-datepicker ng-model="model[options.key]"></md-datepicker>
-        </div>`,
+        template: template,
         wrapper: ['messages'],
         defaultOptions: {
             ngModelAttrs: {
diff --git a/src/types/input/input.html b/src/types/input/input.html
@@ -0,0 +1 @@
+<input ng-model="model[options.key]">
diff --git a/src/types/input/input.js b/src/types/input/input.js
@@ -1,7 +1,9 @@
+import template from './input.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'input',
-        template: `<input ng-model="model[options.key]">`,
+        template: template,
         wrapper: ['label', 'messages', 'inputContainer'],
         defaultOptions: {
             ngModelAttrs: {
diff --git a/src/types/radio/radio.js b/src/types/radio/radio.js
@@ -1,15 +1,9 @@
+import template from './radio.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'radio',
-        template: `
-        <md-radio-group ng-model="model[options.key]">
-            <md-radio-button
-                ng-repeat="option in to.options"
-                ng-value="option[to.valueProp || 'value']">
-                {{option[to.labelProp || 'name']}}
-            </md-radio-button>
-        </md-radio-group>
-        `,
+        template: template,
         apiCheck: (check) => ({
             templateOptions: {
                 options: check.arrayOf(check.object),
diff --git a/src/types/select/select.js b/src/types/select/select.js
@@ -1,13 +1,9 @@
+import template from './select.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'select',
-        template: `
-        <md-select ng-model="model[options.key]">
-    <md-option ng-repeat="option in to.options" ng-value="option[to.valueProp || 'value']">
-        {{ option[to.labelProp || 'name'] }}
-    </md-option>
-</md-select>
-        `,
+        template: template,
         wrapper: ['label', 'messages', 'inputContainer'],
         defaultOptions: {
             ngModelAttrs: {
diff --git a/src/types/slider/slider.js b/src/types/slider/slider.js
@@ -1,7 +1,9 @@
+import template from './slider.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'slider',
-        template: `<md-slider ng-model="model[options.key]"></md-slider>`,
+        template: template,
         defaultOptions: {
             ngModelAttrs: {
                 min: {
diff --git a/src/types/switch/switch.js b/src/types/switch/switch.js
@@ -1,6 +1,8 @@
+import template from './switch.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'switch',
-        template: `<md-switch ng-model="model[options.key]">{{to.label}}</md-switch>`
+        template: template
     });
 }
diff --git a/src/types/textarea/textarea.js b/src/types/textarea/textarea.js
@@ -1,7 +1,9 @@
+import template from './textarea.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setType({
         name: 'textarea',
-        template: `<textarea ng-model="model[options.key]"></textarea>`,
+        template: template,
         wrapper: ['label', 'messages', 'inputContainer'],
         defaultOptions: {
             ngModelAttrs: {
diff --git a/src/wrappers/input-container/input-container.js b/src/wrappers/input-container/input-container.js
@@ -1,10 +1,8 @@
+import template from './input-container.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setWrapper({
         name: 'inputContainer',
-        template: `
-        <md-input-container>
-            <formly-transclude></formly-transclude>
-        </md-input-container>
-        `
+        template: template
     });
 }
diff --git a/src/wrappers/label/label.js b/src/wrappers/label/label.js
@@ -1,9 +1,9 @@
+import template from './label.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setWrapper({
         name: 'label',
-        template: `
-        <label for="{{id}}">{{to.label}}{{to.required ? '*' : ''}}</label>
-        <formly-transclude></formly-transclude>`,
+        template: template,
         apiCheck: (check) => ({
             templateOptions: {
                 label: check.string
diff --git a/src/wrappers/messages/messages.js b/src/wrappers/messages/messages.js
@@ -1,13 +1,8 @@
+import template from './messages.html';
+
 export default (formlyConfigProvider) => {
     formlyConfigProvider.setWrapper({
         name: 'messages',
-        template: `
-        <formly-transclude></formly-transclude>
-            <div ng-messages="fc.$error">
-                <div ng-repeat="(name, message) in ::options.validation.messages" ng-message-exp="name">
-                {{message(fc.$viewValue, fc.$modelValue, this)}}
-                </div>
-            </div>
-        `
+        template: template
     });
 }
diff --git a/tests/index-spec.js b/tests/index-spec.js
@@ -1,4 +1,3 @@
-import 'api-check';
 import './../src';
 
 import './runs';
diff --git a/webpack/build.js b/webpack/build.js
@@ -1,5 +1,3 @@
-var _ = require('underscore');
-
 module.exports = function (type) {
     return {
         entry: './src/index.js',
@@ -16,10 +14,12 @@ module.exports = function (type) {
     }
 
     function loaders() {
-        return [{
-            test: /\.js$/,
-            exclude: /node_modules/,
-            loader: 'babel'
-        }];
+        return [
+            {
+                test: /\.js$/,
+                exclude: /node_modules/,
+                loader: 'babel'
+            }
+        ];
     }
 };
diff --git a/webpack/common.js b/webpack/common.js
@@ -0,0 +1,22 @@
+module.exports = {
+    stats: {
+        colors: true,
+        reasons: true
+    },
+    resolve: {
+        extensions: ["", ".js", ".html"]
+    },
+    externals: {
+        angular: 'angular'
+    },
+    module: {
+        loaders: [
+            {
+                test: /\.html$/,
+                exclude: /node_modules/,
+                include: /src/,
+                loader: 'html'
+            }
+        ]
+    }
+};
diff --git a/webpack/config.js b/webpack/config.js
@@ -1,28 +1,21 @@
-var _ = require('underscore');
+var _ = require('lodash');
 var test = require('./test');
 var dist = require('./dist');
 var prod = require('./prod');
-var common = {
-    stats: {
-        colors: true,
-        reasons: true
-    },
-    resolve: {
-        extensions: ["", ".js"]
-    },
-    externals: [
-        'angular'
-    ]
-    /*externals: {
-     angular: 'angular',
-     'angular-messages': 'ngMessages',
-     'angular-material': 'ngMaterial',
-     'angular-formly': 'formly'
-     }*/
-};
+var common = require('./common');
 
 module.exports = {
-    test: _.extend({}, common, test),
-    dist: _.extend({}, common, dist),
-    prod: _.extend({}, common, prod)
-};
+    test: extend(test),
+    dist: extend(dist),
+    prod: extend(prod)
+};
+
+function extend(cfg) {
+    var config = _.merge({}, common, cfg);
+    
+    // push common module loaders
+    _.each(common.module.loaders, function (loader) {
+        config.module.loaders.push(loader);
+    });
+    return config;
+}
diff --git a/webpack/test.js b/webpack/test.js
@@ -4,14 +4,20 @@ module.exports = {
         loaders: [
             // transpile all files except testing sources with babel as usual
             {
-                test: /\-spec.js$/,
+                test: /\.js$/,
+                include: [
+                    /tests/
+                ],
                 exclude: /node_modules/,
                 loader: 'babel'
             },
             // transpile and instrument only testing sources with isparta
             {
                 test: /\.js$/,
-                exclude: /node_modules|\-spec.js$/,
+                exclude: /node_modules/,
+                include: [
+                    /src/
+                ],
                 loader: 'isparta'
             }
         ]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<md-chips ng-model="model[options.key]"></md-chips>`