Skip to content

Commit bbce83b

Browse files
authored
Merge pull request #40 from btecu/bugsbunny
Update `ember-cli` and dependencies. Closes #38.
2 parents eeb2920 + ecd7c15 commit bbce83b

File tree

14 files changed

+2874
-1830
lines changed

14 files changed

+2874
-1830
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintrc.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parser: 'babel-eslint',
@@ -18,9 +20,7 @@ module.exports = {
1820
env: {
1921
browser: true
2022
},
21-
rules: {
22-
'ember/no-jquery': 'error'
23-
},
23+
rules: {},
2424
overrides: [
2525
// node files
2626
{
@@ -48,9 +48,7 @@ module.exports = {
4848
node: true
4949
},
5050
plugins: ['node'],
51-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
52-
// add your custom rules and overrides for node files here
53-
})
51+
extends: ['plugin:node/recommended']
5452
}
5553
]
5654
};

.travis.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "8"
6+
- "10"
77

8-
sudo: false
9-
dist: trusty
8+
dist: xenial
109

1110
addons:
1211
chrome: stable
@@ -26,41 +25,38 @@ branches:
2625
- /^v\d+\.\d+\.\d+/
2726

2827
jobs:
29-
fail_fast: true
28+
fast_finish: true
3029
allow_failures:
3130
- env: EMBER_TRY_SCENARIO=ember-canary
3231

3332
include:
3433
# runs linting and tests with current locked deps
3534
- stage: "Tests"
3635
name: "Tests"
37-
install:
38-
- yarn install --non-interactive
39-
script:
40-
- yarn lint:hbs
41-
- yarn lint:js
42-
- yarn test
43-
44-
- name: "Floating Dependencies"
4536
script:
46-
- yarn test
37+
- yarn lint
38+
- yarn test:ember
4739

4840
- stage: "Additional Tests"
4941
name: "Floating Dependencies"
5042
install:
51-
- npm install --no-package-lock
43+
- yarn install --no-lockfile --non-interactive
5244
script:
53-
- npm test
45+
- yarn test:ember
5446

5547
# we recommend new addons test the current and previous LTS
5648
# as well as latest stable release (bonus points to beta/canary)
57-
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
58-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5951
- env: EMBER_TRY_SCENARIO=ember-release
6052
- env: EMBER_TRY_SCENARIO=ember-beta
6153
- env: EMBER_TRY_SCENARIO=ember-canary
6254
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
6355
- env: EMBER_TRY_SCENARIO=ember-classic
6456

57+
before_install:
58+
- curl -o- -L https://yarnpkg.com/install.sh | bash
59+
- export PATH=$HOME/.yarn/bin:$PATH
60+
6561
script:
6662
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
## Installation
44

55
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `npm install`
6+
* `cd ember-select`
7+
* `yarn install`
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn lint:js --fix`
1414

1515
## Running tests
1616

@@ -23,4 +23,4 @@
2323
* `ember serve`
2424
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2525

26-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

config/ember-try.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ const getChannelURL = require('ember-source-channel-url');
44

55
module.exports = async function() {
66
return {
7+
useYarn: true,
78
scenarios: [
89
{
9-
name: 'ember-lts-3.8',
10+
name: 'ember-lts-3.16',
1011
npm: {
1112
devDependencies: {
12-
'ember-source': '~3.8.0'
13+
'ember-source': '~3.16.0'
1314
}
1415
}
1516
},
1617
{
17-
name: 'ember-lts-3.12',
18+
name: 'ember-lts-3.20',
1819
npm: {
1920
devDependencies: {
20-
'ember-source': '~3.12.0'
21+
'ember-source': '~3.20.5'
2122
}
2223
}
2324
},
@@ -45,16 +46,6 @@ module.exports = async function() {
4546
}
4647
}
4748
},
48-
// The default `.travis.yml` runs this scenario via `npm test`,
49-
// not via `ember try`. It's still included here so that running
50-
// `ember try:each` manually or from a customized CI config will run it
51-
// along with all the other scenarios.
52-
{
53-
name: 'ember-default',
54-
npm: {
55-
devDependencies: {}
56-
}
57-
},
5849
{
5950
name: 'ember-default-with-jquery',
6051
env: {
@@ -64,7 +55,7 @@ module.exports = async function() {
6455
},
6556
npm: {
6657
devDependencies: {
67-
'@ember/jquery': '^0.5.1'
58+
'@ember/jquery': '^1.1.0'
6859
}
6960
}
7061
},

package.json

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,43 @@
1919
"repository": "https://github.com/btecu/ember-select",
2020
"scripts": {
2121
"build": "ember build",
22-
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
22+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
23+
"lint:hbs": "ember-template-lint .",
24+
"lint:js": "eslint .",
2325
"start": "ember serve",
24-
"test": "ember test",
25-
"test:all": "ember try:each"
26+
"test": "npm-run-all lint:* test:*",
27+
"test:ember": "ember test",
28+
"test:ember-compatibility": "ember try:each"
2629
},
2730
"dependencies": {
28-
"ember-cli-babel": "^7.13.2",
29-
"ember-cli-htmlbars": "^4.2.2"
31+
"ember-cli-babel": "^7.22.1",
32+
"ember-cli-htmlbars": "^5.3.1"
3033
},
3134
"devDependencies": {
32-
"@ember/optional-features": "^1.3.0",
33-
"@glimmer/component": "^1.0.0",
34-
"babel-eslint": "^10.0.3",
35+
"@ember/optional-features": "^2.0.0",
36+
"@glimmer/component": "^1.0.2",
37+
"@glimmer/tracking": "^1.0.2",
38+
"babel-eslint": "^10.1.0",
3539
"broccoli-asset-rev": "^3.0.0",
36-
"ember-auto-import": "^1.5.3",
37-
"ember-cli": "~3.15.2",
40+
"ember-auto-import": "^1.6.0",
41+
"ember-cli": "~3.21.2",
3842
"ember-cli-dependency-checker": "^3.2.0",
39-
"ember-cli-eslint": "^5.1.0",
4043
"ember-cli-inject-live-reload": "^2.0.2",
44+
"ember-cli-terser": "^4.0.0",
4145
"ember-disable-prototype-extensions": "^1.1.3",
4246
"ember-load-initializers": "^2.1.1",
4347
"ember-maybe-import-regenerator": "^0.1.6",
4448
"ember-qunit": "^4.6.0",
45-
"ember-resolver": "^7.0.0",
46-
"ember-source": "~3.15.0",
47-
"ember-source-channel-url": "^2.0.1",
49+
"ember-resolver": "^8.0.2",
50+
"ember-source": "~3.21.1",
51+
"ember-source-channel-url": "^3.0.0",
52+
"ember-template-lint": "^2.13.0",
4853
"ember-try": "^1.4.0",
49-
"eslint-plugin-ember": "^7.7.2",
50-
"eslint-plugin-node": "^11.0.0",
51-
"loader.js": "^4.7.0"
54+
"eslint": "^7.10.0",
55+
"eslint-plugin-ember": "^9.1.1",
56+
"eslint-plugin-node": "^11.1.0",
57+
"loader.js": "^4.7.0",
58+
"npm-run-all": "^4.1.5"
5259
},
5360
"engines": {
5461
"node": "10.* || >= 12.*"

testem.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
test_page: 'tests/index.html?hidepassed',
35
disable_watching: true,
@@ -7,6 +9,7 @@ module.exports = {
79
launch_in_dev: [
810
'Chrome'
911
],
12+
browser_start_timeout: 120,
1013
browser_args: {
1114
Chrome: {
1215
ci: [

tests/dummy/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'dummy/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;

tests/dummy/app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import EmberRouter from '@ember/routing/router';
2-
import config from './config/environment';
2+
import config from 'dummy/config/environment';
33

44
export default class Router extends EmberRouter {
55
location = config.locationType;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{!-- The following component displays Ember's default welcome message. --}}
2-
{{welcome-page}}
2+
<WelcomePage />
33
{{!-- Feel free to remove this! --}}
44

55
{{outlet}}

0 commit comments

Comments
 (0)