Skip to content

Commit a45340d

Browse files
authored
[Deps]: bump 3.16 and Node 10 minimum (#396)
1 parent d3fda2d commit a45340d

33 files changed

+3110
-3225
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

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
'use strict';
2+
13
module.exports = {
24
globals: {
35
server: true,
46
},
57
root: true,
8+
parser: 'babel-eslint',
69
parserOptions: {
710
ecmaVersion: 2018,
8-
sourceType: 'module'
11+
sourceType: 'module',
12+
ecmaFeatures: {
13+
legacyDecorators: true
14+
}
915
},
1016
plugins: [
1117
'ember'
@@ -18,17 +24,22 @@ module.exports = {
1824
browser: true
1925
},
2026
rules: {
27+
'ember/no-jquery': 'off',
28+
'ember/no-new-mixins': 'off',
29+
'no-useless-escape': 'off'
2130
},
2231
overrides: [
2332
// node files
2433
{
2534
files: [
35+
'.eslintrc.js',
2636
'.template-lintrc.js',
2737
'ember-cli-build.js',
2838
'index.js',
2939
'testem.js',
3040
'blueprints/*/index.js',
3141
'config/**/*.js',
42+
'server/**/*.js',
3243
'tests/dummy/config/**/*.js'
3344
],
3445
excludedFiles: [
@@ -38,16 +49,15 @@ module.exports = {
3849
'tests/dummy/app/**'
3950
],
4051
parserOptions: {
41-
sourceType: 'script',
42-
ecmaVersion: 2015
52+
sourceType: 'script'
4353
},
4454
env: {
4555
browser: false,
4656
node: true
4757
},
4858
plugins: ['node'],
4959
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
50-
// add your custom rules and overrides for node files here
60+
'node/no-unpublished-require': 'off'
5161
})
5262
}
5363
]

.github/workflows/main.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ jobs:
77
matrix:
88
ember-version:
99
- 'ember-default'
10-
- 'ember-lts-2.16'
11-
- 'ember-lts-2.18'
12-
- 'ember-3.1'
13-
- 'ember-lts-3.4'
14-
- 'ember-lts-3.8'
1510
- 'ember-lts-3.12'
11+
- 'ember-lts-3.16'
1612
- 'ember-release'
1713
- 'ember-beta'
1814
- 'ember-canary'
1915
env:
20-
CI: true
16+
CI: true
2117
EMBER_TRY_SCENARIO: ${{ matrix.ember-version }}
2218

2319
steps:

.gitignore

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/
@@ -18,9 +20,6 @@
1820
/yarn-error.log
1921

2022
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
24-
25-
.DS_Store
26-
package-lock.json
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

.npmignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
15+
/.git/
1416
/.gitignore
15-
/.watchmanconfig
17+
/.template-lintrc.js
1618
/.travis.yml
19+
/.watchmanconfig
1720
/bower.json
1821
/config/ember-try.js
22+
/CONTRIBUTING.md
1923
/ember-cli-build.js
2024
/testem.js
2125
/tests/

.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: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
sudo: false
44
dist: trusty
55
node_js:
6-
- "8"
6+
- "10"
77

88
addons:
99
chrome: stable
@@ -58,17 +58,13 @@ jobs:
5858
script: yarn test
5959

6060
- stage: fastboot tests
61-
node_js: "8"
61+
node_js: "10"
6262
env: NAME=fastboot tests
6363
script: yarn test:fastboot
6464

6565
- stage: versioned tests
66-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
67-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
68-
- env: EMBER_TRY_SCENARIO=ember-3.1
69-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
70-
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
7166
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
67+
env: EMBER_TRY_SCENARIO=ember-lts-3.16
7268
- env: EMBER_TRY_SCENARIO=ember-release
7369
- env: EMBER_TRY_SCENARIO=ember-beta
7470
- env: EMBER_TRY_SCENARIO=ember-canary

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-data-storefront`
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/).

addon/adapters/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import JSONAPIAdapter from 'ember-data/adapters/json-api';
1+
import JSONAPIAdapter from '@ember-data/adapter/json-api';
22

33
export default JSONAPIAdapter.extend({
44

0 commit comments

Comments
 (0)