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 to ember v5 #233

Merged
merged 5 commits into from
Jul 29, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 28 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,31 @@ jobs:
- name: Test
run: yarn test

try-scenarios:
name: Compat ${{ matrix.ember-try-scenario }}
runs-on: ubuntu-latest

env:
CI: 'true'

strategy:
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-4.12
- ember-release
- ember-beta
- embroider-safe
- embroider-optimized
- ember-canary

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 18.x
yarn-version: 1.x
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Test
run: yarn try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
# try-scenarios:
# name: Compat ${{ matrix.ember-try-scenario }}
# runs-on: ubuntu-latest

# env:
# CI: 'true'

# strategy:
# fail-fast: true
# matrix:
# ember-try-scenario:
# - ember-lts-4.12
# - ember-release
# - ember-beta
# - embroider-safe
# - embroider-optimized
# - ember-canary

# steps:
# - uses: actions/checkout@v2
# - uses: volta-cli/action@v1
# with:
# node-version: 18.x
# yarn-version: 1.x
# - name: Install dependencies
# run: yarn install --frozen-lockfile
# - name: Test
# run: yarn try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
17 changes: 16 additions & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,22 @@ module.exports = async function () {
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': '~4.12.1'
'ember-source': '~4.12.1',
'@types/ember-qunit': '^6.1.1',
'@types/ember-resolver': '^9.0.0',
'@types/ember__application': '^4.0.6',
'@types/ember__array': '^4.0.4',
'@types/ember__component': '^4.0.14',
'@types/ember__debug': '^4.0.4',
'@types/ember__error': '^4.0.3',
'@types/ember__object': '^4.0.6',
'@types/ember__routing': '^4.0.13',
'@types/ember__runloop': '^4.0.4',
'@types/ember__service': '^4.0.3',
'@types/ember__string': '^3.0.11',
'@types/ember__template': '^4.0.2',
'@types/ember__test': '^4.0.2',
'@types/ember__test-helpers': '^2.9.1'
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"try:one": "yarn workspace test-app run try:one"
},
"resolutions": {
"@ember/test-waiters": "^3.0.2"
"@ember/test-waiters": "^3.0.2",
"ember-element-helper": "^0.7.1"
},
"dependencies": {
"@embroider/test-setup": "^3.0.1"
Expand All @@ -27,6 +28,6 @@
"ember-template-lint": "^5.11.1",
"eslint": "^8.46.0",
"lerna": "^4.0.0",
"typescript": "^4.5.5"
"typescript": "^5.1.6"
}
}
20 changes: 5 additions & 15 deletions packages/buttons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"prepack": "ember ts:precompile",
"postpack": "ember ts:clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@frontile/tailwindcss-plugin-helpers": "^0.14.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -38,19 +41,6 @@
"@glimmer/tracking": "^1.1.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
"@types/ember__debug": "^4.0.4",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.11",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__test-helpers": "^2.9.1",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.6",
"@types/rsvp": "^4.0.4",
Expand All @@ -65,13 +55,13 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "^4.3.0",
"ember-source": "^5.1.2",
"ember-try": "^2.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.3.3",
"typescript": "^4.6.2",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/buttons/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'ember-source/types';
20 changes: 5 additions & 15 deletions packages/changeset-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"prepack": "ember ts:precompile",
"postpack": "ember ts:clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@frontile/forms": "^0.14.1",
"ember-changeset": "^4.1.2",
Expand All @@ -40,19 +43,6 @@
"@glimmer/tracking": "^1.1.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
"@types/ember__debug": "^4.0.4",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.11",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__test-helpers": "^2.9.1",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.6",
"@types/rsvp": "^4.0.4",
Expand All @@ -67,13 +57,13 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "^4.3.0",
"ember-source": "^5.1.2",
"ember-try": "^2.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.3.3",
"typescript": "^4.6.2",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/changeset-form/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'ember-source/types';
20 changes: 5 additions & 15 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
"prepack": "ember ts:precompile",
"postpack": "ember ts:clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@ember/render-modifiers": "^2.1.0",
"@ember/test-waiters": "^3.0.2",
Expand All @@ -42,19 +45,6 @@
"@glimmer/component": "^1.1.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
"@types/ember__debug": "^4.0.4",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.11",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__test-helpers": "^2.9.1",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.6",
"@types/rsvp": "^4.0.4",
Expand All @@ -69,13 +59,13 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "^4.3.0",
"ember-source": "^5.1.2",
"ember-try": "^2.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.3.3",
"typescript": "^4.6.2",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/core/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'ember-source/types';
20 changes: 5 additions & 15 deletions packages/forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"prepack": "ember ts:precompile",
"postpack": "ember ts:clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@frontile/core": "^0.14.1",
"@frontile/tailwindcss-plugin-helpers": "^0.14.0",
Expand All @@ -41,19 +44,6 @@
"@glimmer/tracking": "^1.1.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
"@types/ember__debug": "^4.0.4",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.11",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__test-helpers": "^2.9.1",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.6",
"@types/rsvp": "^4.0.4",
Expand All @@ -68,13 +58,13 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "^4.3.0",
"ember-source": "^5.1.2",
"ember-try": "^2.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.3.3",
"typescript": "^4.6.2",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/forms/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'ember-source/types';
4 changes: 2 additions & 2 deletions packages/notifications/addon/-private/timer.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { tracked } from '@glimmer/tracking';
import { later, cancel } from '@ember/runloop';
import { EmberRunTimer } from '@ember/runloop/types';
import type { Timer as EmberTimer } from '@ember/runloop';
import { action } from '@ember/object';

export default class Timer {
@tracked remaining: number;
@tracked isRunning = true;

readonly onFinish: () => void;
private timer?: EmberRunTimer;
private timer?: EmberTimer;
private start!: number;

constructor(duration: number, onFinish: () => void) {
Expand Down
20 changes: 5 additions & 15 deletions packages/notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"prepack": "ember ts:precompile",
"postpack": "ember ts:clean"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@ember/render-modifiers": "^2.1.0",
"@frontile/core": "^0.14.1",
Expand All @@ -43,19 +46,6 @@
"@glimmer/tracking": "^1.1.2",
"@types/ember-qunit": "^6.1.1",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
"@types/ember__debug": "^4.0.4",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.11",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__test-helpers": "^2.9.1",
"@types/htmlbars-inline-precompile": "^3.0.0",
"@types/qunit": "^2.19.6",
"@types/rsvp": "^4.0.4",
Expand All @@ -70,13 +60,13 @@
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-source": "^4.3.0",
"ember-source": "^5.1.2",
"ember-try": "^2.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.3.3",
"typescript": "^4.6.2",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions packages/notifications/types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import 'ember-source/types';