Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/minimist-0.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
derrabauke authored Sep 23, 2024
2 parents 67821de + df8bb46 commit 2f024c3
Show file tree
Hide file tree
Showing 135 changed files with 6,741 additions and 4,915 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
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 @@ -4,7 +4,7 @@ module.exports = {
settings: {
"import/internal-regex": "^ember-emeis/",
},
extends: ["@adfinis-sygroup/eslint-config/ember-addon"],
extends: ["@adfinis/eslint-config/ember-addon"],
rules: {
"ember/no-settled-after-test-helper": "warn",
},
Expand Down
24 changes: 12 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: "monday"
time: "00:00"
timezone: "Europe/Zurich"
open-pull-requests-limit: 10
reviewers:
- velrest
versioning-strategy: increase

- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: "monday"
time: "00:00"
timezone: "Europe/Zurich"
open-pull-requests-limit: 10
reviewers:
- velrest
- derrabauke
versioning-strategy: increase
14 changes: 10 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ name: Release
on: workflow_dispatch

jobs:
build:
release:
name: Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- uses: actions/setup-node@v3
with:
node-version: 18
cache: "yarn"

- name: Install dependencies
run: yarn install

- name: Release on NPM
run: yarn semantic-release
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: yarn semantic-release
58 changes: 20 additions & 38 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,21 @@ on:

env:
CI: true
NODE_VERSION: 14
NODE_VERSION: 18.18.1

jobs:
lint:
name: Lint
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-${{ hashFiles('yarn.lock') }}
yarn-
cache: "yarn"

- name: Install Dependencies
run: yarn install
run: yarn install --frozen-lockfile

- name: Lint JS & Handlebars
run: yarn lint
Expand All @@ -42,18 +35,11 @@ jobs:
runs-on: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-${{ hashFiles('yarn.lock') }}
yarn-
cache: "yarn"

- name: Install dependencies (no lockfile)
run: yarn install --no-lockfile
Expand All @@ -62,7 +48,7 @@ jobs:
run: yarn test:ember

- name: Install dependencies
run: yarn install
run: yarn install --frozen-lockfile

- name: Run tests
run: yarn test:ember
Expand All @@ -75,27 +61,23 @@ jobs:
strategy:
matrix:
scenario:
- ember-lts-3.24
- ember-release

- ember-lts-4.8
- ember-lts-4.12
# Disable for now since ember-data@4 causes an embroider build error. See https://github.com/projectcaluma/ember-emeis/pull/625#issuecomment-1614488464
# - ember-release
- embroider-safe
- embroider-optimized
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- uses: actions/cache@v2
with:
path: node_modules
key: yarn-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-${{ hashFiles('yarn.lock') }}
yarn-
cache: "yarn"

- name: Install dependencies
run: yarn install
run: yarn install --frozen-lockfile

- uses: actions/cache@v2
- uses: actions/cache@v3
with:
path: |
yarn
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@
# 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

# broccoli-debug
/DEBUG/
5 changes: 4 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
/.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
Expand All @@ -33,4 +33,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
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
3 changes: 2 additions & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"use strict";

module.exports = {
extends: "recommended",
extends: ["recommended", "ember-template-lint-plugin-prettier:recommended"],
plugins: ["ember-template-lint-plugin-prettier"],

rules: {
"require-input-label": "warn",
Expand Down
94 changes: 94 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,97 @@
# [8.1.0](https://github.com/projectcaluma/ember-emeis/compare/v8.0.1...v8.1.0) (2023-10-13)


### Features

* **user:** filter export ([#722](https://github.com/projectcaluma/ember-emeis/issues/722)) ([2b53e45](https://github.com/projectcaluma/ember-emeis/commit/2b53e453f7d812d2457710db69fa51ffbe7e9139))

## [8.0.1](https://github.com/projectcaluma/ember-emeis/compare/v8.0.0...v8.0.1) (2023-08-17)


### Bug Fixes

* mount point of the package ([#707](https://github.com/projectcaluma/ember-emeis/issues/707)) ([2caca26](https://github.com/projectcaluma/ember-emeis/commit/2caca26f04052709e322453a91706825911f43d4))

# [8.0.0](https://github.com/projectcaluma/ember-emeis/compare/v7.0.0...v8.0.0) (2023-07-05)


### chore

* udpate to ember 4.12 and make embroider optimized ([37cdaed](https://github.com/projectcaluma/ember-emeis/commit/37cdaeda348f17d3a6e7a4e34fb9a1ef88a19700))
* update to ember v4 ([04865f1](https://github.com/projectcaluma/ember-emeis/commit/04865f1d0e947a6b90a6a34082f9197ab8f7557a))


### Code Refactoring

* rename `router` service dependency to `hostRouter` ([855a842](https://github.com/projectcaluma/ember-emeis/commit/855a84276f1111e530aba5dcb554db602b09f9df))


### BREAKING CHANGES

* - Ember.js v3.28 or above
- Ember CLI v3.28 or above
- Node.js v14 or above
* - Rename `router` service dependency to `hostRouter` due to deprecation

Deprecation id: ember-engines.deprecation-router-service-from-host
* - Ember.js v3.28 or above
- Ember CLI v3.28 or above
- Node.js v16 or above

# [7.0.0](https://github.com/projectcaluma/ember-emeis/compare/v6.3.2...v7.0.0) (2023-05-16)


### Bug Fixes

* confirm task tests ([#669](https://github.com/projectcaluma/ember-emeis/issues/669)) ([01db8a2](https://github.com/projectcaluma/ember-emeis/commit/01db8a235aa270f5f58b67594126966f52e929cd))
* **scopes:** show updated parent after selection ([#665](https://github.com/projectcaluma/ember-emeis/issues/665)) ([2eb3440](https://github.com/projectcaluma/ember-emeis/commit/2eb3440e335a95739cb25fd5438b0c2863611699))


### chore

* adapt ember try scenarios ([#670](https://github.com/projectcaluma/ember-emeis/issues/670)) ([f9e530b](https://github.com/projectcaluma/ember-emeis/commit/f9e530b93e4f22765bdb418326920a7c18fa0a1c))


### BREAKING CHANGES

* drop support for ember v3.24

* chore(deps): update ember-ty to v3.0.0-beta.1

Prevents local build error.

* test(confirm-task): revert waitUntil calls

* fix(confirm-task): catch nested promise rejection

* test(confirm-task): skip flaky test
* drop support for ember v3.24

* chore(deps): update ember-ty to v3.0.0-beta.1

Prevents local build error.

## [6.3.2](https://github.com/projectcaluma/ember-emeis/compare/v6.3.1...v6.3.2) (2023-05-09)


### Bug Fixes

* **scopes:** prevent circular relation selection ([#656](https://github.com/projectcaluma/ember-emeis/issues/656)) ([ecfcc97](https://github.com/projectcaluma/ember-emeis/commit/ecfcc97ac777a6cb44c724c7c02b128aec11b8b1))

## [6.3.1](https://github.com/projectcaluma/ember-emeis/compare/v6.3.0...v6.3.1) (2023-04-17)


### Bug Fixes

* typo in user filter visibility setting ([#649](https://github.com/projectcaluma/ember-emeis/issues/649)) ([ef9c07b](https://github.com/projectcaluma/ember-emeis/commit/ef9c07b1f765d94f5d466c0fa734f98c22c370de))

# [6.3.0](https://github.com/projectcaluma/ember-emeis/compare/v6.2.4...v6.3.0) (2023-04-17)


### Features

* **emeisOptions:** make user filter optionally visible ([#648](https://github.com/projectcaluma/ember-emeis/issues/648)) ([107b7de](https://github.com/projectcaluma/ember-emeis/commit/107b7de222e548d1e10748e14eb817f79aa95294))

## [6.2.4](https://github.com/projectcaluma/ember-emeis/compare/v6.2.3...v6.2.4) (2022-11-18)


Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

## Linting

* `yarn lint`
* `yarn lint:fix`
- `yarn lint`
- `yarn lint:fix`

## Running tests

Expand All @@ -27,4 +27,4 @@
- set up `emeis` (see [docs](https://github.com/projectcaluma/emeis))
- `yarn start-proxy`

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/).
Loading

0 comments on commit 2f024c3

Please sign in to comment.