Skip to content

Commit

Permalink
feat: update to ember 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Nov 11, 2018
1 parent c41fb0d commit 0213b19
Show file tree
Hide file tree
Showing 13 changed files with 903 additions and 109 deletions.
19 changes: 19 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
20 changes: 9 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
/* eslint-env node */
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
plugins: ['ember'],
extends: ['eslint:recommended', 'plugin:ember/recommended'],
env: {
browser: true
},
rules: {
},
rules: {},
overrides: [
// node files
{
files: [
'testem.js',
'.template-lintrc.js',
'ember-cli-build.js',
'config/**/*.js'
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
],
parserOptions: {
sourceType: 'script',
Expand Down
24 changes: 11 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

package-lock.json
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 5 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
};
28 changes: 9 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,29 @@
---
language: node_js
node_js:
- "8"
- '8'

sudo: required
sudo: false
dist: trusty

addons:
chrome: stable

cache:
directories:
- $HOME/.npm

yarn: true
yarn: true
env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

before_install:
- npm config set spin false

before_script:
- sudo chmod 4755 /opt/google/chrome/chrome-sandbox
- sudo chown root /opt/google/chrome/chrome-sandbox
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --non-interactive

script:
- npm run lint:js
- npm test

after_success:
- npm run travis-deploy-once "npm run semantic-release"
branches:
except:
- /^v\d+\.\d+\.\d+$/
- yarn lint:hbs
- yarn lint:js
- yarn test && yarn travis-deploy-once "yarn semantic-release"
3 changes: 2 additions & 1 deletion app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const Router = EmberRouter.extend({
rootURL: config.rootURL
});

Router.map(function() {});
Router.map(function() {
});

export default Router;
3 changes: 3 additions & 0 deletions config/optional-features.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"jquery-integration": true
}
2 changes: 2 additions & 0 deletions config/targets.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

const browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions',
Expand Down
1 change: 0 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-env node */
'use strict';

const EmberApp = require('ember-cli/lib/broccoli/ember-app');
Expand Down
50 changes: 22 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@
"repository": "https://github.com/mike-works/ember-fundamentals",
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js app config lib server tests",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"travis-deploy-once": "travis-deploy-once",
"semantic-release": "semantic-release"
},
"devDependencies": {
"@commitlint/cli": "7.2.1",
"@commitlint/config-conventional": "7.1.2",
"@commitlint/travis-cli": "7.2.1",
"@ember-decorators/babel-transforms": "2.1.2",
"@ember/optional-features": "^0.6.3",
"@mike-works/js-lib-renovate-config": "2.0.0",
"@mike-works/workshop-semantic-release-config": "^1.0.0",
"@semantic-release/changelog": "3.0.1",
"@semantic-release/git": "7.0.5",
"@types/ember": "3.0.25",
Expand All @@ -38,50 +44,38 @@
"ember-cli-qunit": "4.4.0",
"ember-cli-shims": "1.2.0",
"ember-cli-sri": "2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "2.1.0",
"ember-data": "3.5.0",
"ember-decorators": "3.0.1",
"ember-export-application-global": "2.0.0",
"ember-load-initializers": "2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator": "0.1.6",
"ember-qunit": "4.1.2",
"ember-resolver": "5.0.1",
"ember-source": "3.5.1",
"ember-try": "^1.1.0",
"ember-welcome-page": "3.2.0",
"eslint-plugin-ember": "5.3.0",
"loader.js": "4.7.0",
"semantic-release": "15.10.8",
"travis-deploy-once": "5.0.9"
"travis-deploy-once": "5.0.9",
"qunit-dom": "^0.8.0"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
},
"release": {
"verifyConditions": [
"@semantic-release/github"
],
"prepare": [
{
"path": "@semantic-release/changelog",
"changelogFile": "CHANGELOG.md"
},
{
"path": "@semantic-release/git",
"assets": [
"package.json",
"CHANGELOG.md"
],
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
}
],
"publish": [
"@semantic-release/github"
],
"success": [
"@semantic-release/github"
],
"fail": [
"@semantic-release/github"
"extends": "@mike-works/workshop-semantic-release-config"
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
]
},
"husky": {
"hooks": {
"commit-msg": "./node_modules/.bin/commitlint -e $HUSKY_GIT_PARAMS"
}
}
}
12 changes: 8 additions & 4 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ module.exports = {
],
browser_args: {
Chrome: {
mode: 'ci',
args: [
'--disable-gpu',
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
]
].filter(Boolean)
}
}
};
1 change: 1 addition & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-env node */
module.exports = {
env: {
embertest: true
Expand Down
Loading

0 comments on commit 0213b19

Please sign in to comment.