diff --git a/.changeset/bright-brooms-laugh.md b/.changeset/bright-brooms-laugh.md new file mode 100644 index 000000000..74c88f5d8 --- /dev/null +++ b/.changeset/bright-brooms-laugh.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': patch +--- + +Move to builtin `ember.js` types diff --git a/.changeset/hot-trainers-pull.md b/.changeset/hot-trainers-pull.md new file mode 100644 index 000000000..0f2a39f33 --- /dev/null +++ b/.changeset/hot-trainers-pull.md @@ -0,0 +1,5 @@ +--- +'frontend-gelinkt-notuleren': patch +--- + +Introduce updated `ember-data` types diff --git a/app/app.js b/app/app.js index 76715b4ae..9bb79f5da 100644 --- a/app/app.js +++ b/app/app.js @@ -5,6 +5,10 @@ import config from 'frontend-gelinkt-notuleren/config/environment'; import './config/custom-inflector-rules'; import '@glint/environment-ember-loose'; +/** + * @typedef {import('ember-source/types')} EmberTypes + */ + export default class App extends Application { modulePrefix = config.modulePrefix; podModulePrefix = config.podModulePrefix; diff --git a/package-lock.json b/package-lock.json index a32aeffba..1c3ab7b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,16 @@ "@babel/plugin-proposal-decorators": "^7.24.1", "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.26.2", + "@ember-data-types/adapter": "5.4.0-alpha.131", + "@ember-data-types/graph": "5.4.0-alpha.131", + "@ember-data-types/json-api": "5.4.0-alpha.131", + "@ember-data-types/legacy-compat": "5.4.0-alpha.131", + "@ember-data-types/model": "5.4.0-alpha.131", + "@ember-data-types/request": "5.4.0-alpha.131", + "@ember-data-types/request-utils": "5.4.0-alpha.131", + "@ember-data-types/serializer": "5.4.0-alpha.131", + "@ember-data-types/store": "5.4.0-alpha.131", + "@ember-data-types/tracking": "5.4.0-alpha.131", "@ember-data/store": "^4.12.8", "@ember/optional-features": "^2.1.0", "@ember/render-modifiers": "^2.1.0", @@ -41,6 +51,7 @@ "@nullvoxpopuli/ember-composable-helpers": "^5.2.6", "@release-it-plugins/lerna-changelog": "^6.0.0", "@tsconfig/ember": "^3.0.8", + "@warp-drive-types/core-types": "5.4.0-alpha.131", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", "buffer": "^6.0.3", @@ -71,6 +82,7 @@ "ember-data": "~4.12.0", "ember-data-resources": "^5.0.0", "ember-data-table": "^2.1.0", + "ember-data-types": "5.4.0-alpha.131", "ember-drag-drop": "^1.0.0", "ember-feature-flags": "^6.0.0", "ember-fetch": "^8.1.2", @@ -2469,6 +2481,66 @@ "npm": ">= 6.14.0" } }, + "node_modules/@ember-data-types/adapter": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/adapter/-/adapter-5.4.0-alpha.131.tgz", + "integrity": "sha512-qTPJnhQGrog5F+FDUY3XLJahA5hcLU7d2a94yIeksONYf8VloSyMAX/DKoPb7MgM3RQbwEK2FZf+MTWfm0Bmbw==", + "dev": true + }, + "node_modules/@ember-data-types/graph": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/graph/-/graph-5.4.0-alpha.131.tgz", + "integrity": "sha512-zb22Vu1Ek1mHXu27OBKYS91tAjNmOd021u1yYWAlLvghxR0DJVsZP7zd/aImIOR1xGh4Bl6CwJGr252l/MDxRg==", + "dev": true + }, + "node_modules/@ember-data-types/json-api": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/json-api/-/json-api-5.4.0-alpha.131.tgz", + "integrity": "sha512-DKO5rnCJqSGiD7l8ztAR1ufpC3yNkeoMhLt6Fugw/wOBSGFDSxNEBPw46s/QnnnykTP8ez/UuhjOP9gOtpdR4Q==", + "dev": true + }, + "node_modules/@ember-data-types/legacy-compat": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/legacy-compat/-/legacy-compat-5.4.0-alpha.131.tgz", + "integrity": "sha512-peZXILhY33EuCnkncUpJlo4VELWIPBmpiGqXS2wfscvVOTcyKW/kllVZJK1xWEi98Zxcd5rgMBsDYmBKwIot4Q==", + "dev": true + }, + "node_modules/@ember-data-types/model": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/model/-/model-5.4.0-alpha.131.tgz", + "integrity": "sha512-UoJgpLJoxRHMG5F9zuPKePhado1xSAQ1jCGPam5Jz5YylkNVHzztOOHFusoniwpMlxYaowEuBwv4aRiIdyUZcQ==", + "dev": true + }, + "node_modules/@ember-data-types/request": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/request/-/request-5.4.0-alpha.131.tgz", + "integrity": "sha512-jcgTtxctTpfE9VCtZbhjANAVOcSI8Lrl8EaVPxNqDh3QpCCwHBD0uCQ1DLvc6sqfRooXuLO6/VaGMcLBJ0OL4g==", + "dev": true + }, + "node_modules/@ember-data-types/request-utils": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/request-utils/-/request-utils-5.4.0-alpha.131.tgz", + "integrity": "sha512-s5pfXrxgp6QDiPOGhgl9i97nHzBthdRRtYc3Bo9GFnQyGno8GhTn2lwY1RTkgEAF/9xYv3GxMKx9AVHafLtuzQ==", + "dev": true + }, + "node_modules/@ember-data-types/serializer": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/serializer/-/serializer-5.4.0-alpha.131.tgz", + "integrity": "sha512-s+80hIXHI9zeWDNX69afRz99eOTqloW1m8IT5bh+fbHuIqVDjptSs1MMrG4yV89DHYr6xfFhGvS/6w6WpQAZMw==", + "dev": true + }, + "node_modules/@ember-data-types/store": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/store/-/store-5.4.0-alpha.131.tgz", + "integrity": "sha512-5/4jP1HJAbs8bwTe+3SueEStWehp/Y6Geu89yjHPq/EZ/xHHdG7gEfcWCQstcIpQh4QIXnrd0mAQ5qSliyJngQ==", + "dev": true + }, + "node_modules/@ember-data-types/tracking": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@ember-data-types/tracking/-/tracking-5.4.0-alpha.131.tgz", + "integrity": "sha512-VzeN3oldKjnOa23DFDyR33IcO2zaxX/sdt2OIiLIwuzh5WuyDPbnC9VvXaqt8ToKhcLr+82ue8KyXBXIXLjw5g==", + "dev": true + }, "node_modules/@ember-data/private-build-infra": { "version": "4.12.8", "resolved": "https://registry.npmjs.org/@ember-data/private-build-infra/-/private-build-infra-4.12.8.tgz", @@ -9052,6 +9124,12 @@ "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true }, + "node_modules/@warp-drive-types/core-types": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/@warp-drive-types/core-types/-/core-types-5.4.0-alpha.131.tgz", + "integrity": "sha512-2J8hSvknu24FyvCGBqQ7gtHILwjsTRZigxm9oqAzW62fVb8vGwMqop24Vef2gyuRVCaeZsYvEmyMLJaz0e/sJg==", + "dev": true + }, "node_modules/@webassemblyjs/ast": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", @@ -23370,6 +23448,12 @@ "node": "8.* || >= 10.*" } }, + "node_modules/ember-data-types": { + "version": "5.4.0-alpha.131", + "resolved": "https://registry.npmjs.org/ember-data-types/-/ember-data-types-5.4.0-alpha.131.tgz", + "integrity": "sha512-2myeXVj9n8H/w6JidVUYbMMeCmpW2nuQF3ix6/3fi6ouaowKM+G5ObZnL47vCRUN4yGAOulj4UFqlkB/cvgE1Q==", + "dev": true + }, "node_modules/ember-data/node_modules/@babel/plugin-proposal-private-property-in-object": { "version": "7.21.11", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", diff --git a/package.json b/package.json index d407575f8..98657400b 100644 --- a/package.json +++ b/package.json @@ -32,17 +32,27 @@ "release": "release-it" }, "devDependencies": { - "@babel/core": "^7.25.2", "@appuniversum/ember-appuniversum": "^3.7.0", + "@babel/core": "^7.25.2", "@babel/eslint-parser": "^7.24.1", "@babel/plugin-proposal-decorators": "^7.24.1", "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.26.2", + "@ember-data-types/adapter": "5.4.0-alpha.131", + "@ember-data-types/graph": "5.4.0-alpha.131", + "@ember-data-types/json-api": "5.4.0-alpha.131", + "@ember-data-types/legacy-compat": "5.4.0-alpha.131", + "@ember-data-types/model": "5.4.0-alpha.131", + "@ember-data-types/request": "5.4.0-alpha.131", + "@ember-data-types/request-utils": "5.4.0-alpha.131", + "@ember-data-types/serializer": "5.4.0-alpha.131", + "@ember-data-types/store": "5.4.0-alpha.131", + "@ember-data-types/tracking": "5.4.0-alpha.131", + "@ember-data/store": "^4.12.8", "@ember/optional-features": "^2.1.0", "@ember/render-modifiers": "^2.1.0", "@ember/string": "^3.1.1", "@ember/test-helpers": "^3.3.1", - "@ember-data/store": "^4.12.8", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@glint/core": "^1.5.0", @@ -58,6 +68,7 @@ "@nullvoxpopuli/ember-composable-helpers": "^5.2.6", "@release-it-plugins/lerna-changelog": "^6.0.0", "@tsconfig/ember": "^3.0.8", + "@warp-drive-types/core-types": "5.4.0-alpha.131", "broccoli-asset-rev": "^3.0.0", "broccoli-plugin": "^4.0.7", "buffer": "^6.0.3", @@ -88,6 +99,7 @@ "ember-data": "~4.12.0", "ember-data-resources": "^5.0.0", "ember-data-table": "^2.1.0", + "ember-data-types": "5.4.0-alpha.131", "ember-drag-drop": "^1.0.0", "ember-feature-flags": "^6.0.0", "ember-fetch": "^8.1.2", diff --git a/tsconfig.json b/tsconfig.json index 84c704bbc..e9a3ae83e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,22 @@ "module": "esnext", "experimentalDecorators": true, "allowJs": true, - "checkJs": false + "checkJs": false, + "types": [ + "./node_modules/@ember-data-types/adapter/unstable-preview-types", + "./node_modules/@ember-data-types/graph/unstable-preview-types", + "./node_modules/@ember-data-types/json-api/unstable-preview-types", + "./node_modules/@ember-data-types/legacy-compat/unstable-preview-types", + "./node_modules/@ember-data-types/model/unstable-preview-types", + "./node_modules/@ember-data-types/request-utils/unstable-preview-types", + "./node_modules/@ember-data-types/request/unstable-preview-types", + "./node_modules/@ember-data-types/serializer/unstable-preview-types", + "./node_modules/@ember-data-types/store/unstable-preview-types", + "./node_modules/@ember-data-types/tracking/unstable-preview-types", + "./node_modules/@warp-drive-types/core-types/unstable-preview-types", + "./node_modules/ember-data-types/unstable-preview-types", + "ember-source/types" + ] }, "exclude": ["node_modules", "dist"], "glint": {