Skip to content

Commit

Permalink
Merge pull request #120 from simonihmig/ember-addon
Browse files Browse the repository at this point in the history
Convert to v2 Ember addon, drop support for Ember < 3.24
  • Loading branch information
simonihmig authored Feb 11, 2022
2 parents 2cae644 + 90eefe8 commit 6019928
Show file tree
Hide file tree
Showing 75 changed files with 4,656 additions and 5,668 deletions.
12 changes: 0 additions & 12 deletions .dependabot/config.yml

This file was deleted.

66 changes: 0 additions & 66 deletions .eslintrc.js

This file was deleted.

95 changes: 49 additions & 46 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,75 @@ name: CI
on:
push:
branches:
- main
- master
tags:
- '*'
pull_request:
schedule:
- cron: '0 4 * * 5' # Fridays at 4am
pull_request: {}

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

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

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup node.js
uses: actions/setup-node@v1
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 10
- name: Install dependencies
uses: bahmutov/npm-install@v1
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint
- name: Test
run: yarn test:ember
- name: Run Tests
run: yarn test

test-no-lock:
name: Floating Dependencies
floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
needs:
- test

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup node.js
uses: actions/setup-node@v1
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 10
- name: Install dependencies
uses: bahmutov/npm-install@v1
with:
useLockFile: false
- name: Test
run: yarn test:ember
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --no-lockfile
- name: Run Tests
run: yarn test

test-try:
name: Additional Tests
try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs:
- test
needs: 'test'

strategy:
fail-fast: false
matrix:
scenario:
- ember-lts-3.16
try-scenario:
- ember-lts-3.24
- ember-lts-3.28
- ember-release
- ember-beta
- ember-canary
fail-fast: false
- ember-classic
- embroider-safe
- embroider-optimized

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup node.js
uses: actions/setup-node@v1
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 10
- name: Install dependencies
uses: bahmutov/npm-install@v1
- name: Test
run: yarn ember try:one ${{ matrix.scenario }}
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
working-directory: packages/test-app
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/addon/
dist/

# dependencies
/bower_components/
/node_modules/
node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand All @@ -22,5 +20,5 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
/yarn.lock.ember-try
40 changes: 40 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep

# 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
25 changes: 25 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/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
2 changes: 1 addition & 1 deletion .template-lintrc.js → .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: 'octane',
singleQuote: true,
};
9 changes: 4 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
## Installation

* `git clone <repository-url>`
* `cd ember-cache-primitive-polyfill`
* `cd tracked-redux`
* `yarn install`

## Linting

* `yarn lint:hbs`
* `yarn lint:js`
* `yarn lint:js --fix`
* `yarn lint`
* `yarn lint:fix`

## Running tests

Expand All @@ -23,4 +22,4 @@
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020
Copyright (c) 2022

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
Loading

0 comments on commit 6019928

Please sign in to comment.