Skip to content

Commit 4954e9d

Browse files
rwjbluerwjblue
authored
Merge pull request #53 from snewcomer/update-3.3
Update to ember 3.7
2 parents 9468c0c + 590127d commit 4954e9d

39 files changed

Lines changed: 4558 additions & 2508 deletions

‎.dir-locals.el‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.ember-cli‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
"useYarn": true
910
}

‎.eslintignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints
3+
/fastboot-tests
4+
/vendor/
5+
6+
# compiled output
7+
/dist/
8+
/tmp/
9+
10+
# dependencies
11+
/bower_components/
12+
/node_modules/
13+
14+
# misc
15+
/coverage/
16+
!.*
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

‎.eslintrc.js‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,52 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'index.js',
27+
'testem.js',
28+
'blueprints/*/index.js',
29+
'config/**/*.js',
30+
'tests/dummy/config/**/*.js'
31+
],
32+
excludedFiles: [
33+
'addon/**',
34+
'addon-test-support/**',
35+
'app/**',
36+
'tests/dummy/app/**'
37+
],
38+
parserOptions: {
39+
sourceType: 'script',
40+
ecmaVersion: 2015
41+
},
42+
env: {
43+
browser: false,
44+
node: true
45+
},
46+
plugins: ['node'],
47+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48+
// add your custom rules and overrides for node files here
49+
})
50+
}
51+
]
1352
};

‎.gitignore‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.sass-cache
1314
/connect.lock
14-
/coverage/*
15+
/coverage/
1516
/libpeerconnection.log
16-
npm-debug.log*
17-
testem.log
17+
/npm-debug.log*
18+
/testem.log
19+
/yarn-error.log
20+
21+
# ember-try
22+
/.node_modules.ember-try/
23+
/bower.json.ember-try
24+
/package.json.ember-try

‎.npmignore‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.gitignore
16+
/.template-lintrc.js
17+
/.travis.yml
18+
/.watchmanconfig
19+
/bower.json
220
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.eslintrc.js
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
21+
/CONTRIBUTING.md
22+
/ember-cli-build.js
23+
/testem.js
24+
/tests/
25+
/yarn.lock
26+
.gitkeep
27+
28+
# ember-try
29+
/.node_modules.ember-try/
30+
/bower.json.ember-try
31+
/package.json.ember-try

‎.template-lintrc.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
rules: {
6+
'no-html-comments': false
7+
}
8+
};

‎.travis.yml‎

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "6"
57

68
sudo: false
@@ -16,21 +18,44 @@ env:
1618
global:
1719
# See https://git.io/vdao3 for details.
1820
- JOBS=1
19-
matrix:
21+
22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
28+
jobs:
29+
fail_fast: true
30+
allow_failures:
31+
- env: EMBER_TRY_SCENARIO=ember-canary
32+
33+
include:
34+
# runs linting and tests with current locked deps
35+
36+
- stage: "Tests"
37+
name: "Tests"
38+
install:
39+
- yarn install --non-interactive
40+
script:
41+
- yarn lint:hbs
42+
- yarn lint:js
43+
- yarn test
44+
45+
- name: "Floating Dependencies"
46+
script:
47+
- yarn test
48+
2049
# we recommend new addons test the current and previous LTS
2150
# as well as latest stable release (bonus points to beta/canary)
22-
- EMBER_TRY_SCENARIO=ember-lts-2.12
23-
- EMBER_TRY_SCENARIO=ember-lts-2.16
24-
- EMBER_TRY_SCENARIO=ember-release
25-
- EMBER_TRY_SCENARIO=ember-beta
26-
- EMBER_TRY_SCENARIO=ember-canary
27-
- EMBER_TRY_SCENARIO=ember-default
28-
- EMBER_TRY_SCENARIO=fastboot
29-
30-
matrix:
31-
fast_finish: true
32-
allow_failures:
51+
- stage: "Additional Tests"
52+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
53+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
54+
- env: EMBER_TRY_SCENARIO=ember-release
55+
- env: EMBER_TRY_SCENARIO=ember-beta
3356
- env: EMBER_TRY_SCENARIO=ember-canary
57+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
58+
- env: EMBER_TRY_SCENARIO=fastboot
3459

3560
before_install:
3661
- curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -40,6 +65,4 @@ install:
4065
- yarn install --no-lockfile --non-interactive
4166

4267
script:
43-
# Usually, it's ok to finish the test scenario without reverting
44-
# to the addon's original dependency state, skipping "cleanup".
45-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
68+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd ember-cli-head`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn lint:js --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ that service.
5252
```javascript
5353
// app/routes/application.js
5454

55-
import Ember from 'ember';
55+
import Route from '@ember/routing/route'
56+
import { inject } from '@ember/service';
57+
import { set } from '@ember/object';
5658

57-
const { set } = Ember;
58-
59-
export default Ember.Route.extend({
59+
export default Route.extend({
6060
// inject the head data service
61-
headData: Ember.inject.service(),
61+
headData: inject(),
6262
afterModel() {
6363
set(this, 'headData.title', 'Demo App');
6464
}

0 commit comments

Comments
 (0)