Skip to content

Commit

Permalink
chore: updates to several addons/dependencies and 1.0 rlease
Browse files Browse the repository at this point in the history
- ember-auto-import 2.x
- ember 4.1
- bump version to 1.0
- lock faker version for now to 5.5.3
  • Loading branch information
tzellman committed Jan 5, 2022
1 parent 062e5b0 commit fb2120d
Show file tree
Hide file tree
Showing 18 changed files with 5,230 additions and 2,347 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
extends: ['plugin:node/recommended']
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended']
}
Expand Down
59 changes: 0 additions & 59 deletions .github/workflows/build.yml

This file was deleted.

100 changes: 100 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: CI

on:
push:
branches: [master]
pull_request:
branches: [master]

env:
CC_TEST_REPORTER_ID: 3c17d30a957d0b5f06d932c3dd8ce9354df2b8d7769710d8827e6261445839d8

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: npm
- name: Install Dependencies
run: npm ci
- name: Lint
run: npm run lint
- name: Run Tests
run: npm run test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 12.x
cache: npm
- name: Install Dependencies
run: npm install --no-shrinkwrap
- name: Run Tests
run: npm run test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
needs: "test"

strategy:
fail-fast: false
matrix:
try-scenario:
- ember-lts-3.24
- ember-lts-3.28
- ember-beta
- ember-classic
- ember-default-with-jquery
- embroider-safe
- embroider-optimized
experimental: [false]
coverage: [false]
include:
- try-scenario: ember-canary
experimental: true
coverage: false
- try-scenario: ember-release
experimental: false
coverage: true

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: npm
- name: Install Dependencies
run: npm ci
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
# only run coverage under specific scenarios
- name: Coverage
if: ${{ matrix.coverage && github.ref == 'refs/heads/master' }}
run: |
npm ci
COVERAGE=true node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.json coverage/lcov.info
./cc-test-reporter upload-coverage
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ commitlint.config.js
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

### 1.0.0

🎉 This is the first major release of ember-fakerjs! 🎉

#### Changes

- Updated to Ember CI 4.1.0
- Updated to use ember-auto-import 2.x
- Updated most other dependencies to the latest

### 0.6.0

This is a minor release that adds no new functionality to the core addon. Primarily dependency updates.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ This project is licensed under the [MIT License](LICENSE.md).

[npm-badge-img]: https://badge.fury.io/js/ember-fakerjs.svg
[npm-badge-link]: http://badge.fury.io/js/ember-fakerjs
[build-status-img]: https://github.com/tzellman/ember-fakerjs/workflows/Build/badge.svg?branch=master&event=push
[build-status-link]: https://github.com/tzellman/ember-fakerjs/actions?query=workflow%3A%22Build%22
[build-status-img]: https://github.com/tzellman/ember-fakerjs/workflows/CI/badge.svg?branch=master&event=push
[build-status-link]: https://github.com/tzellman/ember-fakerjs/actions?query=workflow%3A%22CI%22
[npm-downloads-img]: https://img.shields.io/npm/dt/ember-fakerjs.svg
[ember-observer-badge]: http://emberobserver.com/badges/ember-fakerjs.svg
[ember-observer-url]: http://emberobserver.com/addons/ember-fakerjs
Expand Down
13 changes: 7 additions & 6 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.20',
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.20.5'
'ember-source': '~3.24.3'
}
}
},
{
name: 'ember-lts-3.24',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.24.3'
'ember-source': '~3.28.0'
}
}
},
Expand Down Expand Up @@ -50,12 +50,13 @@ module.exports = async function () {
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
'jquery-integration': false
})
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0'
'@ember/jquery': '^1.1.0',
'@ember/optional-features': '^2.0.0'
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions config/tailwind.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
content: ['./tests/**/*.{hbs,js}']
};
3 changes: 2 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
postcssOptions: {
compile: {
cacheInclude: [/.*\.(css|scss|hbs)$/, /.tailwind\.js$/],
enabled: true,
plugins: [require('tailwindcss')(), require('autoprefixer')]
plugins: [require('tailwindcss')('./config/tailwind.js'), require('autoprefixer')]
}
}
});
Expand Down
Loading

0 comments on commit fb2120d

Please sign in to comment.