[RFR] Fix non-dev dependencies

package.json

@@ -11,46 +11,56 @@
   "files": [
       "*.md",
       "build/",
-      "lib/"
+      "src/"
   ],
   "dependencies": {
-    "angular": "~1.4.8"
-  },
-  "devDependencies": {
+    "angular": "~1.4.8",
     "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-codemirror": "jpetitcolas/ui-codemirror#di",
     "angular-ui-router": "^0.2.14",
-    "angularjs": "0.0.1",
+    "bootstrap-sass": "^3.3.7",
+    "codemirror": "^5.2.0",
+    "core-js": "^0.6.1",
+    "es6-promise": "^2.3.0",
+    "font-awesome": "^4.3.0",
+    "humane-js": "^3.2.2",
+    "jsonlint": "^1.6.2",
+    "ng-file-upload": "^7.0.12",
+    "nginflection": "^1.1.10",
+    "node-libs-browser": "^0.5.0",
+    "nprogress": "^0.2.0",
+    "numeral": "^1.5.3",
+    "papaparse": "^4.1.1",
+    "rangy": "^1.3.0",
+    "restangular": "~1.5.2",
+    "textangular": "1.4.3",
+    "ui-select": "0.18.1",
+    "underscore": "^1.8.3"
+  },
+  "devDependencies": {
+    "angular-mocks": "~1.4.8",
     "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-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",
+    "css-loader": "^0.25.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",
+    "file-loader": "^0.9.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",
@@ -60,28 +70,17 @@
     "karma-webpack": "~1.7.0",
     "mocha": "^2.1.0",
     "ng-annotate-loader": "0.0.2",
-    "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",
+    "node-sass": "^3.9.3",
     "phantomjs-prebuilt": "~2.1.4",
     "protractor": "~3.1.1",
-    "rangy": "^1.3.0",
-    "restangular": "~1.5.2",
-    "sass-loader": "^0.5.0",
+    "sass-loader": "^4.0.2",
     "sinon": "~1.14.1",
-    "style-loader": "^0.12.2",
+    "style-loader": "^0.13.1",
     "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"
+    "webpack": "^1.13.2",
+    "webpack-dev-server": "^1.15.1"
   },
   "engines": {
     "node": ">=4.2.0"

src/javascripts/ng-admin/Crud/CrudModule.js

@@ -1,7 +1,20 @@
 import angular from 'angular';
 
+require('textangular/dist/textAngular-sanitize');
+require('textangular/dist/textAngularSetup');
+require('textangular/dist/textAngular');
+
+require('angular-ui-codemirror');
+
 var CrudModule = angular.module('crud', [
-    'ui.router', 'ui.bootstrap', 'ngSanitize', 'textAngular', 'ngInflection', 'ui.codemirror', 'ngFileUpload', 'ngNumeraljs'
+    'ui.router',
+    'ui.bootstrap',
+    'ui.codemirror',
+    'ngSanitize',
+    'textAngular',
+    'ngInflection',
+    'ngFileUpload',
+    'ngNumeraljs',
 ]);
 
 CrudModule.controller('ListLayoutController', require('./list/ListLayoutController'));

src/javascripts/vendors.js

@@ -1,19 +1,15 @@
-global.rangy = require('../../node_modules/rangy/lib/rangy-core');
-global.rangy = require('../../node_modules/rangy/lib/rangy-selectionsaverestore');
+global.rangy = require('rangy');
+global.rangy = require('rangy/lib/rangy-selectionsaverestore');
 global.numeral = require('numeral');
 
-require('../../node_modules/angular/angular.js');
+require('angular');
 require('angular-ui-router');
-require('../../node_modules/textangular/dist/textAngular-sanitize');
-require('angular-ui-codemirror');
-require('textangular/dist/textAngular-sanitize'),
-require('textangular');
 require('nginflection');
 require('ui-select');
 require('angular-translate');
 
-require('../../node_modules/angular-numeraljs/dist/angular-numeraljs');
+require('angular-numeraljs');
 require('angular-ui-bootstrap/dist/ui-bootstrap-tpls');
-require('../../node_modules/ng-file-upload/dist/ng-file-upload');
+require('ng-file-upload');
 
 global._ = require('underscore');