Skip to content

Commit

Permalink
chore(deps): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Nov 27, 2024
1 parent 9e501b4 commit 7f828d8
Show file tree
Hide file tree
Showing 18 changed files with 12,548 additions and 11,313 deletions.
16 changes: 0 additions & 16 deletions .eslintignore

This file was deleted.

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

This file was deleted.

84 changes: 50 additions & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,75 @@ concurrency:
cancel-in-progress: true

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 10
# test:
# name: "Tests"
# runs-on: ubuntu-latest
# timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with:
node-version: 18
- name: Lint
run: pnpm lint
- name: Run Tests
run: pnpm ember try:each --skip-cleanup
# steps:
# - uses: actions/checkout@v4
# - uses: pnpm/action-setup@v2
# - name: Install Node
# uses: actions/setup-node@v3
# with:
# node-version: 20
# cache: pnpm
# - name: Install Dependencies
# run: pnpm install --frozen-lockfile
# - name: Lint
# run: pnpm lint
# - name: Run Tests
# run: pnpm ember try:each --skip-cleanup

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10
# floating:
# name: "Floating Dependencies"
# runs-on: ubuntu-latest
# timeout-minutes: 10

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

try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: "test"
# needs: "test"
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.8
- ember-lts-4.4
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
# - ember-lts-4.8
# - ember-lts-4.4
# - ember-lts-4.12
# - ember-lts-5.4
# - ember-lts-5.8
# - ember-lts-5.12
# - ember-release
# - ember-beta
# - ember-canary
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v2
- name: Install Node
uses: actions/setup-node@v3
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:each --skip-cleanup
env:
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v2
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18

node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Deploy to Github Pages
run: pnpm ember deploy production
env:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ jobs:
ref: ${{ github.event.ref }}
fetch-depth: 0
token: ${{ secrets.GH_TOKEN }}
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v2
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile

- name: Configure git
run: |
Expand Down
9 changes: 2 additions & 7 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# skip in CI
[ -n "$CI" ] && exit 0

pnpm commitlint --edit $1
# lint commit message
pnpm commitlint --edit "$1"
6 changes: 0 additions & 6 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# skip in CI
[ -n "$CI" ] && exit 0

# lint only staged files
pnpm lint-staged
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
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ sure that each scenario succeeds. For that, `ember-try` was configured
accordingly to test each of those scenarios:

- `ember try:each` – Runs the test suite on the current Ember version
- `TEST_SCENARIO=[...] ember test --server` – Runs the test suite with the given scenario in "watch mode"
- `EMBER_SCENARIO=[...] ember try:each` – Runs the test suite against multiple Ember versions
- `TEST_SCENARIO=[...] pnpm test:ember --server` – Runs the test suite with the given scenario in "watch mode"
- `EMBER_SCENARIO=[...] pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

- `ember serve`
- `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/).
38 changes: 38 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import path from "node:path";
import { fileURLToPath } from "node:url";

import { FlatCompat } from "@eslint/eslintrc";
import js from "@eslint/js";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
{
ignores: [
"blueprints/*/files/",
"declarations/",
"dist/",
"coverage/",
"!**/.*",
"**/.*/",
".node_modules.ember-try/",
"tests/dummy/app/snippets/*.js",
],
},
...compat.extends("@adfinis/eslint-config/ember-addon"),
{
settings: {
"import/internal-regex": "^(ember-validated-form|dummy)/",
},

rules: {
"ember/no-runloop": "warn",
},
},
];
88 changes: 46 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"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",
"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",
"prepare": "husky install"
"prepare": "husky"
},
"dependencies": {
"@babel/core": "^7.24.6",
"@babel/core": "^7.26.0",
"@embroider/macros": "^1.16.1",
"@embroider/util": "^1.13.0",
"@glimmer/component": "^1.1.2",
Expand All @@ -48,23 +48,26 @@
},
"devDependencies": {
"@adfinis/eslint-config": "2.1.1",
"@adfinis/semantic-release-config": "4.1.0",
"@babel/eslint-parser": "7.25.1",
"@babel/plugin-proposal-decorators": "7.24.1",
"@ember/optional-features": "2.1.0",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.3.0",
"@adfinis/semantic-release-config": "5.0.0",
"@babel/eslint-parser": "7.25.9",
"@babel/plugin-proposal-decorators": "7.25.9",
"@commitlint/cli": "19.6.0",
"@commitlint/config-conventional": "19.6.0",
"@ember/optional-features": "2.2.0",
"@ember/string": "4.0.0",
"@ember/test-helpers": "4.0.4",
"@embroider/test-setup": "4.0.0",
"@fortawesome/ember-fontawesome": "2.0.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@fortawesome/fontawesome-svg-core": "6.7.1",
"@fortawesome/free-solid-svg-icons": "6.7.1",
"bootstrap": "4.6.2",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.2.2",
"ember-auto-import": "2.7.2",
"ember-cli": "5.7.0",
"ember-cli-addon-docs": "7.0.1",
"concurrently": "9.1.0",
"ember-auto-import": "2.10.0",
"ember-cli": "6.0.1",
"ember-cli-addon-docs": "7.2.2",
"ember-cli-clean-css": "3.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-dependency-checker": "3.3.3",
"ember-cli-deploy": "2.0.0",
"ember-cli-deploy-build": "3.0.0",
"ember-cli-deploy-git": "1.3.4",
Expand All @@ -74,40 +77,41 @@
"ember-cli-terser": "4.0.2",
"ember-cli-test-loader": "3.1.0",
"ember-concurrency": "4.0.2",
"ember-data": "5.3.3",
"ember-data": "5.3.9",
"ember-flatpickr": "8.0.1",
"ember-load-initializers": "2.1.2",
"ember-qunit": "8.1.0",
"ember-resolver": "11.0.1",
"ember-source": "5.7.0",
"ember-load-initializers": "3.0.1",
"ember-qunit": "8.1.1",
"ember-resolver": "13.1.0",
"ember-source": "6.0.1",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "6.0.0",
"ember-template-lint-plugin-prettier": "5.0.0",
"ember-try": "3.0.0",
"eslint": "8.57.0",
"eslint": "9.15.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-ember": "12.2.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-qunit": "8.1.1",
"eslint-plugin-ember": "12.3.3",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-n": "17.14.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-qunit": "8.1.2",
"flatpickr": "4.6.13",
"husky": "9.0.11",
"lint-staged": "15.2.2",
"husky": "9.1.7",
"lint-staged": "15.2.10",
"loader.js": "4.7.0",
"prettier": "3.2.5",
"qunit": "2.20.1",
"qunit-dom": "3.0.0",
"semantic-release": "23.1.1",
"stylelint": "16.5.0",
"stylelint-config-standard": "36.0.0",
"stylelint-prettier": "5.0.0",
"webpack": "5.94.0"
"prettier": "3.4.1",
"qunit": "2.22.0",
"qunit-dom": "3.3.0",
"semantic-release": "24.2.0",
"stylelint": "16.10.0",
"stylelint-config-standard": "36.0.1",
"stylelint-prettier": "5.0.2",
"webpack": "5.96.1"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
"ember-source": ">= 4.0.0",
"@ember/string": "^3.1.1 || ^4.0.0"
},
"packageManager": "pnpm@8.11.0",
"packageManager": "pnpm@9.14.2",
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
Expand Down
Loading

0 comments on commit 7f828d8

Please sign in to comment.