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

Feature/ember upgrade attempt to v5.0.0 #2255

Merged
merged 14 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 1 addition & 8 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
Expand All @@ -23,4 +16,4 @@
/package.json.ember-try

# Jenkins-setup
.cache
.cache
47 changes: 47 additions & 0 deletions .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:
Comment on lines +1 to +14
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ember upgrade added this, do we need/want this? It's showing extra checks on github, failing on something from ember-rdfa-editor

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: 16
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: 16
cache: npm
- name: Install Dependencies
run: npm ci
- name: Run Tests
run: npm test
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# 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

Expand Down
11 changes: 2 additions & 9 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
# 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

/app/utils/cabinet-submission-email.js
/app/utils/cabinet-submission-email.js
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.2",
"version": "5.0.0",
"blueprints": [
{
"name": "app",
Expand Down
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"devDependencies": {
"@appuniversum/appuniversum": "^1.2.0",
"@appuniversum/ember-appuniversum": "3.4.2",
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/eslint-parser": "^7.22.5",
"@babel/plugin-proposal-decorators": "^7.22.5",
"@codemirror/basic-setup": "^0.20.0",
"@codemirror/lang-html": "^0.20.0",
"@codemirror/lang-xml": "^0.20.0",
Expand All @@ -73,11 +73,12 @@
"ember-async-data": "^1.0.3",
"ember-auto-import": "^2.10.0",
"ember-changeset": "^4.1.2",
"ember-cli": "~4.12.3",
"ember-cli": "~5.0.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-autoprefixer": "^2.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-cjs-transform": "^2.0.0",
"ember-cli-clean-css": "^2.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-dependency-lint": "^2.0.1",
"ember-cli-deprecation-workflow": "^3.0.2",
Expand All @@ -92,7 +93,7 @@
"ember-code-snippet": "^3.0.0",
"ember-concurrency": "^2.3.7",
"ember-copy": "^2.0.1",
"ember-data": "~4.11.3",
"ember-data": "~5.0.0",
"ember-element-helper": "^0.8.6",
"ember-fetch": "^8.1.2",
"ember-file-upload": "^8.4.1",
Expand All @@ -113,13 +114,13 @@
"ember-prism": "^0.13.0",
"ember-promise-helpers": "2.0.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^10.0.0",
"ember-resolver": "^10.1.0",
"ember-resources": "^7.0.3",
"ember-router-service-refresh-polyfill": "^1.1.0",
"ember-set-helper": "^3.0.1",
"ember-simple-auth": "^6.0.0",
"ember-sortable": "^5.2.2",
"ember-source": "~4.12.0",
"ember-source": "~5.0.0",
"ember-svg-jar": "^2.6.0",
"ember-tag-input": "3.1.0",
"ember-template-lint": "^5.13.0",
Expand All @@ -128,11 +129,11 @@
"ember-tooltips": "^3.6.0",
"ember-unused-components": "git+https://github.com/MikiDi/ember-unused-components.git#9163900f1975a7ac03994b8af9ef2f7a2f534d4f",
"ember-useragent": "^0.12.0",
"eslint": "^8.37.0",
"eslint": "^8.42.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-ember": "11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-ember": "11.8.0",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"flatpickr": "^4.6.13",
Expand All @@ -142,7 +143,7 @@
"lodash.merge": "^4.6.2",
"marked": "^4.2.12",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.7",
"prettier": "^2.8.8",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"reactiveweb": "^1.3.0",
Expand All @@ -151,13 +152,13 @@
"sanitize-html": "^2.13.1",
"sass": "^1.57.7",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.78.0",
"webpack": "^5.86.0",
"xml-formatter": "^3.6.3"
},
"overrides": {
"babel-plugin-ember-template-compilation": "2.2.1"
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": "16.* || >= 18"
}
}