#232 - make module factory return a module name

jtblin · jtblin · commit 5d5c1e6143e0 · 2016-06-19T15:48:54.000+10:00
Allow doing something like this:

```
var angular = require('angular');
var app = angular.module('app', [
  require('angular-chart')
]);
```
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 test/fixtures/shots/
 coverage/
 examples/bundle.js
+examples/commonjs.bundle.js
diff --git a/.jscsrc b/.jscsrc
@@ -75,6 +75,7 @@
     "dist/**",
     "coverage/**",
     "examples/bundle.js",
+    "examples/commonjs.bundle.js",
     "examples/smoothscroll.min.js",
     "test/fixtures/coverage.js"
   ]
diff --git a/.jshintignore b/.jshintignore
@@ -2,6 +2,7 @@ node_modules/
 dist/
 tmp/
 examples/bundle.js
+examples/commonjs.bundle.js
 examples/smoothscroll.min.js
 coverage/
 test/fixtures/coverage.js
diff --git a/.jshintrc b/.jshintrc
@@ -6,6 +6,8 @@
   "trailing"      : true,     // Prohibit trailing whitespaces.
   "white"         : false,    // Check against strict whitespace and indentation rules.
   "indent"        : 2,        // {int} Number of spaces to use for indentation
+  "maxcomplexity" : 10,       // {int} Max number for cyclomatic complexity
+  "maxdepth"      : 2,        // {int} Max number for nesting blocks
   "newcap"        : true,     // true: Require capitalization of all constructor functions e.g. `new F()`
   "quotmark"      : "single", // Quotation mark consistency
   "-W058"         : true,     // Missing '()' invoking a constructor
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ script and options.
 ## Chart.js 2.0 and 1.0.0-alpha branch
 
 This is the `1.0.0-alpha` branch which requires Chart.js 2.0.0 version. Following semantic versioning,
-there are numerous breaking changes in this version notably:
+there are numerous **breaking changes** in this version notably:
 
 * all options now need to use the `chart-` prefix
 * `chart-colours` is now `chart-colors` and `chart-get-colour` is now `chart-get-color`
@@ -28,6 +28,7 @@ there are numerous breaking changes in this version notably:
 * obviously all Chart.js breaking changes as well in how options are set, etc.
 * disabling the `responsive` option doesn't work via global `Chart.defaults.global.responsive` anymore, 
 but must be set via standard options e.g. `ChartJsProvider.setOptions({ responsive: false });`
+* factory now returns a module name instead of a module instance
 
 ### npm
 
diff --git a/angular-chart.js b/angular-chart.js
@@ -48,7 +48,8 @@
     .directive('chartRadar', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('radar'); }])
     .directive('chartDoughnut', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('doughnut'); }])
     .directive('chartPie', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('pie'); }])
-    .directive('chartPolarArea', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('polarArea'); }]);
+    .directive('chartPolarArea', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('polarArea'); }])
+    .name;
 
   /**
    * Wrapper for chart.js
diff --git a/dist/angular-chart.js b/dist/angular-chart.js
@@ -48,7 +48,8 @@
     .directive('chartRadar', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('radar'); }])
     .directive('chartDoughnut', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('doughnut'); }])
     .directive('chartPie', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('pie'); }])
-    .directive('chartPolarArea', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('polarArea'); }]);
+    .directive('chartPolarArea', ['ChartJsFactory', function (ChartJsFactory) { return new ChartJsFactory('polarArea'); }])
+    .name;
 
   /**
    * Wrapper for chart.js
diff --git a/dist/angular-chart.js.tar.gz b/dist/angular-chart.js.tar.gz
diff --git a/dist/angular-chart.min.js b/dist/angular-chart.min.js
diff --git a/dist/angular-chart.min.js.map b/dist/angular-chart.min.js.map
diff --git a/examples/amd.html b/examples/amd.html
@@ -3,7 +3,6 @@
 <head lang="en">
   <meta charset="UTF-8">
   <title>AMD</title>
-  <link rel="stylesheet" href="../dist/angular-chart.css">
   <link href="bootstrap.css" rel="stylesheet">
 </head>
 <body ng-app="examples">
diff --git a/examples/commonjs.html b/examples/commonjs.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+  <meta charset="UTF-8">
+  <title>CommonJS</title>
+  <link href="bootstrap.css" rel="stylesheet">
+</head>
+<body ng-app="app">
+<br/>
+<div class="container">
+  <div class="row" ng-controller="CommonJSCtrl">
+    <div class="col-lg-6 col-sm-12">
+      <div class="panel panel-default">
+        <div class="panel-heading">CommonJS</div>
+        <div class="panel-body">
+          <canvas class="chart chart-line" chart-data="data" chart-series="series" chart-labels="labels"></canvas>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script src="commonjs.bundle.js"></script>
+</body>
+</html>
diff --git a/examples/commonjs.js b/examples/commonjs.js
@@ -0,0 +1,19 @@
+(function () {
+  'use strict';
+
+  var angular = require('angular');
+
+  var app = angular.module('app', [
+    require('angular-chart')
+  ]);
+
+  app.controller('CommonJSCtrl', ['$scope', function ($scope) {
+    $scope.labels = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
+    $scope.series = ['Series A', 'Series B'];
+    $scope.data = [
+      [65, 59, 80, 81, 56, 55, 40],
+      [28, 48, 40, 19, 86, 27, 90]
+    ];
+  }]);
+
+})();
diff --git a/examples/webpack.commonjs.js b/examples/webpack.commonjs.js
@@ -0,0 +1,18 @@
+(function () {
+  'use strict';
+
+  // install with npm: npm i --save angular-chart.js
+  // build with `npm bin`/webpack --config examples/webpack.commonjs.js --display-modules --progress
+  module.exports = {
+    entry: './examples/commonjs.js',
+    output: {
+      filename: './examples/commonjs.bundle.js'
+    },
+    resolve: {
+      alias: {
+        'angular-chart': '../angular-chart.js' // not required when you install with npm
+      }
+    }
+  };
+
+})();
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "sinon-chai": "^2.7.0",
     "testatic": "^0.1.0",
     "tmp-sync": "^1.1.0",
-    "webpack": "^1.12.15",
+    "webpack": "^1.13.1",
     "webshot": "^0.18.0"
   },
   "dependencies": {
diff --git a/test/fixtures/coverage.js b/test/fixtures/coverage.js

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`"dist/**",`
`76`	`76`	`"coverage/**",`
`77`	`77`	`"examples/bundle.js",`
	`78`	`+ "examples/commonjs.bundle.js",`
`78`	`79`	`"examples/smoothscroll.min.js",`
`79`	`80`	`"test/fixtures/coverage.js"`
`80`	`81`	`]`