Skip to content

Commit

Permalink
Merge pull request #7593 from jrjohnson/monorepo
Browse files Browse the repository at this point in the history
Migrate frontend into monorepo
  • Loading branch information
stopfstedt authored Feb 2, 2024
2 parents a01e9f6 + b2229ee commit 415c1fd
Show file tree
Hide file tree
Showing 1,190 changed files with 801 additions and 1,093 deletions.
11 changes: 0 additions & 11 deletions .dockerignore

This file was deleted.

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/
14 changes: 7 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ module.exports = {
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./testem.browserstack.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
'./packages/frontend/lib/*/index.js',
'./packages/*/ember-cli-build.js',
'./packages/*/index.js',
'./packages/*/testem.js',
'./packages/frontend/testem.browserstack.js',
'./packages/*/blueprints/*/index.js',
'./packages/*/config/**/*.js',
],
parserOptions: {
sourceType: 'script',
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/asset-size-check.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
strategy:
matrix:
safe-dependency:
- "@ilios/ember-template-lint-plugin"
- "@sentry/ember"
- "browserslist"
- "caniuse-db"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: install dependencies
run: pnpm install
- name: test build
run: pnpm run build
run: pnpm run --filter frontend build

browserstack-test:
name: Browserstack ${{ matrix.launcher }}
Expand Down Expand Up @@ -114,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 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
firefox-test:
name: Browser Tests (Firefox)
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/coverage.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
working-directory: ./packages/frontend
run: node_modules/.bin/ember deploy pr-preview
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
run: pnpm run deploy:production
run: pnpm run --filter frontend deploy:production
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -37,7 +37,7 @@ jobs:
export SENTRY_RELEASE=$(sentry-cli releases propose-version)
sentry-cli releases new $SENTRY_RELEASE
sentry-cli releases set-commits --auto $SENTRY_RELEASE
sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps tmp/deploy-dist/
sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps packages/frontend/tmp/deploy-dist/
sentry-cli releases finalize $SENTRY_RELEASE
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Ember CLI Deploy
run: pnpm run deploy:staging
run: pnpm run --filter frontend deploy:staging
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
10 changes: 3 additions & 7 deletions .github/workflows/percy.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
name: Percy Visual Tests

on:
push:
tags:
- '*'
pull_request_target:
types: [labeled,opened,reopened,synchronize]
schedule:
- cron: "15 23 * * 2,4" # T,Th in the afternoon (UTC)
workflow_dispatch:

concurrency:
group: percy-${{ github.head_ref || github.ref }}
Expand All @@ -28,6 +22,8 @@ jobs:
timeout-minutes: 20
steps:
- uses: actions/checkout@v4
with:
ref: "${{ github.event.pull_request.merge_commit_sha }}"
- uses: pnpm/action-setup@v2
with:
version: 8
Expand All @@ -37,7 +33,7 @@ jobs:
cache: pnpm
- run: pnpm install
- name: Run Percy Tests
run: pnpm run percy:test
run: pnpm run --filter frontend test:percy
- uses: act10ns/slack@v2
if: failure()
with:
Expand Down
15 changes: 10 additions & 5 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
- 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 [email protected]
- name: Increment Version
run: pnpm version ${{ github.event.inputs.releaseType }}
working-directory: ./packages/frontend
run: npx versionup --level ${{ github.event.inputs.releaseType }}
- run: |
NEW_TAG=`node -p "require('./packages/frontend/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
33 changes: 11 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +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

lcov.dat
sauce-example.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/

#browserstack via ember-cli-browserstack
browserstack-local.pid
local.log
/pnpm-lock.ember-try.yaml
Loading

0 comments on commit 415c1fd

Please sign in to comment.