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

Commit

Permalink
Convert to monorepo
Browse files Browse the repository at this point in the history
Moved all the tests into the test-app

- I had to remove the code coverage, hopefully temporarily.
- Moved the linting up to the top level. This isn't the way it looks in
the sample ember version, but it's the only way I could get everything
working the way I expected.
- Removed dotenv, use real ENV variables to configure
  • Loading branch information
jrjohnson committed Jan 25, 2024
1 parent 0a11eba commit 3c55b00
Show file tree
Hide file tree
Showing 1,895 changed files with 1,729 additions and 1,514 deletions.
8 changes: 4 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# unconventional js
/blueprints/*/files/
/packages/*/blueprints/*/files/

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

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

# ember-try
/.node_modules.ember-try/
/packages/*/.node_modules.ember-try/
36 changes: 13 additions & 23 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,23 @@ module.exports = {
},
rules: {
'ember/no-get': 0,
'ember/use-brace-expansion': 0,
'ember/no-new-mixins': 0,
'ember/no-classic-classes': 0,
'ember/no-mixins': 0,
'ember/require-tagless-components': 0,
'no-console': 1,
'n/no-unpublished-require': [
'error',
{
allowModules: ['ember-cli-code-coverage'],
},
],
},
overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./testem.browserstack.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
'.eslintrc.js',
'.prettierrc.js',
'.stylelintrc.js',
'.template-lintrc.js',
'packages/*/ember-cli-build.js',
'packages/*/index.js',
'packages/*/testem.js',
'packages/test-app/testem.browserstack.js',
'packages/*/blueprints/*/index.js',
'packages/*/config/**/*.js',
'packages/*/tests/dummy/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
Expand All @@ -58,10 +47,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
61 changes: 53 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,59 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
directory: "/packages/test-app"
schedule:
interval: weekly
ignore:
- dependency-name: "@babel/eslint-parser"
- dependency-name: "@babel/plugin-proposal-decorators"
- dependency-name: "@ember/optional-features"
- dependency-name: "@ember/string"
- dependency-name: "@ember/test-helpers"
- dependency-name: "@glimmer/component"
- dependency-name: "@glimmer/tracking"
- dependency-name: broccoli-asset-rev
- dependency-name: concurrently
- dependency-name: ember-auto-import
- dependency-name: ember-cli
- dependency-name: ember-cli-app-version
- dependency-name: ember-cli-babel
- dependency-name: ember-cli-dependency-checker
- dependency-name: ember-cli-htmlbars
- dependency-name: ember-cli-inject-live-reload
- dependency-name: ember-cli-sri
- dependency-name: ember-cli-terser
- dependency-name: ember-data
- dependency-name: ember-fetch
- dependency-name: ember-load-initializers
- dependency-name: ember-modifier
- dependency-name: ember-page-title
- dependency-name: ember-qunit
- dependency-name: ember-resolver
- dependency-name: ember-source
- dependency-name: ember-template-lint
- dependency-name: ember-welcome-page
- dependency-name: eslint
- dependency-name: eslint-config-prettier
- dependency-name: eslint-plugin-ember
- dependency-name: eslint-plugin-n
- dependency-name: eslint-plugin-prettier
- dependency-name: eslint-plugin-qunit
- dependency-name: loader.js
- dependency-name: prettier
- dependency-name: qunit
- dependency-name: qunit-dom
- dependency-name: stylelint
- dependency-name: stylelint-config-standard
- dependency-name: stylelint-prettier
- dependency-name: tracked-built-ins
- dependency-name: webpack

- package-ecosystem: npm
directory: "/packages/ilios-common"
schedule:
interval: daily
time: "02:30"
timezone: America/Los_Angeles
open-pull-requests-limit: 10
versioning-strategy: increase-if-necessary
interval: weekly
ignore:
- dependency-name: "@babel/core"
- dependency-name: "@babel/eslint-parser"
- dependency-name: "@babel/plugin-proposal-decorators"
- dependency-name: "@ember/optional-features"
Expand Down Expand Up @@ -50,7 +94,8 @@ updates:
- dependency-name: stylelint-config-standard
- dependency-name: stylelint-prettier
- dependency-name: webpack

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
interval: weekly
15 changes: 0 additions & 15 deletions .github/workflows/asset-size-check.yml

This file was deleted.

22 changes: 16 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand All @@ -38,6 +40,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down Expand Up @@ -66,13 +70,15 @@ jobs:
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: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
run: pnpm run --filter test-app tryone ${{ matrix.try-scenario }} --skip-cleanup

browserstack-test:
name: Browserstack ${{ matrix.launcher }}
Expand All @@ -91,6 +97,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand All @@ -106,10 +114,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 browserstack:connect
pnpm run test:ember:browserstack --launch=${{ matrix.launcher }}
pnpm run browserstack:disconnect
pnpm run browserstack:results
pnpm run --filter test-app browserstack:connect
pnpm run --filter test-app test:ember:browserstack --launch=${{ matrix.launcher }}
pnpm run --filter test-app browserstack:disconnect
pnpm run --filter test-app browserstack:results
firefox-test:
name: Browser Tests (Firefox)
Expand All @@ -123,6 +131,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand All @@ -134,4 +144,4 @@ jobs:
firefox-version: ${{ matrix.firefox-version }}
- run: firefox --version
- name: test
run: pnpm run test:ember -- --launch=Firefox
run: pnpm run --filter test-app test:ember --launch=Firefox
4 changes: 3 additions & 1 deletion .github/workflows/percy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ jobs:
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 test:percy
run: pnpm run --workspace-concurrency=1 -r percy
- uses: act10ns/slack@v2
if: failure()
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
registry-url: https://registry.npmjs.org/
cache: pnpm
- run: pnpm install --ignore-scripts
- name: publish
run: pnpm publish --no-git-checks
run: pnpm publish --filter ilios-common --no-git-checks
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
12 changes: 11 additions & 1 deletion .github/workflows/tag_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
with:
token: ${{ secrets.ZORGBORT_TOKEN }}
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand All @@ -26,6 +28,14 @@ jobs:
git config user.name Zorgbort
git config user.email info@iliosproject.org
- name: Increment Version
run: pnpm version ${{ github.event.inputs.releaseType }}
run: pnpm version --filter ilios-common ${{ github.event.inputs.releaseType }}
- run: |
NEW_TAG=`node -p "require('./packages/ilios-common/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 ${{env.new_tag}} -m "Tagging the ${{env.new_tag}} ${{ github.event.inputs.releaseType }} release"
- name: Push Changes
run: git push --follow-tags
2 changes: 2 additions & 0 deletions .github/workflows/update-transitive-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
32 changes: 11 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
# 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

.env

# broccoli-debug
/DEBUG/

#browserstack via ember-cli-browserstack
browserstack-local.pid
local.log
/pnpm-lock.ember-try.yaml
7 changes: 2 additions & 5 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/
**/dist/

# addons
/.node_modules.ember-try/
**/.node_modules.ember-try/
3 changes: 1 addition & 2 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict';

module.exports = {
plugins: ['@ilios/ember-template-lint-plugin'],
extends: 'ilios:recommended',
extends: 'recommended',
rules: {
'simple-unless': false,
'no-implicit-this': {
Expand Down
3 changes: 0 additions & 3 deletions .watchmanconfig

This file was deleted.

Loading

0 comments on commit 3c55b00

Please sign in to comment.