Skip to content

Commit fb2120d

Browse files
tzellmantzellman
committed
chore: updates to several addons/dependencies and 1.0 rlease
- ember-auto-import 2.x - ember 4.1 - bump version to 1.0 - lock faker version for now to 5.5.3
1 parent 062e5b0 commit fb2120d

18 files changed

+5230
-2347
lines changed

‎.eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = {
4444
extends: ['plugin:node/recommended']
4545
},
4646
{
47-
// Test files:
47+
// test files
4848
files: ['tests/**/*-test.{js,ts}'],
4949
extends: ['plugin:qunit/recommended']
5050
}

‎.github/workflows/build.yml

-59
This file was deleted.

‎.github/workflows/ci.yml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
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+
4+
name: CI
5+
6+
on:
7+
push:
8+
branches: [master]
9+
pull_request:
10+
branches: [master]
11+
12+
env:
13+
CC_TEST_REPORTER_ID: 3c17d30a957d0b5f06d932c3dd8ce9354df2b8d7769710d8827e6261445839d8
14+
15+
concurrency:
16+
group: ci-${{ github.head_ref || github.ref }}
17+
cancel-in-progress: true
18+
19+
jobs:
20+
test:
21+
name: "Tests"
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
- name: Install Node
27+
uses: actions/setup-node@v2
28+
with:
29+
node-version: 12.x
30+
cache: npm
31+
- name: Install Dependencies
32+
run: npm ci
33+
- name: Lint
34+
run: npm run lint
35+
- name: Run Tests
36+
run: npm run test:ember
37+
38+
floating:
39+
name: "Floating Dependencies"
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- uses: actions/checkout@v2
44+
- uses: actions/setup-node@v2
45+
with:
46+
node-version: 12.x
47+
cache: npm
48+
- name: Install Dependencies
49+
run: npm install --no-shrinkwrap
50+
- name: Run Tests
51+
run: npm run test:ember
52+
53+
try-scenarios:
54+
name: ${{ matrix.try-scenario }}
55+
runs-on: ubuntu-latest
56+
continue-on-error: ${{ matrix.experimental }}
57+
needs: "test"
58+
59+
strategy:
60+
fail-fast: false
61+
matrix:
62+
try-scenario:
63+
- ember-lts-3.24
64+
- ember-lts-3.28
65+
- ember-beta
66+
- ember-classic
67+
- ember-default-with-jquery
68+
- embroider-safe
69+
- embroider-optimized
70+
experimental: [false]
71+
coverage: [false]
72+
include:
73+
- try-scenario: ember-canary
74+
experimental: true
75+
coverage: false
76+
- try-scenario: ember-release
77+
experimental: false
78+
coverage: true
79+
80+
steps:
81+
- uses: actions/checkout@v2
82+
- name: Install Node
83+
uses: actions/setup-node@v2
84+
with:
85+
node-version: 12.x
86+
cache: npm
87+
- name: Install Dependencies
88+
run: npm ci
89+
- name: Run Tests
90+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
91+
# only run coverage under specific scenarios
92+
- name: Coverage
93+
if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
94+
run: |
95+
npm ci
96+
COVERAGE=true node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
97+
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
98+
chmod +x ./cc-test-reporter
99+
./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.json coverage/lcov.info
100+
./cc-test-reporter upload-coverage

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@
2525
# ember-try
2626
/.node_modules.ember-try/
2727
/bower.json.ember-try
28+
/npm-shrinkwrap.json.ember-try
2829
/package.json.ember-try
30+
/package-lock.json.ember-try
31+
/yarn.lock.ember-try

‎.npmignore

+3
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ commitlint.config.js
3737
# ember-try
3838
/.node_modules.ember-try/
3939
/bower.json.ember-try
40+
/npm-shrinkwrap.json.ember-try
4041
/package.json.ember-try
42+
/package-lock.json.ember-try
43+
/yarn.lock.ember-try

‎.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎CHANGELOG.md

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

3+
### 1.0.0
4+
5+
🎉 This is the first major release of ember-fakerjs! 🎉
6+
7+
#### Changes
8+
9+
- Updated to Ember CI 4.1.0
10+
- Updated to use ember-auto-import 2.x
11+
- Updated most other dependencies to the latest
12+
313
### 0.6.0
414

515
This is a minor release that adds no new functionality to the core addon. Primarily dependency updates.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ This project is licensed under the [MIT License](LICENSE.md).
6969

7070
[npm-badge-img]: https://badge.fury.io/js/ember-fakerjs.svg
7171
[npm-badge-link]: http://badge.fury.io/js/ember-fakerjs
72-
[build-status-img]: https://github.com/tzellman/ember-fakerjs/workflows/Build/badge.svg?branch=master&event=push
73-
[build-status-link]: https://github.com/tzellman/ember-fakerjs/actions?query=workflow%3A%22Build%22
72+
[build-status-img]: https://github.com/tzellman/ember-fakerjs/workflows/CI/badge.svg?branch=master&event=push
73+
[build-status-link]: https://github.com/tzellman/ember-fakerjs/actions?query=workflow%3A%22CI%22
7474
[npm-downloads-img]: https://img.shields.io/npm/dt/ember-fakerjs.svg
7575
[ember-observer-badge]: http://emberobserver.com/badges/ember-fakerjs.svg
7676
[ember-observer-url]: http://emberobserver.com/addons/ember-fakerjs

‎config/ember-try.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ module.exports = async function () {
77
return {
88
scenarios: [
99
{
10-
name: 'ember-lts-3.20',
10+
name: 'ember-lts-3.24',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.20.5'
13+
'ember-source': '~3.24.3'
1414
}
1515
}
1616
},
1717
{
18-
name: 'ember-lts-3.24',
18+
name: 'ember-lts-3.28',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.24.3'
21+
'ember-source': '~3.28.0'
2222
}
2323
}
2424
},
@@ -50,12 +50,13 @@ module.exports = async function () {
5050
name: 'ember-default-with-jquery',
5151
env: {
5252
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true
53+
'jquery-integration': false
5454
})
5555
},
5656
npm: {
5757
devDependencies: {
58-
'@ember/jquery': '^1.1.0'
58+
'@ember/jquery': '^1.1.0',
59+
'@ember/optional-features': '^2.0.0'
5960
}
6061
}
6162
},

‎config/tailwind.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
content: ['./tests/**/*.{hbs,js}']
3+
};

‎ember-cli-build.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
postcssOptions: {
88
compile: {
9+
cacheInclude: [/.*\.(css|scss|hbs)$/, /.tailwind\.js$/],
910
enabled: true,
10-
plugins: [require('tailwindcss')(), require('autoprefixer')]
11+
plugins: [require('tailwindcss')('./config/tailwind.js'), require('autoprefixer')]
1112
}
1213
}
1314
});

0 commit comments

Comments
 (0)