Skip to content

Commit d833d73

Browse files
Tom Zellmantzellman
Tom Zellman
authored andcommitted
chore: update dependencies and ember-cli-update to 4.11
1 parent 7bdd9b4 commit d833d73

21 files changed

+6711
-9973
lines changed

.ember-cli

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.eslintrc.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = {
2525
files: [
2626
'./.eslintrc.js',
2727
'./.template-lintrc.js',
28-
'./commitlint.config.js',
2928
'./ember-cli-build.js',
3029
'./index.js',
3130
'./testem.js',
@@ -40,11 +39,10 @@ module.exports = {
4039
browser: false,
4140
node: true
4241
},
43-
plugins: ['node'],
44-
extends: ['plugin:node/recommended']
42+
extends: ['plugin:n/recommended']
4543
},
4644
{
47-
// Test files:
45+
// test files
4846
files: ['tests/**/*-test.{js,ts}'],
4947
extends: ['plugin:qunit/recommended']
5048
}

.github/workflows/build.yml

-59
This file was deleted.

.github/workflows/ci.yml

+31-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
14
name: CI
25

36
on:
47
push:
5-
branches:
6-
- main
7-
- master
8-
pull_request: {}
8+
branches: [master]
9+
pull_request:
10+
branches: [master]
11+
12+
env:
13+
CC_TEST_REPORTER_ID: 3c17d30a957d0b5f06d932c3dd8ce9354df2b8d7769710d8827e6261445839d8
914

1015
concurrency:
1116
group: ci-${{ github.head_ref || github.ref }}
@@ -50,21 +55,29 @@ jobs:
5055
try-scenarios:
5156
name: ${{ matrix.try-scenario }}
5257
runs-on: ubuntu-latest
58+
continue-on-error: ${{ matrix.experimental }}
5359
needs: "test"
5460
timeout-minutes: 10
5561

5662
strategy:
5763
fail-fast: false
5864
matrix:
5965
try-scenario:
60-
- ember-lts-3.24
6166
- ember-lts-3.28
62-
- ember-release
67+
- ember-lts-4.4
6368
- ember-beta
64-
- ember-canary
6569
- ember-classic
6670
- embroider-safe
6771
- embroider-optimized
72+
experimental: [false]
73+
coverage: [false]
74+
include:
75+
- try-scenario: ember-canary
76+
experimental: true
77+
coverage: false
78+
- try-scenario: ember-release
79+
experimental: false
80+
coverage: true
6881

6982
steps:
7083
- uses: actions/checkout@v3
@@ -76,4 +89,14 @@ jobs:
7689
- name: Install Dependencies
7790
run: npm ci
7891
- name: Run Tests
79-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
92+
run: COVERAGE=${{ matrix.coverage }} ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
93+
- name: Coverage Report
94+
if: ${{ matrix.coverage }}
95+
run: cat coverage/coverage-summary.json
96+
- name: Coverage Upload
97+
if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
98+
run: |
99+
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
100+
chmod +x ./cc-test-reporter
101+
./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.json coverage/lcov.info
102+
./cc-test-reporter upload-coverage

.github/workflows/gh-pages.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66

77
jobs:
88
deploy:
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- name: Setup Node
13-
uses: actions/setup-node@v2.1.2
13+
uses: actions/setup-node@v3
1414
with:
1515
node-version: "14.x"
1616

1717
- name: Cache dependencies
18-
uses: actions/cache@v2
18+
uses: actions/cache@v3
1919
with:
2020
path: ~/.npm
2121
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -26,7 +26,7 @@ jobs:
2626
- run: npm run build
2727

2828
- name: Deploy
29-
uses: peaceiris/actions-gh-pages@v3.7.3
29+
uses: peaceiris/actions-gh-pages@v3.9.2
3030
with:
3131
github_token: ${{ secrets.GITHUB_TOKEN }}
3232
publish_dir: ./dist

.npmignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/.prettierrc
2424
/.template-lintrc.js
2525
/.watchmanconfig
26-
/config/ember-try.js
26+
/bower.json
2727
/CONTRIBUTING.md
2828
/ember-cli-build.js
2929
/renovate.json

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodejs 18.15.0

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
### 0.5.0
4+
5+
- Updated dependencies
6+
- ran ember-cli-update to 4.11
7+
- removed extraneous CI script and updated CI actions
8+
39
### 0.4.0
410

511
This is a minor release containing changes related to dependency updates.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ The `trigger-event` modifier allows you to trigger an event when the element is
6565

6666
## Compatibility
6767

68-
- Ember.js v3.24 or above
69-
- Ember CLI v3.24 or above
68+
- Ember.js v3.28 or above
69+
- Ember CLI v3.28 or above
7070
- Node.js v14 or above
7171

7272
## Contributing

commitlint.config.js

-3
This file was deleted.

config/environment.js

-5
This file was deleted.

ember-cli-build.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function (defaults) {
6-
let app = new EmberAddon(defaults, {
6+
const app = new EmberAddon(defaults, {
77
postcssOptions: {
88
compile: {
99
cacheInclude: [/.*\.(css|scss|hbs)$/, /.tailwind\.js$/],
1010
enabled: true,
11-
plugins: [require('tailwindcss')('./config/tailwind.js'), require('autoprefixer')]
11+
plugins: [require('tailwindcss')('./tests/dummy/config/tailwind.js'), require('autoprefixer')]
1212
}
13+
},
14+
babel: {
15+
plugins: [...require('ember-cli-code-coverage').buildBabelPlugin()]
1316
}
1417
});
1518

0 commit comments

Comments
 (0)