Fix Webpack integration due to some ES6 and ng-annotate issues

.babelrc

@@ -0,0 +1,4 @@
+{
+    "presets": ["es2015", "stage-2"],
+    "plugins": ["add-module-exports"]
+}

.gitignore

@@ -1,12 +1,13 @@
-node_modules
-dist
-.tmp
 .sass-cache
+.tmp
+dist
+examples/blog/assets
+examples/blog/build
+lib/
+node_modules
+npm-debug.log
+src/css
 src/javascripts/bower_components
 src/javascripts/config.js
 src/javascripts/test/fixtures/examples/blog
 src/styles/*.css
-src/css
-examples/blog/build
-examples/blog/assets
-npm-debug.log

Makefile

@@ -12,7 +12,15 @@ run: examples/blog/build
 examples/blog/build:
 	@mkdir examples/blog/build
 
+transpile:
+	@mkdir -p lib/
+	@rm -rf lib/*
+	@./node_modules/.bin/babel src/javascripts --out-dir lib/javascripts --compact false --source-maps > /dev/null
+	@cd src && cp --parents `find . -name *.html` ../lib # copy all HTML files keeping structure from src to lib
+	@cp -Rf ./src/sass/ lib/
+
 build:
+	@make transpile
 	@NODE_ENV=production ./node_modules/webpack/bin/webpack.js -p --optimize-minimize --optimize-occurence-order --optimize-dedupe --progress --devtool source-map
 	@cp -Rf build examples/blog/
 	@echo "Files build/ng-admin.min.css and build/ng-admin.min.js updated (with minification)"

package.json

@@ -3,87 +3,86 @@
   "version": "1.0.0-alpha4",
   "license": "MIT",
   "private": false,
-  "main": "src/javascripts/ng-admin.js",
+  "main": "lib/javascripts/ng-admin.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/marmelab/ng-admin.git"
   },
   "dependencies": {
-      "admin-config": "0.11.0",
-      "angular": "1.4.10",
-      "angular-numeraljs": "1.3.1",
-      "angular-sanitize": "1.5.1",
-      "angular-translate": "2.11.0",
-      "angular-ui-bootstrap": "1.2.4",
-      "angular-ui-codemirror": "0.3.0",
-      "angular-ui-router": "0.2.18",
-      "angularjs": "0.0.1",
-      "bootstrap-sass": "3.3.6",
-      "codemirror": "5.12.0",
-      "core-js": "0.6.1",
-      "es6-promise": "2.3.0",
-      "font-awesome": "4.5.0",
-      "humane-js": "3.2.2",
-      "ng-file-upload": "7.3.9",
-      "nginflection": "1.1.10",
-      "node-libs-browser": "0.5.3",
-      "node-sass": "3.4.2",
-      "nprogress": "0.2.0",
-      "numeral": "1.5.3",
-      "papaparse": "4.1.2",
-      "rangy": "1.3.0",
-      "restangular": "1.5.2",
-      "textangular": "1.5.1",
-      "ui-select": "angular-ui/ui-select.git#271bf6a03078587c5afdb05f61e826573a13d348)",
-      "underscore": "1.8.3"
+    "angular": "~1.4.8"
   },
   "devDependencies": {
-    "angular-mocks": "1.4.10",
-    "babel": "4.7.16",
-    "babel-core": "5.8.35",
-    "babel-loader": "5.4.0",
-    "chai": "3.5.0",
-    "css-loader": "0.12.1",
-    "exports-loader": "0.6.3",
-    "extract-text-webpack-plugin": "0.8.2",
-    "fakerest": "1.1.4",
-    "file-loader": "0.8.5",
-    "html-loader": "0.3.0",
-    "imports-loader": "0.6.5",
-    "jasmine": "2.4.1",
-    "jasmine-core": "2.4.1",
-    "jshint-stylish": "0.1.5",
-    "json-server": "0.8.9",
-    "jsonlint": "1.6.2",
-    "karma": "0.13.22",
-    "karma-chrome-launcher": "0.2.2",
-    "karma-jasmine": "0.3.8",
-    "karma-ng-html2js-preprocessor": "0.2.1",
-    "karma-ng-scenario": "0.1.0",
-    "karma-phantomjs-launcher": "1.0.0",
-    "karma-webpack": "1.7.0",
-    "mocha": "2.4.5",
+    "admin-config": "0.12.1",
+    "angular-mocks": "~1.4.8",
+    "angular-numeraljs": "^1.1.6",
+    "angular-sanitize": "^1.3.15",
+    "angular-translate": "^2.11.0",
+    "angular-ui-bootstrap": "~1.2.1",
+    "angular-ui-codemirror": "^0.3.0",
+    "angular-ui-router": "^0.2.14",
+    "angularjs": "0.0.1",
+    "babel": "^6.5.2",
+    "babel-cli": "^6.14.0",
+    "babel-core": "^6.14.0",
+    "babel-loader": "^6.2.5",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-stage-1": "^6.13.0",
+    "babel-preset-stage-2": "^6.13.0",
+    "bootstrap-sass": "^3.3.4",
+    "chai": "^3.3.0",
+    "codemirror": "^5.2.0",
+    "core-js": "^0.6.1",
+    "css-loader": "^0.12.0",
+    "es6-promise": "^2.3.0",
+    "exports-loader": "^0.6.2",
+    "extract-text-webpack-plugin": "^0.8.0",
+    "fakerest": "^1.1.4",
+    "file-loader": "^0.8.1",
+    "font-awesome": "^4.3.0",
+    "html-loader": "^0.3.0",
+    "humane-js": "^3.2.2",
+    "jasmine": "~2.4.1",
+    "jasmine-core": "~2.4.1",
+    "jshint-stylish": "~0.1.3",
+    "json-server": "~0.8.8",
+    "jsonlint": "^1.6.2",
+    "karma": "~0.13.21",
+    "karma-chrome-launcher": "~0.2.2",
+    "karma-jasmine": "~0.3.7",
+    "karma-ng-html2js-preprocessor": "~0.2.1",
+    "karma-ng-scenario": "~0.1.0",
+    "karma-phantomjs-launcher": "~1.0.0",
+    "karma-webpack": "~1.7.0",
+    "mocha": "^2.1.0",
     "ng-annotate-loader": "0.0.2",
-    "ng-annotate-webpack-plugin": "0.1.2",
-    "ngtemplate-loader": "1.3.1",
-    "phantomjs-prebuilt": "2.1.5",
-    "protractor": "3.1.1",
-    "sass-loader": "0.5.0",
-    "sinon": "1.14.1",
-    "style-loader": "0.12.4",
-    "superagent": "0.18.2",
-    "url-loader": "0.5.7",
-    "webpack": "1.12.14",
-    "webpack-dev-server": "1.14.1"
+    "ng-file-upload": "^7.0.12",
+    "nginflection": "^1.1.10",
+    "ngtemplate-loader": "^1.3.0",
+    "node-libs-browser": "^0.5.0",
+    "node-sass": "^3.4.2",
+    "nprogress": "^0.2.0",
+    "numeral": "^1.5.3",
+    "papaparse": "^4.1.1",
+    "phantomjs-prebuilt": "~2.1.4",
+    "protractor": "~3.1.1",
+    "rangy": "^1.3.0",
+    "restangular": "~1.5.2",
+    "sass-loader": "^0.5.0",
+    "sinon": "~1.14.1",
+    "style-loader": "^0.12.2",
+    "superagent": "^0.18.2",
+    "textangular": "1.4.3",
+    "ui-select": "angular-ui/ui-select#271bf6a03078587c5afdb05f61e826573a13d348",
+    "underscore": "^1.8.3",
+    "url-loader": "^0.5.5",
+    "webpack": "^1.10.0",
+    "webpack-dev-server": "^1.10.1"
   },
   "engines": {
     "node": ">=4.2.0"
   },
   "scripts": {
     "test": "make test"
-  },
-  "dependencies": {
-    "imports-loader": "~0.6.5",
-    "ui-select": "angular-ui/ui-select#271bf6a03078587c5afdb05f61e826573a13d348"
   }
 }

src/javascripts/ng-admin.js

@@ -6,20 +6,23 @@ require('./ng-admin/Crud/CrudModule');
 
 import Factory from 'admin-config/lib/Factory';
 
-var factory = angular.module('AdminDescriptionModule', []);
+const moduleName = 'ng-admin';
+const factory = angular.module('AdminDescriptionModule', []);
 factory.constant('AdminDescription', new Factory());
 
-var ngadmin = angular.module('ng-admin', [
+const ngadmin = angular.module(moduleName, [
     'ui.select',
     'main',
     'crud',
     'AdminDescriptionModule'
 ]);
 
-ngadmin.config(function(NgAdminConfigurationProvider, AdminDescription) {
+ngadmin.config(['NgAdminConfigurationProvider', 'AdminDescription', function(NgAdminConfigurationProvider, AdminDescription) {
     NgAdminConfigurationProvider.setAdminDescription(AdminDescription);
-});
+}]);
 
-ngadmin.config(function(uiSelectConfig) {
+ngadmin.config(['uiSelectConfig', function(uiSelectConfig) {
     uiSelectConfig.theme = 'bootstrap';
-});
+}]);
+
+export default moduleName;

src/javascripts/ng-admin/Main/MainModule.js

@@ -7,7 +7,6 @@ var MainModule = angular.module('main', ['ui.router', 'restangular', 'pascalprec
 
 MainModule.controller('AppController', require('./component/controller/AppController'));
 MainModule.controller('DashboardController', require('./component/controller/DashboardController'));
-
 MainModule.provider('NgAdminConfiguration', require('./component/provider/NgAdminConfiguration'));
 
 MainModule.filter('orderElement', require('./component/filter/OrderElement'));

src/javascripts/vendors.js

@@ -2,12 +2,12 @@ global.rangy = require('../../node_modules/rangy/lib/rangy-core');
 global.rangy = require('../../node_modules/rangy/lib/rangy-selectionsaverestore');
 global.numeral = require('numeral');
 
-require('angular');
+require('../../node_modules/angular/angular.js');
 require('angular-ui-router');
 require('../../node_modules/textangular/dist/textAngular-sanitize');
 require('angular-ui-codemirror');
 require('textangular/dist/textAngular-sanitize'),
-require('imports?define=>false!textangular');
+require('textangular');
 require('nginflection');
 require('ui-select');
 require('angular-translate');

webpack.config.js

@@ -16,8 +16,7 @@ module.exports = {
     },
     module: {
         loaders: [
-            { test: /\.js/, loaders: ['babel'], exclude: /node_modules[\\\/](?!admin-config)/ },
-            { test: /\.js/, loaders: ['ng-annotate'] },
+            { test: /\.js/, loaders: ['babel'], include: __dirname + '/src/javascripts' },
             { test: /\/angular\.min\.js$/, loader: 'exports?angular' },
             { test: /\.html$/, loader: 'html' },
             { test: /\.(woff2?|svg|ttf|eot)(\?.*)?$/, loader: 'url' },