Skip to content

Commit

Permalink
Merge pull request ilios#7597 from stopfstedt/jetzt_waechst_zusammen_…
Browse files Browse the repository at this point in the history
…was_zusammen_gehoert

merge common into monorepo
  • Loading branch information
stopfstedt committed Feb 6, 2024
2 parents 4e6c00d + a28839d commit 5eb734b
Show file tree
Hide file tree
Showing 1,885 changed files with 103,332 additions and 859 deletions.
18 changes: 11 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ module.exports = {
browser: true,
},
rules: {
'ember/no-classic-classes': 0,
'ember/require-tagless-components': 0,
'ember/classic-decorator-no-classic-methods': 0,
'ember/no-mixins': 0,
'ember/no-actions-hash': 0,
'ember/no-classic-classes': 0,
'ember/no-classic-components': 0,
'ember/no-component-lifecycle-hooks': 0,
'ember/no-get': 0,
'ember/no-mixins': 0,
'ember/no-new-mixins': 0,
'ember/require-tagless-components': 0,
'no-console': 1,
},
overrides: [
Expand All @@ -35,13 +36,15 @@ module.exports = {
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./packages/frontend/lib/*/index.js',
'./packages/*/blueprints/*/index.js',
'./packages/*/config/**/*.js',
'./packages/*/ember-cli-build.js',
'./packages/*/index.js',
'./packages/*/testem.js',
'./packages/*/tests/dummy/config/**/*.js',
'./packages/frontend/lib/*/index.js',
'./packages/frontend/testem.browserstack.js',
'./packages/*/blueprints/*/index.js',
'./packages/*/config/**/*.js',
'./packages/test-app/testem.browserstack.js',
],
parserOptions: {
sourceType: 'script',
Expand All @@ -54,10 +57,11 @@ module.exports = {
},
{
// test files
files: ['tests/**/*-test.{js,ts}'],
files: ['packages/**/tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
'qunit/require-expect': [2, 'except-simple'],
'ember/no-classic-classes': 0,
},
},
],
Expand Down
63 changes: 0 additions & 63 deletions .github/dependabot.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,30 @@ jobs:
strategy:
matrix:
safe-dependency:
- "@embroider/test-setup"
- "@embroider/util"
- "@formatjs/intl-locale"
- "@formatjs/intl-pluralrules"
- "@formatjs/intl-relativetimeformat"
- "@percy/cli"
- "@percy/ember"
- "@sentry/ember"
- "broccoli-file-creator"
- "broccoli-funnel"
- "broccoli-merge-trees"
- "browserslist"
- "caniuse-db"
- "ember-a11y-testing"
- "ember-cli-bundle-analyzer"
- "ember-cli-dependency-checker"
- "ember-cli-dependency-lint"
- "ember-cli-deprecation-workflow"
- "ember-cli-mirage"
- "ember-cli-page-object"
- "ember-noscript"
- "ember-qunit-nice-errors"
- "ember-template-lint"
- "ember-test-selectors"
- "stylelint-config-recommended-scss"
- "stylelint-scss"
if: ${{ github.actor == 'dependabot[bot]' }}
Expand All @@ -28,9 +43,9 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- uses: actions/checkout@v4
if: ${{contains(steps.metadata.outputs.dependency-names, matrix.safe-dependency)}}
if: ${{contains(steps.metadata.outputs.dependency-names, matrix.safe-dependency) && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }}
- name: Enable auto-merge for Dependabot PRs
if: ${{contains(steps.metadata.outputs.dependency-names, matrix.safe-dependency)}}
if: ${{contains(steps.metadata.outputs.dependency-names, matrix.safe-dependency) && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }}
run: gh pr merge --merge --auto ${{ github.event.number }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57 changes: 48 additions & 9 deletions .github/workflows/frontend-ci.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Continuous Integration

on:
push:
Expand Down Expand Up @@ -43,7 +43,10 @@ jobs:

strategy:
matrix:
node-version: [18,20]
node-version: [20]
workspace:
- frontend
- test-app

steps:
- uses: actions/checkout@v4
Expand All @@ -57,7 +60,7 @@ jobs:
- name: Install Dependencies
run: pnpm install
- name: Run Tests
run: pnpm run test:ember
run: pnpm run --filter ${{matrix.workspace}} test:ember

build:
name: Build
Expand Down Expand Up @@ -89,6 +92,9 @@ jobs:
fail-fast: false
max-parallel: 2
matrix:
workspace:
- frontend
- test-app
launcher:
- BS_OSX_Safari
- BS_MS_Edge
Expand All @@ -114,10 +120,10 @@ jobs:
# The Job ID + Run ID isn't unique across matrix runs and will fail when run simultaneously
BROWSERSTACK_LOCAL_ID_SUFFIX: ${{ matrix.launcher }}
run: |
pnpm run --filter frontend browserstack:connect
pnpm run --filter frontend test:ember:browserstack --launch=${{ matrix.launcher }}
pnpm run --filter frontend browserstack:disconnect
pnpm run --filter frontend browserstack:results
pnpm run --filter ${{matrix.workspace}} browserstack:connect
pnpm run --filter ${{matrix.workspace}} test:ember:browserstack --launch=${{ matrix.launcher }}
pnpm run --filter ${{matrix.workspace}} browserstack:disconnect
pnpm run --filter ${{matrix.workspace}} browserstack:results
firefox-test:
name: Browser Tests (Firefox)
Expand All @@ -127,6 +133,9 @@ jobs:
strategy:
fail-fast: false
matrix:
workspace:
- frontend
- test-app
firefox-version: [latest-esr]
steps:
- uses: actions/checkout@v4
Expand All @@ -144,7 +153,37 @@ jobs:
firefox-version: ${{ matrix.firefox-version }}
- run: firefox --version
- name: test
run: pnpm run test:ember --launch=Firefox
run: pnpm run --filter ${{matrix.workspace}} test:ember --launch=Firefox

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

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

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- run: pnpm install
- name: Run Tests
run: pnpm run --filter test-app tryone ${{ matrix.try-scenario }} --skip-cleanup

test-with-embroider:
name: Test With Embroider
Expand All @@ -164,7 +203,7 @@ jobs:
- name: Install Dependencies
run: pnpm install
- name: Run Tests
run: pnpm run test:ember
run: pnpm run --filter frontend test:ember

build-with-embroider:
name: Build With Embroider
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
working-directory: ./packages/frontend
run: node_modules/.bin/ember deploy pr-preview
run: pnpm --filter frontend exec ember deploy pr-preview
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Percy Visual Tests
name: Percy PR Tests

on:
pull_request_target:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Run Percy Tests
run: pnpm run --filter frontend test:percy
run: pnpm run --workspace-concurrency=1 -r test:percy
- uses: act10ns/slack@v2
if: failure()
with:
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/percy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Percy Visual Tests

on:
schedule:
- cron: "15 23 * * 2,4" # T,Th in the afternoon (UTC)
workflow_dispatch:

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

env:
SW_DISABLED: true
COVERAGE: false
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ILIOS_DEPLOYMENT_WEBHOOK_URL }}

jobs:
percy:
name: Test and Capture Screenshots
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- run: pnpm install
- name: Run Percy Tests
run: pnpm run --workspace-concurrency=1 -r test:percy
- uses: act10ns/slack@v2
if: failure()
with:
status: ${{ job.status }}
message: Percy Run Failed {{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
File renamed without changes.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
rules: {
'no-implicit-this': {
//our helpers which do not take arguments have to be listed here
allow: ['noop'],
allow: ['browser-timezone', 'noop'],
},
},
};
35 changes: 35 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# How To Contribute

## Installation

* `git clone <repository-url>`
* `cd my-addon`
* `pnpm install`

## Linting

* `pnpm run lint`
* `pnpm run lint:fix`

## Running tests

* `pnpm test` – Runs the test suite on the current Ember version

## Running the test application

* `pnpm start`
* Visit the test 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/).


### Point Common at the API Server

To view the application with data you'll need to provide a URL to a running API server. You can use
docker to create a local server following the [Quick Setup Guide](https://github.com/ilios/ilios/blob/master/docs/ilios_quick_setup_for_admins.md) for Ilios or point to an existing API server.

Pass that information to the application using the `ILIOS_FRONTEND_API_HOST` environmental variable.

```bash
ILIOS_FRONTEND_API_HOST=https://demo.iliosproject.org pnpm start
```
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 The Regents of the University of California
Copyright (c) The Regents of the University of California

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 5eb734b

Please sign in to comment.