Skip to content

[BUMP] Monter Ember.js en version 5 sur Pix App (PIX-12596) #8970

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.

Sign up for GitHub

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

Merged
pix-service-auto-merge merged 2 commits into from
May 21, 2024
Merged

[BUMP] Monter Ember.js en version 5 sur Pix App (PIX-12596) #8970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
852509a
chore: update ember to v5
VincentHardouin May 15, 2024
f445c60
chore: replace ember-api-actions for @1024pix/ember-api-actions
VincentHardouin May 17, 2024
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
2 changes: 1 addition & 1 deletion mon-pix/app/models/account-recovery-demand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class AccountRecoveryDemand extends Model {
@attr('string') ineIna;
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/app/models/email-verification-code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class EmailVerificationCode extends Model {
@attr('string') newEmail;
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/app/models/reset-expired-password-demand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class ResetExpiredPasswordDemand extends Model {
@attr('string') passwordResetToken;
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/app/models/student-information.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class StudentInformation extends Model {
// attributes
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/app/models/user-oidc-authentication-request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class UserOidcAuthenticationRequest extends Model {
@attr('string') email;
Expand Down
2 changes: 1 addition & 1 deletion mon-pix/app/pods/passage/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memberAction } from '@1024pix/ember-api-actions';
import Model, { attr, hasMany } from '@ember-data/model';
import { memberAction } from 'ember-api-actions';

export default class Passage extends Model {
@attr('string') moduleId;
Expand Down
34,237 changes: 14,885 additions & 19,352 deletions mon-pix/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions mon-pix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,16 @@
"test:watch": "ember exam --serve --reporter dot"
},
"devDependencies": {
"@1024pix/ember-api-actions": "^1.1.0",

@xav-car xav-car May 21, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

question :
A noter pour plus tard si "non". Est ce que l'on a une volonté de rester sur des ember-api-actions ? ou tout devrait "a terme" être dans les adapter ?

il me semblait qu'on a un moment on était parti pour les supprimer.

@VincentHardouin VincentHardouin May 21, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

J'ai pas d'avis et j'ai pas voulu trancher dans cette PR d'où le fork au lieu de les supprimer, mais oui la question se pose. C'est en effet facilement réalisable avec des adapters ou même des handlers pour aller vers la nouvelle façon de faire.

@xav-car xav-car May 21, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

oui oui, la question c'est pas de le faire now. le fork a du être moins couteux que de tout réecrire 😅 . on a assez d'une migration en V5 😆

"@1024pix/ember-matomo-tag-manager": "^2.4.3",
"@1024pix/ember-testing-library": "^1.1.0",
"@1024pix/eslint-config": "^1.2.12",
"@1024pix/pix-ui": "^46.2.0",
"@1024pix/stylelint-config": "^5.1.14",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-proposal-decorators": "^7.20.2",
"@ember-data/model": "^4.12.5",
"@ember-data/json-api": "^5.3.1",
"@ember-data/model": "^5.3.1",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/test-helpers": "^3.0.0",
Expand All @@ -72,9 +74,8 @@
"buffer": "^6.0.3",
"dayjs": "^1.11.6",
"dotenv": "^16.0.3",
"ember-api-actions": "^0.2.9",
"ember-auto-import": "^2.4.3",
"ember-cli": "^5.0.0",
"ember-cli": "^5.8.1",
"ember-cli-app-version": "^6.0.0",
"ember-cli-autoprefixer": "^2.0.0",
"ember-cli-babel": "^8.0.0",
Expand All @@ -84,11 +85,11 @@
"ember-cli-head": "^2.0.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-mirage": "^3.0.0",
"ember-cli-mirage": "^3.0.3",
"ember-cli-sass": "^11.0.1",
"ember-component-css": "^0.8.1",
"ember-cookies": "^1.0.0",
"ember-data": "^4.12.5",
"ember-data": "^5.3.1",
"ember-dayjs": "^0.12.0",
"ember-exam": "^9.0.0",
"ember-fetch": "^8.1.2",
Expand All @@ -102,7 +103,7 @@
"ember-resolver": "^11.0.0",
"ember-responsive": "^5.0.0",
"ember-simple-auth": "^6.0.0",
"ember-source": "~4.12.0",
"ember-source": "^5.8.0",
"ember-template-lint": "^5.0.0",
"ember-template-lint-plugin-prettier": "^5.0.0",
"ember-test-selectors": "^6.0.0",
Expand Down Expand Up @@ -132,5 +133,10 @@
"stylelint-order": "^6.0.0",
"webpack": "^5.76.0",
"xss": "^1.0.13"
},
"overrides": {
"ember-dayjs": {
"ember-source": "^5.8.0"
}
}
}
3 changes: 2 additions & 1 deletion mon-pix/tests/unit/routes/assessments/checkpoint_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ module('Unit | Route | Assessments | Checkpoint', function (hooks) {
test('should force the progression reload when assessment is for campaign', async function (assert) {
// given
const route = this.owner.lookup('route:assessments/checkpoint');
route.store.queryRecord = sinon.stub();
const store = this.owner.lookup('service:store');
store.queryRecord = sinon.stub();
const reloadStub = sinon.stub();
const assessment = {
isForCampaign: true,
Expand Down