Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Switch to monorepo layout
Browse files Browse the repository at this point in the history
In preparation for moving the entire application into the frontend.
  • Loading branch information
jrjohnson committed Feb 10, 2024
1 parent 25ddcf2 commit e9e1f2f
Show file tree
Hide file tree
Showing 97 changed files with 603 additions and 730 deletions.
9 changes: 3 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# unconventional js
/blueprints/*/files/
/packages/*/blueprints/*/files/

# compiled output
/dist/
/packages/*/dist/

# misc
/coverage/
/packages/*/coverage/
!.*
.*/

# ember-try
/.node_modules.ember-try/
26 changes: 16 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ 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: [
// node files
Expand All @@ -34,12 +36,12 @@ module.exports = {
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
'./packages/*/blueprints/*/index.js',
'./packages/*/config/**/*.js',
'./packages/*/ember-cli-build.js',
'./packages/*/index.js',
'./packages/*/testem.js',
'./packages/lti-dashboard/lib/*/index.js',
],
parserOptions: {
sourceType: 'script',
Expand All @@ -52,8 +54,12 @@ 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,
},
},
],
};
37 changes: 0 additions & 37 deletions .github/workflows/auto-merge.yml

This file was deleted.

30 changes: 19 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,51 +20,59 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- name: Install Dependencies
run: pnpm install
- name: Lint
run: pnpm run lint

test:
name: "Test"
name: ${{matrix.workspace}} Test (${{ matrix.node-version }})
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 15

strategy:
matrix:
node-version: [20]
workspace:
- lti-dashboard
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: ${{ matrix.node-version }}
cache: pnpm
- name: Install Dependencies
run: pnpm install
- name: Run Tests
run: pnpm run test:ember
run: pnpm --filter ${{matrix.workspace}} exec ember test

build:
name: Build
name: Build (${{ matrix.node-version }})
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
node-version: [20]
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: ${{ matrix.node-version }}
cache: pnpm
- name: install dependencies
run: pnpm install
- name: test build
run: pnpm run build
run: pnpm run --filter lti-dashboard build
6 changes: 3 additions & 3 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
run: pnpm run deploy:production
run: pnpm run --filter lti-dashboard deploy:production
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6 changes: 3 additions & 3 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
run: pnpm run deploy:staging
run: pnpm run --filter lti-dashboard deploy:staging
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
17 changes: 11 additions & 6 deletions .github/workflows/tag_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@ jobs:
- uses: actions/checkout@v4
with:
token: ${{ secrets.ZORGBORT_TOKEN }}
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
node-version: 20
- name: Validate releaseType
run: npx in-string-list ${{ github.event.inputs.releaseType }} major,minor,patch
- name: Setup Git
run: |
git config user.name Zorgbort
git config user.email info@iliosproject.org
- name: Increment Version
run: pnpm version ${{ github.event.inputs.releaseType }}
working-directory: ./packages/lti-dashboard
run: npx versionup --level ${{ github.event.inputs.releaseType }}
- run: |
NEW_TAG=`node -p "require('./packages/lti-dashboard/package.json').version"`
echo ${NEW_TAG}
echo "new_tag=${NEW_TAG}" >> $GITHUB_ENV
- name: Tag Version
run: |
git commit -a -m "${{env.new_tag}}"
git tag v${{env.new_tag}} -m "Tagging the v${{env.new_tag}} ${{ github.event.inputs.releaseType }} release"
- name: Push Changes
run: git push --follow-tags
44 changes: 0 additions & 44 deletions .github/workflows/update-transitive-dependencies.yml

This file was deleted.

30 changes: 10 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
# compiled output
/dist/
/declarations/
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules/
node_modules/

# misc
/.env*
/.pnp*
/.eslintcache
/coverage/
/npm-debug.log*
/testem.log
/yarn-error.log
.env*
.pnp*
.pnpm-debug.log
.sass-cache
.eslintcache
coverage/
npm-debug.log*
yarn-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
13 changes: 0 additions & 13 deletions .prettierignore

This file was deleted.

8 changes: 1 addition & 7 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
**/dist/
3 changes: 3 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@

module.exports = {
extends: ['stylelint-config-recommended-scss', 'stylelint-prettier/recommended'],
rules: {
'property-disallowed-list': ['font-size', 'line-height'],
},
};
9 changes: 7 additions & 2 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
'use strict';

module.exports = {
plugins: ['@ilios/ember-template-lint-plugin'],
extends: 'ilios:recommended',
extends: 'recommended',
rules: {
'no-implicit-this': {
//our helpers which do not take arguments have to be listed here
allow: ['browser-timezone', 'noop'],
},
},
};
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["dist"]
"ignore_dirs": ["pachages/lti-dashboard/dist"]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You will need the following things properly installed on your computer.
## Installation

* `git clone <repository-url>` this repository
* `cd lti-app`
* `cd lti-dashboard`
* `pnpm install`

## Running / Development
Expand Down
3 changes: 0 additions & 3 deletions app/templates/application.hbs

This file was deleted.

Loading

0 comments on commit e9e1f2f

Please sign in to comment.