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

Commit

Permalink
Merge pull request #1321 from jrjohnson/prep-and-then-monorepo
Browse files Browse the repository at this point in the history
Convert to Monorepo
  • Loading branch information
stopfstedt committed Feb 12, 2024
2 parents 83201e1 + e0fcf55 commit 3798eda
Show file tree
Hide file tree
Showing 74 changed files with 639 additions and 724 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-course-manager/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,
},
},
],
};
36 changes: 0 additions & 36 deletions .github/workflows/auto-merge.yml

This file was deleted.

24 changes: 16 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,46 +26,54 @@ jobs:
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-course-manager
steps:
- uses: actions/checkout@v4
- 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@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-course-manager build
4 changes: 2 additions & 2 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
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-course-manager deploy:production
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
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-course-manager deploy:staging
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
44 changes: 0 additions & 44 deletions .github/workflows/update-transitive-dependencies.yml

This file was deleted.

31 changes: 10 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +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*
/.sass-cache
/.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-course-manager/dist"]
}
Loading

0 comments on commit 3798eda

Please sign in to comment.