Skip to content

Commit 4fb9566

Browse files
committed
update using ember-cli-update
1 parent 30cc8ea commit 4fb9566

17 files changed

+8248
-3458
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: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parser: 'babel-eslint',
46
parserOptions: {
57
ecmaVersion: 2018,
6-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true
11+
}
712
},
813
plugins: [
914
'ember'
@@ -16,6 +21,7 @@ module.exports = {
1621
browser: true
1722
},
1823
rules: {
24+
'ember/no-jquery': 'error'
1925
},
2026
overrides: [
2127
// node files
@@ -38,8 +44,7 @@ module.exports = {
3844
'tests/dummy/app/**'
3945
],
4046
parserOptions: {
41-
sourceType: 'script',
42-
ecmaVersion: 2015
47+
sourceType: 'script'
4348
},
4449
env: {
4550
browser: false,

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane'
55
};

.travis.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ node_js:
55
# so that your addon works for all apps
66
- "10"
77

8-
sudo: false
98
dist: trusty
109

1110
addons:
@@ -30,30 +29,37 @@ branches:
3029
- /^v\d+\.\d+\.\d+/
3130

3231
jobs:
33-
fail_fast: true
32+
fast_finish: true
3433
allow_failures:
3534
- env: EMBER_TRY_SCENARIO=ember-canary
3635

3736
include:
3837
# runs linting and tests with current locked deps
39-
4038
- stage: "Tests"
4139
name: "Tests"
4240
env:
4341
- PERCY_ENABLE=1
4442
script:
45-
- npm run lint:hbs
46-
- npm run lint:js
47-
- npm test
43+
- npm run lint
44+
- npm run test:ember
45+
46+
- stage: "Additional Tests"
47+
name: "Floating Dependencies"
48+
install:
49+
- npm install --no-package-lock
50+
script:
51+
- npm run test:ember
4852

4953
# we recommend new addons test the current and previous LTS
5054
# as well as latest stable release (bonus points to beta/canary)
51-
- stage: "Additional Tests"
52-
env: EMBER_TRY_SCENARIO=ember-lts-3.4
55+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
56+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
57+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
5358
- env: EMBER_TRY_SCENARIO=ember-release
5459
- env: EMBER_TRY_SCENARIO=ember-beta
5560
- env: EMBER_TRY_SCENARIO=ember-canary
5661
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
62+
- env: EMBER_TRY_SCENARIO=ember-classic
5763

5864
script:
5965
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/).

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019
3+
Copyright (c) 2020
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ This addon is intended to provide basic components for easier style coordination
77
Compatibility
88
------------------------------------------------------------------------------
99

10-
* Ember.js v3.4 or above
10+
* Ember.js v3.8 or above
1111
* Ember CLI v2.13 or above
12-
* Node.js v8 or above
12+
* Node.js v10 or above
1313

1414

1515
Installation

app/components/es-button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from 'ember-styleguide/components/es-button';
1+
export { default } from 'ember-styleguide/components/es-button';

config/ember-try.js

Lines changed: 82 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,95 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
scenarios: [
13-
{
14-
name: 'ember-lts-3.4',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~3.4.0'
18-
}
5+
module.exports = async function() {
6+
return {
7+
scenarios: [
8+
{
9+
name: 'ember-lts-3.8',
10+
npm: {
11+
devDependencies: {
12+
'ember-source': '~3.8.0'
1913
}
20-
},
21-
{
22-
name: 'ember-release',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': urls[0]
26-
}
14+
}
15+
},
16+
{
17+
name: 'ember-lts-3.12',
18+
npm: {
19+
devDependencies: {
20+
'ember-source': '~3.12.0'
2721
}
28-
},
29-
{
30-
name: 'ember-beta',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': urls[1]
34-
}
22+
}
23+
},
24+
{
25+
name: 'ember-lts-3.16',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': '~3.16.0'
3529
}
36-
},
37-
{
38-
name: 'ember-canary',
39-
npm: {
40-
devDependencies: {
41-
'ember-source': urls[2]
42-
}
30+
}
31+
},
32+
{
33+
name: 'ember-release',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('release')
4337
}
38+
}
39+
},
40+
{
41+
name: 'ember-beta',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': await getChannelURL('beta')
45+
}
46+
}
47+
},
48+
{
49+
name: 'ember-canary',
50+
npm: {
51+
devDependencies: {
52+
'ember-source': await getChannelURL('canary')
53+
}
54+
}
55+
},
56+
// The default `.travis.yml` runs this scenario via `npm test`,
57+
// not via `ember try`. It's still included here so that running
58+
// `ember try:each` manually or from a customized CI config will run it
59+
// along with all the other scenarios.
60+
{
61+
name: 'ember-default',
62+
npm: {
63+
devDependencies: {}
64+
}
65+
},
66+
{
67+
name: 'ember-default-with-jquery',
68+
env: {
69+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
70+
'jquery-integration': true
71+
})
4472
},
45-
// The default `.travis.yml` runs this scenario via `npm test`,
46-
// not via `ember try`. It's still included here so that running
47-
// `ember try:each` manually or from a customized CI config will run it
48-
// along with all the other scenarios.
49-
{
50-
name: 'ember-default',
51-
npm: {
52-
devDependencies: {}
73+
npm: {
74+
devDependencies: {
75+
'@ember/jquery': '^0.5.1'
5376
}
77+
}
78+
},
79+
{
80+
name: 'ember-classic',
81+
env: {
82+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
83+
'application-template-wrapper': true,
84+
'default-async-observers': false,
85+
'template-only-glimmer-components': false
86+
})
5487
},
55-
{
56-
name: 'ember-default-with-jquery',
57-
env: {
58-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
59-
'jquery-integration': true
60-
})
61-
},
62-
npm: {
63-
devDependencies: {
64-
'@ember/jquery': '^0.5.1'
65-
}
88+
npm: {
89+
ember: {
90+
edition: 'classic'
6691
}
6792
}
68-
]
69-
};
70-
});
93+
}
94+
]
95+
};
7196
};

0 commit comments

Comments
 (0)