Skip to content

Commit

Permalink
Merge pull request #2256 from kanselarij-vlaanderen/feature/ember-upg…
Browse files Browse the repository at this point in the history
…rade-attempt-v5.3

Feature/ember upgrade attempt v5.3
  • Loading branch information
ValenberghsSven authored Nov 28, 2024
2 parents 49abad4 + 4d8b986 commit 25d9ca1
Show file tree
Hide file tree
Showing 12 changed files with 41,970 additions and 21,872 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# compiled output
/dist/
/declarations/

# dependencies
/node_modules/
Expand Down
14 changes: 6 additions & 8 deletions app/initializers/custom-inflector-rules.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import Inflector from 'ember-inflector';
import { irregular } from '@ember-data/request-utils/string'

export function initialize() {
const inflector = Inflector.inflector;

inflector.irregular('person', 'persons');
inflector.irregular('contactPerson', 'contactPersons');
inflector.irregular('contact-person', 'contact-persons');
inflector.irregular('submission-activity', 'submission-activities');
inflector.irregular('minutes', 'minutes');
irregular('person', 'persons');
irregular('contactPerson', 'contactPersons');
irregular('contact-person', 'contact-persons');
irregular('submission-activity', 'submission-activities');
irregular('minutes', 'minutes');
}

export default {
Expand Down
2 changes: 1 addition & 1 deletion app/models/news-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ export default class NewsItem extends ModelWithModifier {
@belongsTo('agenda-item-treatment', { inverse: 'newsItem', async: true })
agendaItemTreatment;

@hasMany('themes', { inverse: null, async: true}) themes;
@hasMany('theme', { inverse: null, async: true}) themes;
}
2 changes: 1 addition & 1 deletion app/services/agenda-service.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Service, { inject as service } from '@ember/service';
import { tracked } from '@glimmer/tracking';
import { singularize } from 'ember-inflector';
import { singularize } from '@ember-data/request-utils/string'
import fetch from 'fetch';
import { isEnabledCabinetSubmissions } from 'frontend-kaleidos/utils/feature-flag';
import CONSTANTS from 'frontend-kaleidos/config/constants';
Expand Down
1 change: 1 addition & 0 deletions app/transforms/boolean.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { BooleanTransform as default } from '@ember-data/serializer/transform'
1 change: 1 addition & 0 deletions app/transforms/number.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { NumberTransform as default } from '@ember-data/serializer/transform';
1 change: 1 addition & 0 deletions app/transforms/string.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { StringTransform as default } from '@ember-data/serializer/transform';
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": "5.0.0",
"version": "5.3.0",
"blueprints": [
{
"name": "app",
Expand Down
3 changes: 3 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ module.exports = function (defaults) {
'ember-test-selectors': {
strip: false
},
emberData: {
polyfillUUID: true,
},
//polyfill for insecure context (like cypress on jenkins) https://github.com/emberjs/data/tree/v5.0.0?tab=readme-ov-file#randomuuid-polyfill
'@embroider/macros': {
setConfig: {
Expand Down
Loading

0 comments on commit 25d9ca1

Please sign in to comment.