Skip to content

Commit

Permalink
fix(deps): update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Mar 13, 2024
1 parent bc178d9 commit 844c1d5
Show file tree
Hide file tree
Showing 16 changed files with 3,055 additions and 3,824 deletions.
8 changes: 0 additions & 8 deletions .ember-cli
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"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.
Expand Down
8 changes: 8 additions & 0 deletions .eslintrc.js
Expand Up @@ -5,4 +5,12 @@ module.exports = {
settings: {
"import/internal-regex": "^ember-uikit/",
},
rules: {
"ember/no-runloop": [
"error",
{
allowList: ["run"],
},
],
},
};
72 changes: 72 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,72 @@
name: CI

on:
push:
branches:
- main
- master
pull_request: {}

env:
HUSKY: 0

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

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

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
- name: Lint
run: pnpm lint
- name: Run Tests
run: pnpm test:ember

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

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
args: '--no-lockfile'
- name: Run Tests
run: pnpm test:ember

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

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

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Expand Up @@ -5,6 +5,9 @@ on:
branches:
- main

env:
HUSKY: 0

concurrency:
group: deploy
cancel-in-progress: true
Expand All @@ -13,9 +16,6 @@ jobs:
deploy:
name: Deploy
runs-on: ubuntu-latest
# https://github.com/embroider-build/embroider/issues/1532
env:
UV_USE_IO_URING: 0
steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Expand Up @@ -2,6 +2,9 @@ name: Release

on: workflow_dispatch

env:
HUSKY: 0

jobs:
release:
name: Release
Expand Down
115 changes: 0 additions & 115 deletions .github/workflows/test.yml

This file was deleted.

1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions .husky/commit-msg
@@ -1,8 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

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

# lint commit message
pnpm commitlint --edit "$1"
7 changes: 0 additions & 7 deletions .husky/pre-commit
@@ -1,8 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

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

# lint staged files
pnpm lint-staged
29 changes: 21 additions & 8 deletions CONTRIBUTING.md
@@ -1,12 +1,25 @@
# Contributing to ember-uikit
# How To Contribute

## Coding style
## Installation

* **Commit messages** ember-uikit uses [semantic release](https://github.com/semantic-release/semantic-release) to automate the process of making new releases. That requires all commit messages to adhere to a specific format, namely [conventional commits](https://www.conventionalcommits.org/). The format of the commit messages is checked automaticaly during CI.
* **Ember** ember-uikit uses the [ember](https://github.com/ember-cli/eslint-plugin-ember) coding style.
* **Prettier** Install prettier for automatic code formatting. This is also enforced by the CI.
* **Actions** Use closure actions. We prefer dasherized action names like `on-click` rather than `onClick`.
- `git clone <repository-url>`
- `cd ember-uikit`
- `pnpm install`

## CI and CD
## Linting

Travis CI will take care of testing and deploying the demo app. You don't have to care about it.
- `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

## Running the dummy application

- `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/).
10 changes: 9 additions & 1 deletion addon/components/-private/linked-list-item.js
@@ -1,3 +1,4 @@
import { getOwner } from "@ember/application";
import { action } from "@ember/object";
import { inject as service } from "@ember/service";
import Component from "@glimmer/component";
Expand All @@ -17,6 +18,13 @@ function getParams(currentRouteInfo) {
export default class LinkedListItemComponent extends Component {
@service("router") _router;

get isHashLocation() {
return (
getOwner(this).resolveRegistration("config:environment").locationType ===
"hash"
);
}

/* istanbul ignore next */
get isEngineRouter() {
return Boolean(this._router.externalRouter);
Expand Down Expand Up @@ -69,7 +77,7 @@ export default class LinkedListItemComponent extends Component {
let href = absoluteHref;

/* istanbul ignore next */
if (this.router.location.implementation === "hash") {
if (this.isHashLocation) {
href = href.replace(/^#/, "");
}

Expand Down
4 changes: 2 additions & 2 deletions addon/components/uk-switcher/nav.js
Expand Up @@ -10,8 +10,8 @@ export default class UkSwitcherNavComponent extends Component {
this.args.type === "tab"
? UkTabComponent
: this.args.type === "subnav"
? UkSubnavComponent
: null;
? UkSubnavComponent
: null;

assert(
`The @type argument can of the \`UkSwitcher\` component be "tab" or "subnav", "${this.args.type}" was passed`,
Expand Down
5 changes: 5 additions & 0 deletions ember-cli-build.js
Expand Up @@ -15,6 +15,11 @@ module.exports = function (defaults) {
"bash",
],
},
babel: {
plugins: [
require.resolve("ember-concurrency/async-arrow-task-transform"),
],
},
});

/*
Expand Down

0 comments on commit 844c1d5

Please sign in to comment.