noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to ember-cli@2.8.0

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2016-10-01 17:00:40 +01:00
parent 6837fb446e
commit f2f72ccc40
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/.travis.yml
View file

@ -14,7 +14,7 @@ before_install:
- npm install -g bower - npm install -g bower
- bower --version - bower --version
- npm install phantomjs-prebuilt - npm install phantomjs-prebuilt
- phantomjs --version - node_modules/phantomjs-prebuilt/bin/phantomjs --version
install: install:
- npm install - npm install

5
gui/Makefile
View file

@ -13,7 +13,6 @@
# limitations under the License. # limitations under the License.
GO ?= go GO ?= go
LDF :=
# The `make default` command cleans # The `make default` command cleans
# the go build and test files and # the go build and test files and
@ -32,7 +31,7 @@ default:
setup: setup:
@echo "Setup..." @echo "Setup..."
npm install -g bower npm install -g bower
npm install -g ember-cli@2.7.0 npm install -g ember-cli@2.8.0
# The `make install` command installs # The `make install` command installs
# the 3rd party dependencies needed # the 3rd party dependencies needed
@ -54,6 +53,6 @@ upgrade:
@echo "Upgrading..." @echo "Upgrading..."
npm cache clean && bower cache clean npm cache clean && bower cache clean
rm -rf node_modules bower_components dist tmp rm -rf node_modules bower_components dist tmp
npm install --save-dev ember-cli@2.7.0 npm install --save-dev ember-cli@2.8.0
npm install && bower install npm install && bower install
ember init ember init

5
gui/bower.json
View file

@ -1,8 +1,7 @@
{ {
"name": "gui", "name": "gui",
"dependencies": { "dependencies": {
"ember": "~2.7.0", "ember": "~2.8.0",
"ember-cli-shims": "0.1.1", "ember-cli-shims": "0.1.1"
"ember-qunit-notifications": "0.1.0"
} }
} }

3
gui/config/environment.js
View file

@ -4,7 +4,7 @@ module.exports = function(environment) {
var ENV = { var ENV = {
modulePrefix: 'gui', modulePrefix: 'gui',
environment: environment, environment: environment,
baseURL: '/', rootURL: '/',
locationType: 'auto', locationType: 'auto',
EmberENV: { EmberENV: {
FEATURES: { FEATURES: {
@ -29,7 +29,6 @@ module.exports = function(environment) {
if (environment === 'test') { if (environment === 'test') {
// Testem prefers this... // Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'none'; ENV.locationType = 'none';
// keep test console output quieter // keep test console output quieter

6
gui/package.json
View file

@ -21,7 +21,7 @@
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.4.2", "broccoli-asset-rev": "^2.4.2",
"ember-ajax": "^2.0.1", "ember-ajax": "^2.0.1",
"ember-cli": "2.7.0", "ember-cli": "2.8.0",
"ember-cli-app-version": "^1.0.0", "ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6", "ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0", "ember-cli-dependency-checker": "^1.2.0",
@ -29,12 +29,12 @@
"ember-cli-htmlbars-inline-precompile": "^0.3.1", "ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0", "ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0", "ember-cli-jshint": "^1.0.0",
"ember-cli-qunit": "^2.0.0", "ember-cli-qunit": "^2.1.0",
"ember-cli-release": "^0.2.9", "ember-cli-release": "^0.2.9",
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0", "ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "^2.7.0", "ember-data": "^2.8.0",
"ember-export-application-global": "^1.0.5", "ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1", "ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3", "ember-resolver": "^2.0.3",