diff --git a/app/index.html b/app/index.html index 945f4862..5131fcab 100644 --- a/app/index.html +++ b/app/index.html @@ -10,7 +10,7 @@ - + @@ -51,6 +51,10 @@
+ + + + diff --git a/app/index.js b/app/index.js index 20dd8c9c..7de9bf98 100644 --- a/app/index.js +++ b/app/index.js @@ -1,4 +1,3 @@ -global.jQuery = require('jquery') global._ = require('lodash') global.moment = require('moment') global.camelize = require('camelize') @@ -7,18 +6,15 @@ global.listify = require('listify') global.isEmptyObject = require('is-empty-object') global.browser = require('bowser') -require('angular') require('angular-ui-router') require('angular-sanitize/angular-sanitize') require('angular-cookie') require('ng-token-auth') require('angular-aria') require('angular-animate') -require('angular-material') require('angular-messages') require('ng-focus-if') require('angular-upload') -require('angular-material-icons') require('ng-sanitize') require('angular-truncate-2') require('angular-marked') diff --git a/app/package.json b/app/package.json index 2f86dfb7..899046a7 100644 --- a/app/package.json +++ b/app/package.json @@ -3,11 +3,18 @@ "transform": [ ["coffeeify", { "extension": ".coffee" } ], ["browserify-ngannotate", { "ext": [ ".js", ".coffee" ] } ], + "browserify-shim", "babelify", "envify", ["evalify", { "files": ["app/configs/app.js", "node_modules/app/configs/app.js"] } ], ["txtify2", { "extensions": [ "html" ] } ], "concatenify" ] + }, + "browserify-shim": { + "jquery": "global:jQuery", + "angular": "global:angular", + "angular-material": "global:angular", + "angular-material-icons": "global:angular" } } diff --git a/package.json b/package.json index d2f16c0c..5888fea5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "napa": {}, "dependencies": { "ampersand-state": "^4.5.6", - "angular": "^1.3.2", "angular-animate": "^1.4.3", "angular-aria": "^1.4.3", "angular-autodisable": "^0.2.2", @@ -52,8 +51,6 @@ "angular-chart.js": "^1.0.0-alpha3", "angular-cookie": "ivpusic/angular-cookie#v4.0.9", "angular-marked": "git@github.com:Hypercubed/angular-marked.git", - "angular-material": "^0.10.0", - "angular-material-icons": "^0.6.0", "angular-messages": "^1.4.3", "angular-sanitize": "^1.3.8", "angular-truncate-2": "^0.1.2", @@ -91,6 +88,7 @@ "brfs": "^1.2.0", "browserify": "^10.2.4", "browserify-ngannotate": "^0.7.1", + "browserify-shim": "^3.8.12", "chai": "^1.10.0", "chai-as-promised": "^4.1.1", "coffee-script": "^1.8.0",