Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade site to Ember v4 #50

Merged
merged 2 commits into from
Jan 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ packages/*/dist/
# 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
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/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
9 changes: 2 additions & 7 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"packages": [
"packages/*"
],
"packages": ["packages/*", "site"],
"version": "1.0.0",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
"bootstrap": {
"npmClientArgs": [
"--frozen-lockfile",
"--non-interactive"
]
"npmClientArgs": ["--frozen-lockfile", "--non-interactive"]
}
}
}
45 changes: 45 additions & 0 deletions site/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
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

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: npm
- name: Install Dependencies
run: npm ci
- name: Lint
run: npm run lint

test:
name: "Test"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: npm
- name: Install Dependencies
run: npm ci
- name: Run Tests
run: npm test
5 changes: 0 additions & 5 deletions site/.template-lintrc.js

This file was deleted.

5 changes: 2 additions & 3 deletions site/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
"packages": [
{
"name": "ember-cli",
"version": "3.26.1",
"version": "4.1.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": []
"isBaseBlueprint": true
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion site/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function (environment) {
modulePrefix: 'site',
environment,
rootURL: '/',
locationType: 'auto',
locationType: 'history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
Expand Down
31 changes: 16 additions & 15 deletions site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@docfy/ember": "^0.4.4",
"@docfy/plugin-with-prose": "^0.4.4",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@ember/test-helpers": "^2.6.0",
"@frontile/core": "^0.12.2",
"@frontile/overlays": "^0.12.2",
"@glimmer/component": "^1.0.4",
Expand All @@ -31,39 +31,40 @@
"autoprefixer": "^10.3.5",
"broccoli-asset-rev": "^3.0.0",
"docfy-theme-ember": "josemarluedke/docfy-theme-ember",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.28.0",
"ember-auto-import": "^2.2.4",
"ember-cli": "~4.1.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-fastboot": "^2.2.3",
"ember-cli-htmlbars": "^5.7.1",
"ember-cli-fastboot": "^3.2.0-beta.5",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-postcss": "^7.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.1",
"ember-fetch": "^8.1.1",
"ember-cli-terser": "^4.0.2",
"ember-focus-trap": "^1.0.0",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^6.2.1",
"ember-qunit": "^5.1.4",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~3.28.1",
"ember-template-lint": "^3.7.0",
"ember-source": "~4.1.0",
"ember-template-lint": "^3.15.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"postcss-import": "^14.0.2",
"postcss-nested": "^5.0.6",
"prember": "^1.0.5",
"prettier": "^2.3.1",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-dom": "^2.0.0",
"rehype-highlight": "^4.1.0",
"remark-autolink-headings": "^6.0.1",
"remark-code-titles": "^0.1.2",
"tailwindcss": "^2.2.15",
"webpack": "^5.53.0"
"webpack": "^5.65.0"
},
"engines": {
"node": "10.* || >= 12"
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
Expand Down
2 changes: 1 addition & 1 deletion site/tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</div>
</div>

<script src="/testem.js" integrity=""></script>
<script src="/testem.js" integrity="" data-embroider-ignore></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/site.js"></script>
Expand Down
Loading