Skip to content

Commit

Permalink
Upgrade All the Dependencies! (#523)
Browse files Browse the repository at this point in the history
  • Loading branch information
offirgolan authored Jul 31, 2017
1 parent 841074c commit 48d24f0
Show file tree
Hide file tree
Showing 22 changed files with 2,175 additions and 1,186 deletions.
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
18 changes: 7 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -13,15 +13,11 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
yarn-error.log
testem.log
coverage.json
lcov.dat

# ember-try files
*.ember-try

/.vscode/*
/typings/*
.vscodeignore
jsconfig.json
# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
5 changes: 0 additions & 5 deletions .jscsrc

This file was deleted.

33 changes: 0 additions & 33 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.editorconfig
.ember-cli
.gitignore
.jshintrc
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
Expand Down
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
language: node_js
node_js:
- "4"
- "6"

sudo: required
sudo: false
dist: trusty

cache:
Expand All @@ -14,11 +14,6 @@ cache:
addons:
code_climate:
repo_token: 32e4df25574ba02aacb75e6d34b9c667044984df279e20a208884d7e9e9d4a8d
apt:
sources:
- google-chrome
packages:
- google-chrome-stable

env:
- EMBER_TRY_SCENARIO=default
Expand All @@ -41,19 +36,17 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- npm install -g codeclimate-test-reporter
- npm install -g bower
- yarn global add codeclimate-test-reporter
- yarn global add bower

install:
- yarn install --no-lockfile
- bower install

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- HEADLESS=true node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

after_script:
- codeclimate-test-reporter < coverage/lcov.info
6 changes: 1 addition & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"name": "ember-cp-validations",
"dependencies": {
"jquery": "~2.1.4",
"ember": "2.10.0",
"ember-cli-shims": "~0.1.3",
"moment": ">= 2.8.0",
"moment-timezone": ">= 0.1.0",
"font-awesome": "~4.5.0"
"moment-timezone": ">= 0.1.0"
}
}
10 changes: 3 additions & 7 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/**
* Copyright 2016, Yahoo! Inc.
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
*/
/* jshint node:true */
/* eslint-env node */
'use strict';

module.exports = function( /* environment, appConfig */ ) {
return {};
module.exports = function(/* environment, appConfig */) {
return { };
};
8 changes: 5 additions & 3 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*jshint node:true*/
/* eslint-env node */
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
let app = new EmberAddon(defaults, {
snippetSearchPaths: ['addon','tests/dummy/app'],
snippetPaths: ['snippets','tests/dummy/snippets']
});
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
*/

/* jshint node: true */
/* eslint-env node */
'use strict';

module.exports = {
Expand Down
53 changes: 27 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"url": "http://github.com/offirgolan/ember-cp-validations.git"
},
"engines": {
"node": ">= 0.12.0"
"node": "^4.5 || 6.* || >= 7.*"
},
"author": "Offir Golan <offirgolan@gmail.com>",
"contributors": [
Expand All @@ -36,39 +36,40 @@
"license": "BSD-3-Clause",
"devDependencies": {
"broccoli-asset-rev": "^2.4.6",
"ember-cli": "^2.10.0",
"ember-cli": "^2.14.1",
"ember-cli-app-version": "^2.0.0",
"ember-cli-autoprefixer": "^0.6.0",
"ember-cli-autoprefixer": "^0.7.0",
"ember-cli-changelog": "0.3.4",
"ember-cli-code-coverage": "0.3.11",
"ember-cli-code-coverage": "0.4.1",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-github-pages": "^0.1.2",
"ember-cli-htmlbars": "^1.1.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-htmlbars": "^2.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.4.4",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-jshint": "^2.0.1",
"ember-cli-less": "1.5.3",
"ember-cli-moment-shim": "3.0.0",
"ember-cli-qunit": "^3.0.0",
"ember-cli-less": "1.5.4",
"ember-cli-moment-shim": "^3.3.3",
"ember-cli-qunit": "^4.0.0",
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-cli-yuidoc": "^0.8.7",
"ember-cli-yuidoc": "^0.8.8",
"ember-code-snippet": "^1.7.0",
"ember-data": "^2.10.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-font-awesome": "2.2.0",
"ember-load-initializers": "^0.6.3",
"ember-moment": "7.0.3",
"ember-resolver": "^2.0.3",
"ember-suave": "4.0.1",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-font-awesome": "^3.0.5",
"ember-load-initializers": "^1.0.0",
"ember-moment": "^7.4.1",
"ember-resolver": "^4.3.0",
"ember-source": "~2.14.1",
"ember-truth-helpers": "1.3.0",
"loader.js": "^4.0.11",
"jquery": "^2.2.4",
"loader.js": "^4.2.3",
"moment": "2.17.1",
"moment-timezone": "0.5.10",
"yuidoc-ember-theme": "^1.3.0"
"yuidoc-ember-theme": "^1.4.0"
},
"keywords": [
"yahoo",
Expand All @@ -79,12 +80,12 @@
"model"
],
"dependencies": {
"ember-cli-babel": "^5.1.8",
"ember-cli-version-checker": "^1.2.0",
"ember-getowner-polyfill": "^1.2.0",
"ember-require-module": "^0.1.1",
"ember-cli-babel": "^6.6.0",
"ember-cli-version-checker": "^2.0.0",
"ember-getowner-polyfill": "^2.0.1",
"ember-require-module": "^0.1.2",
"ember-string-ishtmlsafe-polyfill": "^1.1.0",
"ember-validators": "1.0.1",
"ember-validators": "1.0.3",
"exists-sync": "0.0.4",
"walk-sync": "^0.3.1"
},
Expand Down
27 changes: 18 additions & 9 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
/*jshint node:true*/
/* eslint-env node */
module.exports = {
"framework": "qunit",
"test_page": "tests/index.html?coverage&hidepassed",
"disable_watching": true,
"phantomjs_debug_port": 9000,
"launch_in_ci": [
"Chrome"
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: [
'Chrome'
],
"launch_in_dev": [
"Chrome"
launch_in_dev: [
'Chrome'
]
};

if (process.env.HEADLESS === 'true') {
module.exports.browser_args = {
'Chrome': [
'--headless',
'--disable-gpu',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
};
}
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
52 changes: 0 additions & 52 deletions tests/.jshintrc

This file was deleted.

6 changes: 1 addition & 5 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
const App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand Down
7 changes: 4 additions & 3 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
* Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
*/

/* jshint node: true */
/* eslint-env node */
'use strict';

module.exports = function(environment) {
var ENV = {
let ENV = {
modulePrefix: 'dummy',
environment: environment,
environment,
rootURL: '/',
locationType: 'hash',
EmberENV: {
Expand Down
Loading

0 comments on commit 48d24f0

Please sign in to comment.