Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Commit f352008

Browse files
Use ember-ref-bucket, bump Ember and deps (#328)
* Switch to ember-ref-bucket * ember-cli 3.27, fix refs * Update code-inline.js * Run embroider-safe, update ember-auto-import, yarn upgrade * Try without transform * Try to fix ember-ref-bucket * Use functional plugin * Require canary and embroider * Add ember-hbs-minifier * Remove ember-hbs-minifier
1 parent 91b49f9 commit f352008

29 files changed

+2948
-3079
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
20+
browser: true,
2221
},
2322
rules: {},
2423
overrides: [
@@ -33,23 +32,28 @@ module.exports = {
3332
'testem.js',
3433
'blueprints/*/index.js',
3534
'config/**/*.js',
36-
'tests/dummy/config/**/*.js'
35+
'tests/dummy/config/**/*.js',
3736
],
3837
excludedFiles: [
3938
'addon/**',
4039
'addon-test-support/**',
4140
'app/**',
42-
'tests/dummy/app/**'
41+
'tests/dummy/app/**',
4342
],
4443
parserOptions: {
45-
sourceType: 'script'
44+
sourceType: 'script',
4645
},
4746
env: {
4847
browser: false,
49-
node: true
48+
node: true,
5049
},
5150
plugins: ['node'],
52-
extends: ['plugin:node/recommended']
53-
}
54-
]
51+
extends: ['plugin:node/recommended'],
52+
},
53+
{
54+
// Test files:
55+
files: ['tests/**/*-test.{js,ts}'],
56+
extends: ['plugin:qunit/recommended'],
57+
},
58+
],
5559
};

.github/workflows/main.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,18 @@ jobs:
4444
matrix:
4545
allow-failure: [false]
4646
ember-try-scenario:
47-
- ember-lts-3.16
4847
- ember-lts-3.20
48+
- ember-lts-3.24
4949
- ember-release
5050
- ember-beta
51+
- ember-canary
5152
- ember-default-with-jquery
5253
- ember-classic
5354
include:
54-
- ember-try-scenario: ember-canary
55-
allow-failure: true
56-
- ember-try-scenario: embroider
55+
- ember-try-scenario: embroider-safe
5756
allow-failure: true
5857
- ember-try-scenario: embroider-optimized
59-
allow-failure: true
58+
allow-failure: true
6059

6160
steps:
6261
- uses: actions/checkout@v2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig
@@ -23,6 +26,7 @@
2326
/ember-cli-build.js
2427
/testem.js
2528
/tests/
29+
/yarn-error.log
2630
/yarn.lock
2731
.gitkeep
2832

.prettierignore

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

.prettierrc.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = {
77
files: '**/*.hbs',
88
options: {
99
parser: 'glimmer',
10-
singleQuote: false
11-
}
12-
}
13-
]
14-
};
10+
singleQuote: false,
11+
},
12+
},
13+
],
14+
};

.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: 'octane'
4+
extends: 'recommended',
55
};

CONTRIBUTING.md

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

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ This project is packaged as an [EmberCLI](http://www.ember-cli.com) addon.
1515
Compatibility
1616
------------------------------------------------------------------------------
1717

18-
* Ember.js v3.16 or above
19-
* Ember CLI v2.13 or above
18+
* Ember.js v3.20 or above
19+
* Ember CLI v3.20 or above
2020
* Node.js v10 or above
2121

2222
For Ember <= 3.12 use version 0.7.0 of ember-prism.

0 commit comments

Comments
 (0)