Skip to content

Commit

Permalink
fix(deps): update dependencies
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Drop support for Ember LTS < v4.12. This addon now
requires the usage of `ember-intl` v7 and `ember-power-select` v8.
  • Loading branch information
anehx committed Jul 31, 2024
1 parent 2374e89 commit fa89ba0
Show file tree
Hide file tree
Showing 74 changed files with 11,991 additions and 10,535 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/

# misc
Expand Down
30 changes: 21 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,14 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Lint
run: pnpm lint
- name: Run Tests
Expand All @@ -34,10 +39,13 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
args: "--no-lockfile"
node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install --no-lockfile
- name: Run Tests
run: pnpm test:ember

Expand All @@ -51,9 +59,8 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
Expand All @@ -62,8 +69,13 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 20

cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Release on NPM
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
Expand Down
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep
Expand Down
1 change: 1 addition & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = {
"no-bare-strings": true,
"no-implicit-this": { allow: ["housing-stat-link", "current-quarter"] },
"no-curly-component-invocation": { allow: ["current-quarter"] },
"no-at-ember-render-modifiers": "warn",
},
overrides: [
{
Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

* `git clone <repository-url>`
* `cd ember-ebau-gwr`
* `pnpm install`
- `git clone <repository-url>`
- `cd ember-ebau-gwr`
- `pnpm install`

## Linting

* `pnpm lint`
* `pnpm lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

* `pnpm test` – Runs the test suite on the current Ember version
* `pnpm test:ember --server` – Runs the test suite in "watch mode"
* `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `pnpm start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
- `pnpm start`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pnpm start

## Compatibility

- Ember.js v4.4 or above
- Ember CLI v4.4 or above
- Ember.js v4.12 or above
- Ember CLI v4.12 or above
- Node.js v18 or above

## Installation
Expand Down
2 changes: 1 addition & 1 deletion addon/components/import-modal/dwelling-data.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
(t (concat "ember-gwr.dwelling.floorTypeOptions." @model.floorType))
}}
{{else}}
{{"-"}}
-
{{/if}}
</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion addon/components/search-street.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PowerSelect
@disabled={{@disabled}}
@renderInPlace={{true}}
@tabIndex={{"0"}}
@tabIndex="0"
@triggerClass="uk-select"
@searchEnabled={{true}}
@search={{perform this.search}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/search.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

{{#if this.hasMoreResults}}
<Search::ResultTable::LoadMore
@onClick={{(perform this.loadMore)}}
@onClick={{perform this.loadMore}}
@loading={{this.search.isRunning}}
/>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion addon/components/search/filters.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ValidatedForm
@model={{@changeset}}
@on-submit={{(perform @onSubmit @changeset)}}
@on-submit={{perform @onSubmit @changeset}}
class="validated-form"
...attributes
as |Form|
Expand Down
4 changes: 2 additions & 2 deletions addon/resources/import.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ export default class ImportResource extends Resource {

const transforms = TRANSFORM_MAP[importModelName];
return transforms
? data.map?.((object) => applyTransforms(object, transforms)) ??
applyTransforms(data, transforms)
? (data.map?.((object) => applyTransforms(object, transforms)) ??
applyTransforms(data, transforms))
: data;
}
} catch (error) {
Expand Down
1 change: 0 additions & 1 deletion app/adapters/gwr-link.js

This file was deleted.

1 change: 0 additions & 1 deletion app/helpers/build-url.js

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default} from "ember-ebau-gwr/models/gwr-link"
5 changes: 5 additions & 0 deletions blueprints/ember-ebau-gwr/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"use strict";

module.exports = {
normalizeEntityName() {},
};
91 changes: 48 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,104 +15,108 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.scss\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"proxy": "lcp --proxyUrl https://www-r.housing-stat.ch",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
"peerDependencies": {
"ember-engines": "^0.9.0",
"ember-source": "^4.0.0"
"@ember-data/model": "~4.12.8 || >= 5.0.0",
"ember-data": "~4.12.8 || >= 5.0.0",
"ember-engines": "^0.11.0",
"ember-source": ">= 4.0.0"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.25.2",
"@ember/legacy-built-in-components": "^0.5.0",
"@ember/render-modifiers": "^2.1.0",
"@fortawesome/ember-fontawesome": "^2.0.0",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.4",
"ember-basic-dropdown": "^8.1.0",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-composable-helpers": "^5.0.0",
"ember-concurrency": "^4.0.1",
"ember-data": "^4.12.5",
"ember-engines-router-service": "^0.5.1",
"ember-concurrency": "^4.0.2",
"ember-engines-router-service": "^0.6.0",
"ember-flatpickr": "^8.0.0",
"ember-intl": "^6.5.3",
"ember-intl": "^7.0.3",
"ember-modify-based-class-resource": "^1.1.0",
"ember-power-select": "^7.2.0",
"ember-power-select": "^8.2.0",
"ember-truth-helpers": "^4.0.3",
"ember-uikit": "^9.1.2",
"ember-validated-form": "^7.0.1",
"flatpickr": "^4.6.13",
"handlebars": "^4.7.8",
"luxon": "^3.4.4",
"reactiveweb": "^1.2.2"
"reactiveweb": "^1.3.0"
},
"devDependencies": {
"@adfinis/eslint-config": "2.1.1",
"@adfinis/semantic-release-config": "4.1.0",
"@babel/eslint-parser": "7.23.10",
"@babel/plugin-proposal-decorators": "7.24.0",
"@adfinis/semantic-release-config": "5.0.0",
"@babel/eslint-parser": "7.25.1",
"@babel/plugin-proposal-decorators": "7.24.7",
"@ember-data/model": "4.12.8",
"@ember/optional-features": "2.1.0",
"@ember/test-helpers": "3.3.0",
"@embroider/test-setup": "3.0.3",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@ember/test-helpers": "3.3.1",
"@embroider/test-setup": "4.0.0",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.2.2",
"ember-cli": "5.7.0",
"ember-cli": "5.10.0",
"ember-cli-clean-css": "3.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.3",
"ember-cli-sass": "11.0.1",
"ember-cli-sri": "2.1.1",
"ember-cli-terser": "4.0.2",
"ember-data": "4.12.8",
"ember-engines": "0.11.0",
"ember-load-initializers": "2.1.2",
"ember-qunit": "8.0.2",
"ember-resolver": "11.0.1",
"ember-source": "5.7.0",
"ember-qunit": "8.1.0",
"ember-resolver": "12.0.1",
"ember-source": "5.10.1",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "5.13.0",
"ember-template-lint": "6.0.0",
"ember-template-lint-plugin-prettier": "5.0.0",
"ember-test-selectors": "6.0.0",
"ember-test-selectors": "7.0.0",
"ember-try": "3.0.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-ember": "12.0.2",
"eslint-plugin-ember": "12.1.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-n": "17.10.1",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-qunit": "8.1.1",
"loader.js": "4.7.0",
"local-cors-proxy": "1.1.0",
"miragejs": "0.1.48",
"prettier": "3.2.5",
"qunit": "2.20.1",
"qunit-dom": "3.0.0",
"sass": "1.72.0",
"semantic-release": "23.0.5",
"stylelint": "16.2.1",
"stylelint-config-standard-scss": "13.0.0",
"stylelint-prettier": "5.0.0",
"stylelint-scss": "6.2.1",
"uikit": "3.21.5",
"webpack": "5.90.3"
"prettier": "3.3.3",
"qunit": "2.21.1",
"qunit-dom": "3.2.0",
"sass": "1.77.8",
"semantic-release": "24.0.0",
"stylelint": "16.8.1",
"stylelint-config-standard-scss": "13.1.0",
"stylelint-prettier": "5.0.2",
"stylelint-scss": "6.4.1",
"uikit": "3.21.8",
"webpack": "5.93.0"
},
"engines": {
"node": ">= 18"
Expand All @@ -125,5 +129,6 @@
},
"release": {
"extends": "@adfinis/semantic-release-config"
}
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit fa89ba0

Please sign in to comment.