Skip to content

Commit f1681d4

Browse files
committed
update fixture to v3.28 with ember-cli-update
1 parent 821a44d commit f1681d4

26 files changed

Lines changed: 224 additions & 126 deletions

test/fixtures/with-telemetry/input/.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

test/fixtures/with-telemetry/input/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
# misc
1313
/coverage/
14+
!.*
15+
.*/
16+
.eslintcache
1417

1518
# ember-try
1619
/.node_modules.ember-try/
Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,58 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
20+
browser: true,
1821
},
22+
rules: {},
1923
overrides: [
2024
// node files
2125
{
2226
files: [
23-
'ember-cli-build.js',
24-
'testem.js',
25-
'blueprints/*/index.js',
26-
'config/**/*.js',
27-
'lib/*/index.js'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
2836
],
2937
parserOptions: {
3038
sourceType: 'script',
31-
ecmaVersion: 2015
3239
},
3340
env: {
3441
browser: false,
35-
node: true
36-
}
37-
}
38-
]
42+
node: true,
43+
},
44+
plugins: ['node'],
45+
extends: ['plugin:node/recommended'],
46+
rules: {
47+
// this can be removed once the following is fixed
48+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49+
'node/no-unpublished-require': 'off',
50+
},
51+
},
52+
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
57+
],
3958
};

test/fixtures/with-telemetry/input/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# misc
1212
/.sass-cache
13+
/.eslintcache
1314
/connect.lock
1415
/coverage/
1516
/libpeerconnection.log
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
};
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
4+
- "12"
55

6-
sudo: false
7-
dist: trusty
6+
dist: xenial
87

98
addons:
109
chrome: stable
@@ -18,9 +17,13 @@ env:
1817
# See https://git.io/vdao3 for details.
1918
- JOBS=1
2019

20+
branches:
21+
only:
22+
- master
23+
2124
before_install:
22-
- npm config set spin false
25+
- curl -o- -L https://yarnpkg.com/install.sh | bash
26+
- export PATH=$HOME/.yarn/bin:$PATH
2327

2428
script:
25-
- npm run lint:js
26-
- npm test
29+
- yarn test

test/fixtures/with-telemetry/input/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Make use of the many generators for code, try `ember help generate` for more det
3535

3636
### Linting
3737

38-
* `npm run lint:js`
39-
* `npm run lint:js -- --fix`
38+
* `yarn lint`
39+
* `yarn lint:fix`
4040

4141
### Building
4242

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'app/config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
export default class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
13-
14-
export default App;

0 commit comments

Comments
 (0)