Skip to content

Commit e0dbe9f

Browse files
committed
update using ember-cli-update
1 parent 0d7506a commit e0dbe9f

File tree

14 files changed

+5873
-2082
lines changed

14 files changed

+5873
-2082
lines changed

.eslintrc.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ module.exports = {
33
parser: 'babel-eslint',
44
parserOptions: {
55
ecmaVersion: 2018,
6-
sourceType: 'module'
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
710
},
811
plugins: [
912
'ember'
@@ -16,6 +19,7 @@ module.exports = {
1619
browser: true
1720
},
1821
rules: {
22+
'ember/no-jquery': 'error'
1923
},
2024
overrides: [
2125
// node files
@@ -38,8 +42,7 @@ module.exports = {
3842
'tests/dummy/app/**'
3943
],
4044
parserOptions: {
41-
sourceType: 'script',
42-
ecmaVersion: 2015
45+
sourceType: 'script'
4346
},
4447
env: {
4548
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: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636

3737
include:
3838
# runs linting and tests with current locked deps
39-
4039
- stage: "Tests"
4140
name: "Tests"
4241
env:
@@ -46,14 +45,22 @@ jobs:
4645
- npm run lint:js
4746
- npm test
4847

48+
- stage: "Additional Tests"
49+
name: "Floating Dependencies"
50+
install:
51+
- npm install --no-package-lock
52+
script:
53+
- npm test
54+
4955
# we recommend new addons test the current and previous LTS
5056
# as well as latest stable release (bonus points to beta/canary)
51-
- stage: "Additional Tests"
52-
env: EMBER_TRY_SCENARIO=ember-lts-3.4
57+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
58+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
5359
- env: EMBER_TRY_SCENARIO=ember-release
5460
- env: EMBER_TRY_SCENARIO=ember-beta
5561
- env: EMBER_TRY_SCENARIO=ember-canary
5662
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
63+
- env: EMBER_TRY_SCENARIO=ember-classic
5764

5865
script:
5966
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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
1212
* Node.js v8 or above
1313

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: 74 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,87 @@
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-release',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': await getChannelURL('release')
3529
}
36-
},
37-
{
38-
name: 'ember-canary',
39-
npm: {
40-
devDependencies: {
41-
'ember-source': urls[2]
42-
}
30+
}
31+
},
32+
{
33+
name: 'ember-beta',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('beta')
4337
}
38+
}
39+
},
40+
{
41+
name: 'ember-canary',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': await getChannelURL('canary')
45+
}
46+
}
47+
},
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+
},
58+
{
59+
name: 'ember-default-with-jquery',
60+
env: {
61+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
62+
'jquery-integration': true
63+
})
4464
},
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: {}
65+
npm: {
66+
devDependencies: {
67+
'@ember/jquery': '^0.5.1'
5368
}
69+
}
70+
},
71+
{
72+
name: 'ember-classic',
73+
env: {
74+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
75+
'application-template-wrapper': true,
76+
'default-async-observers': false,
77+
'template-only-glimmer-components': false
78+
})
5479
},
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-
}
80+
npm: {
81+
ember: {
82+
edition: 'classic'
6683
}
6784
}
68-
]
69-
};
70-
});
85+
}
86+
]
87+
};
7188
};

0 commit comments

Comments
 (0)