Skip to content

Commit

Permalink
Add Ember updates for host
Browse files Browse the repository at this point in the history
  • Loading branch information
backspace committed Mar 25, 2024
1 parent 380586b commit 3b7d3be
Show file tree
Hide file tree
Showing 11 changed files with 1,537 additions and 212 deletions.
9 changes: 1 addition & 8 deletions packages/boxel-ui/test-app/tests/helpers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,7 @@ import {
// prettier-ignore
} from 'ember-qunit';

interface SetupTestOptions {
/**
* The resolver to use when instantiating container-managed entities in the test.
*/
resolver?: Resolver | undefined;
}

// This file exists to provide wrappers around ember-qunit's / ember-mocha's
// This file exists to provide wrappers around ember-qunit's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

Expand Down
8 changes: 0 additions & 8 deletions packages/host/.ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
6 changes: 0 additions & 6 deletions packages/host/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ public/olm*
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
47 changes: 47 additions & 0 deletions packages/host/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI

on:
push:
branches:
- main
- master
pull_request: {}

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

jobs:
lint:
name: "Lint"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
- name: Install Dependencies
run: npm ci
- name: Lint
run: npm run lint

test:
name: "Test"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
- name: Install Dependencies
run: npm ci
- name: Run Tests
run: npm test
9 changes: 1 addition & 8 deletions packages/host/.gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

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

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions packages/host/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion packages/host/.watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
7 changes: 7 additions & 0 deletions packages/host/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{{page-title "@cardstack/host"}}

{{! The following component displays Ember's default welcome message. }}
<WelcomePage />
{{! Feel free to remove this! }}

{{outlet}}
6 changes: 4 additions & 2 deletions packages/host/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.1",
"version": "5.4.1",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--ci-provider=github"]
"options": [
"--ci-provider=github"
]
}
]
}
Expand Down
41 changes: 21 additions & 20 deletions packages/host/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@babel/core": "^7.24.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/plugin-proposal-decorators": "^7.23.2",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-decorators": "^7.17.12",
"@babel/plugin-syntax-typescript": "^7.17.12",
Expand All @@ -41,7 +41,7 @@
"@cardstack/runtime-common": "workspace:*",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.9.4",
"@ember/test-helpers": "^3.2.0",
"@ember/test-waiters": "^3.0.2",
"@embroider/compat": "^3.2.2",
"@embroider/core": "^3.3.0",
Expand Down Expand Up @@ -78,16 +78,17 @@
"broccoli-plugin": "^4.0.7",
"broccoli-source": "^3.0.1",
"buffer": "^6.0.3",
"concurrently": "^8.0.1",
"concurrently": "^8.2.2",
"crypto-browserify": "^3.12.0",
"date-fns": "^2.28.0",
"ember-async-data": "^1.0.3",
"ember-auto-import": "^2.7.2",
"ember-basic-dropdown": "^8.0.1",
"ember-cli": "~4.12.1",
"ember-cli-app-version": "^6.0.0",
"ember-cli": "~5.4.1",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-cloudfront": "^5.0.0",
Expand All @@ -114,23 +115,23 @@
"ember-modifier": "^4.1.0",
"ember-moment": "^10.0.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.1",
"ember-resources": "^6.3.1",
"ember-route-template": "^1.0.3",
"ember-source": "~4.12.0",
"ember-source": "~5.4.0",
"ember-template-imports": "^3.0.1",
"ember-template-lint": "^5.7.2",
"ember-template-lint": "^5.11.2",
"ember-test-selectors": "^6.0.0",
"ember-velcro": "^2.1.3",
"ember-window-mock": "^0.9.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-qunit": "^7.3.4",
"eslint-plugin-n": "^16.2.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-qunit-dom": "mainmatter/eslint-plugin-qunit-dom#d66c841",
"ethers": "^6.6.2",
"fast-json-stable-stringify": "^2.1.0",
Expand All @@ -150,23 +151,23 @@
"monaco-editor-webpack-plugin": "^7.0.1",
"ms": "^2.1.3",
"path-browserify": "^1.0.1",
"prettier": "^2.8.7",
"prettier": "^3.0.3",
"prettier-plugin-ember-template-tag": "^1.1.0",
"qs": "^6.10.5",
"qunit": "^2.19.4",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"safe-stable-stringify": "^2.4.3",
"start-server-and-test": "^1.14.0",
"stream-browserify": "^3.0.0",
"testem": "3.10.1",
"testem-multi-reporter": "^1.2.0",
"tracked-built-ins": "^3.2.0",
"tracked-built-ins": "^3.3.0",
"typescript": "~5.1.6",
"uuid": "^9.0.1",
"webpack": "^5.89.0"
},
"engines": {
"node": "18"
"node": ">= 18"
},
"volta": {
"extends": "../../package.json"
Expand Down
Loading

0 comments on commit 3b7d3be

Please sign in to comment.