From 6198a8adaa86a978b30f05d49c3a5e511aae1bb7 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 15 Dec 2023 13:52:56 +0000 Subject: [PATCH 1/3] update vite and ember-data --- pnpm-lock.yaml | 720 +++++++++++------- tests/vite-app/app/adapters/post.js | 6 +- tests/vite-app/package.json | 4 +- tests/vite-app/public/posts/{1 => 1.json} | 0 .../{vite.config.mts => vite.config.mjs} | 3 +- 5 files changed, 447 insertions(+), 286 deletions(-) rename tests/vite-app/public/posts/{1 => 1.json} (100%) rename tests/vite-app/{vite.config.mts => vite.config.mjs} (97%) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87fba2ff4..30ef90d0f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1974,8 +1974,8 @@ importers: specifier: ^4.0.2 version: 4.0.2 ember-data: - specifier: ~5.1.0 - version: 5.1.2(@babel/core@7.23.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) + specifier: ~5.3.0 + version: 5.3.0(@babel/core@7.23.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) ember-load-initializers: specifier: ^2.1.2 version: 2.1.2(@babel/core@7.23.5) @@ -2046,8 +2046,8 @@ importers: specifier: ^5.1.6 version: 5.2.2 vite: - specifier: ^4.3.9 - version: 4.5.1(terser@5.25.0) + specifier: ^5.0.9 + version: 5.0.9 types/broccoli: {} @@ -3483,26 +3483,6 @@ packages: - webpack dev: true - /@ember-data/adapter@5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2): - resolution: {integrity: sha512-wE1K7lddbGkD6/zsNXhR9YT+UFz+LhjCrSQUo3E+W/nprkCQ0QB390ARam6M73gM/k96JwLmizjysICStmszYA==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 5.1.2 - '@ember/string': ^3.1.1 - ember-inflector: ^4.0.2 - dependencies: - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - ember-cli-test-info: 1.0.0 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/adapter@5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2): resolution: {integrity: sha512-OKbqtuOn6ZHFvU36P8876TsWtr6BKx1eOAzftnRtS8kD8r9rxdXapCA7M2V3l+Fma4d+MMwm8flLrqMddP5rmA==} engines: {node: 16.* || >= 18.*} @@ -3512,7 +3492,7 @@ packages: ember-inflector: ^4.0.2 dependencies: '@ember-data/private-build-infra': 5.3.0 - '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) ember-cli-babel: 8.2.0(@babel/core@7.23.5) @@ -3572,30 +3552,6 @@ packages: - webpack dev: true - /@ember-data/debug@5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1): - resolution: {integrity: sha512-HyppS+Eze1YemnonXeAkdi40Qxd85kUhjUCdV20Gvu99dWBiSNlNLNkLFEM5hRqDxw5Pdpjtxv35eePXVhQ9+g==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 5.1.2 - '@ember/string': ^3.1.1 - dependencies: - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember/edition-utils': 1.2.0 - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-auto-import: 2.6.1(webpack@5.89.0) - ember-cli-babel: 7.26.11 - webpack: 5.89.0 - transitivePeerDependencies: - - '@glint/template' - - '@swc/core' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - /@ember-data/debug@5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1): resolution: {integrity: sha512-R5Jo4N7TSlMj4HdP+kGGVM7vtxxmIm1y+RaqKiRFmh3kzf8lL5FYF6vE0Hjkfu+p9KGnGSuTm731kPxYMZnbzQ==} engines: {node: 16.* || >= 18.*} @@ -3605,7 +3561,7 @@ packages: dependencies: '@babel/core': 7.23.5(supports-color@8.1.1) '@ember-data/private-build-infra': 5.3.0 - '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) @@ -3637,22 +3593,6 @@ packages: - supports-color dev: true - /@ember-data/graph@5.1.2(@ember-data/store@5.1.2): - resolution: {integrity: sha512-HnDSjN/pPGBrSkM+2ZqpU+jkjorz/QppXCHn59eJ6xsdwTAx9e5MmKE6gU8o3d8QDc0hJOXeQGVqVMR4V+eTmg==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 5.1.2 - dependencies: - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/graph@5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0): resolution: {integrity: sha512-BK1PGJVpW/ioP9IrvPECvbeiMf8cX0o4Ym3PWRlXIgWbfTnN57/XHwqL6qRo46Li2tMyzoranE6q7Jxhu6DCIg==} engines: {node: 16.* || >= 18.*} @@ -3660,7 +3600,7 @@ packages: '@ember-data/store': 5.3.0 dependencies: '@ember-data/private-build-infra': 5.3.0 - '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.13.3(@glint/template@1.2.1) ember-cli-babel: 8.2.0(@babel/core@7.23.5) @@ -3688,24 +3628,6 @@ packages: - supports-color dev: true - /@ember-data/json-api@5.1.2(@ember-data/graph@5.1.2)(@ember-data/store@5.1.2): - resolution: {integrity: sha512-n1y4SYLToKxAtUbz7sU/M8s9XdRIFKkIhVZBerDpZYXRmcnjs0DHeP334n7/rQV+xn8XwGKhbwK3ST1TBBB89A==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/graph': 5.1.2 - '@ember-data/store': 5.1.2 - dependencies: - '@ember-data/graph': 5.1.2(@ember-data/store@5.1.2) - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/json-api@5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2): resolution: {integrity: sha512-irS0uuotz5VJbmaGEoK7Ad8JjlVzCI2C+lxz22UelR64Vbb1btnBHlw2Tr2n9s0kNxaR1iHUB94Fo2LBbr0Prg==} engines: {node: 16.* || >= 18.*} @@ -3718,7 +3640,7 @@ packages: '@ember-data/graph': 5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0) '@ember-data/private-build-infra': 5.3.0 '@ember-data/request-utils': 5.3.0(@babel/core@7.23.5) - '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) '@ember/edition-utils': 1.2.0 '@embroider/macros': 1.13.3(@glint/template@1.2.1) ember-cli-babel: 8.2.0(@babel/core@7.23.5) @@ -3751,28 +3673,6 @@ packages: - supports-color dev: true - /@ember-data/legacy-compat@5.1.2(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2): - resolution: {integrity: sha512-uo9nCwtqc70oIWE8rsa8e+zcGAmFven8SjC08zw8CDXUCpJXcib0qm1Wg+jcQasOhdN682ZoUJ3MLQ3Qkzubjw==} - engines: {node: 16.* || >= 18} - peerDependencies: - '@ember-data/graph': 5.1.2 - '@ember-data/json-api': 5.1.2 - peerDependenciesMeta: - '@ember-data/graph': - optional: true - '@ember-data/json-api': - optional: true - dependencies: - '@ember-data/graph': 5.1.2(@ember-data/store@5.1.2) - '@ember-data/json-api': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/store@5.1.2) - '@ember-data/private-build-infra': 5.1.2 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/legacy-compat@5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0): resolution: {integrity: sha512-KST6bMqvr6+DLTY5XRLOyCBgOGIj6QCpZQtyOWOhPwKnfeBXygppF9ys0ZWaNhlAaVZSrQ3uPubUit9Y72ZTYQ==} engines: {node: 16.* || >= 18} @@ -3865,16 +3765,16 @@ packages: - webpack dev: true - /@ember-data/model@5.1.2(@babel/core@7.23.5)(@ember-data/debug@5.1.2)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/store@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2): - resolution: {integrity: sha512-YKhmRUdNhiD0PAo7i0Zb9KNl13hgSjY2HQjsjFdSxF1Pc0UyhrQitzMG0SnH/W4MhacmjP5DsIUOQ2lyxeXdmQ==} + /@ember-data/model@5.3.0(@babel/core@7.23.5)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@3.28.12): + resolution: {integrity: sha512-9DckZXu3DZk1fYd1js6kS2SCxuuaQBDE1N3NMc+Zz55n8qu1LKHLxr+dGwVqV+Wtl7LGcAU1ocnm7gKNhC1vuw==} engines: {node: 16.* || >= 18.*} peerDependencies: - '@ember-data/debug': 5.1.2 - '@ember-data/graph': 5.1.2 - '@ember-data/json-api': 5.1.2 - '@ember-data/legacy-compat': 5.1.2 - '@ember-data/store': 5.1.2 - '@ember-data/tracking': 5.1.2 + '@ember-data/debug': 5.3.0 + '@ember-data/graph': 5.3.0 + '@ember-data/json-api': 5.3.0 + '@ember-data/legacy-compat': 5.3.0 + '@ember-data/store': 5.3.0 + '@ember-data/tracking': 5.3.0 '@ember/string': ^3.1.1 ember-inflector: ^4.0.2 peerDependenciesMeta: @@ -3885,18 +3785,18 @@ packages: '@ember-data/json-api': optional: true dependencies: - '@ember-data/debug': 5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1) - '@ember-data/graph': 5.1.2(@ember-data/store@5.1.2) - '@ember-data/json-api': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/store@5.1.2) - '@ember-data/legacy-compat': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2) - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember-data/tracking': 5.1.2 + '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1) + '@ember-data/graph': 5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0) + '@ember-data/json-api': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2) + '@ember-data/legacy-compat': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0) + '@ember-data/private-build-infra': 5.3.0 + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/tracking': 5.3.0(@babel/core@7.23.5) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.5)(ember-source@5.1.2) - ember-cli-babel: 7.26.11 + ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.5)(ember-source@3.28.12) + ember-cli-babel: 8.2.0(@babel/core@7.23.5) ember-cli-string-utils: 1.1.0 ember-cli-test-info: 1.0.0 ember-inflector: 4.0.2 @@ -3908,7 +3808,7 @@ packages: - supports-color dev: true - /@ember-data/model@5.3.0(@babel/core@7.23.5)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@3.28.12): + /@ember-data/model@5.3.0(@babel/core@7.23.5)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2): resolution: {integrity: sha512-9DckZXu3DZk1fYd1js6kS2SCxuuaQBDE1N3NMc+Zz55n8qu1LKHLxr+dGwVqV+Wtl7LGcAU1ocnm7gKNhC1vuw==} engines: {node: 16.* || >= 18.*} peerDependencies: @@ -3933,12 +3833,12 @@ packages: '@ember-data/json-api': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2) '@ember-data/legacy-compat': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0) '@ember-data/private-build-infra': 5.3.0 - '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) '@ember-data/tracking': 5.3.0(@babel/core@7.23.5) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.5)(ember-source@3.28.12) + ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.5)(ember-source@5.1.2) ember-cli-babel: 8.2.0(@babel/core@7.23.5) ember-cli-string-utils: 1.1.0 ember-cli-test-info: 1.0.0 @@ -4020,39 +3920,6 @@ packages: - supports-color dev: true - /@ember-data/private-build-infra@5.1.2: - resolution: {integrity: sha512-cKFiJuiH7ldcyOey8IfVHEJ4ug/UYEJH8ASSuRMdr0rzDiJKQrQx1YG9Wmy6mSDQnCrdcPpHPGiTNLhI/sJQKw==} - engines: {node: 16.* || >= 18.*} - dependencies: - '@babel/core': 7.23.5(supports-color@8.1.1) - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.5) - '@babel/runtime': 7.23.5 - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - babel-import-util: 1.4.1 - babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.5) - babel-plugin-filter-imports: 4.0.0 - babel6-plugin-strip-class-callcheck: 6.0.0 - broccoli-debug: 0.6.5 - broccoli-file-creator: 2.1.1 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-rollup: 5.0.0 - calculate-cache-key-for-tree: 2.0.0 - chalk: 4.1.2 - ember-cli-babel: 7.26.11 - ember-cli-path-utils: 1.0.0 - ember-cli-string-utils: 1.1.0 - ember-cli-version-checker: 5.1.2 - git-repo-info: 2.1.1 - npm-git-info: 1.0.3 - semver: 7.5.4 - silent-error: 1.1.1 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/private-build-infra@5.3.0: resolution: {integrity: sha512-n7VCPgvjS0Yza5USBucdYjTvlk5GC6fIdWiQUGdK9QxHnyekFg2Znu932ulKp/Iokoc8iBEaVX3HoiCwM/Hw1w==} engines: {node: 16.* || >= 18.*} @@ -4126,19 +3993,6 @@ packages: - supports-color dev: true - /@ember-data/request@5.1.2: - resolution: {integrity: sha512-hlcwqNc1sSP6Afib3YL/yg0tvbZQHJBSwcpB8wy7NG+fkHYRiU5wMs1Qksk2Ajsln9pp+kY7ckPfckKiHK+vDQ==} - engines: {node: 16.* || >= 18} - dependencies: - '@ember-data/private-build-infra': 5.1.2 - '@ember/test-waiters': 3.1.0 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/request@5.3.0(@babel/core@7.23.5): resolution: {integrity: sha512-dsgwnhXYMlgO99DPur2AYQpFigU8DSk628GZ9qDhQQ9IRfGkT3yjFGg9M/Bp0G+U3dJbs56Tiy+VhSl36k0Wsw==} engines: {node: 16.* || >= 18} @@ -4193,26 +4047,6 @@ packages: - webpack dev: true - /@ember-data/serializer@5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2): - resolution: {integrity: sha512-Lkfy7VRSse7A8w1+Im1NbhO6JslIiYw9OHZwz2weefrjLUL3GD2VF49T39Pk9TCQPhZiGckovICeDdegEmCvBQ==} - engines: {node: 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': 5.1.2 - '@ember/string': ^3.1.1 - ember-inflector: ^4.0.2 - dependencies: - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember/string': 3.1.1 - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - ember-cli-babel: 7.26.11 - ember-cli-test-info: 1.0.0 - ember-inflector: 4.0.2 - transitivePeerDependencies: - - '@glint/template' - - supports-color - dev: true - /@ember-data/serializer@5.3.0(@babel/core@7.23.5)(@ember/string@3.1.1)(ember-inflector@4.0.2): resolution: {integrity: sha512-apsfN8qHOVQxIxmPQh6SSxYtzNcb3/jvdjJDrU6L8eklyQXfxcbaBD6r2uUAA2jaI94oNXoSHM/75TZnJjLIZA==} engines: {node: 16.* || >= 18.*} @@ -4290,38 +4124,21 @@ packages: - webpack dev: true - /@ember-data/store@5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2): - resolution: {integrity: sha512-A/e0hmuGJ2iZpKN+HnGj1+VJ1j2Gq/mFgrBzYOs2ep3ObfhtlTZLlxbWMUkRlV9xpB0mB5J5km/XHjrAcgYMYw==} + /@ember-data/store@5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2): + resolution: {integrity: sha512-okM7AJmgM8Wz+FNgsDXVUVw32UZVLKko2K/2GfBmOjOcKVnfwLKI08HmQNLnT5IXiOsJW5mA4mRESuVgN8L4lQ==} engines: {node: 16.* || >= 18.*} peerDependencies: - '@ember-data/graph': 5.1.2 - '@ember-data/json-api': 5.1.2 - '@ember-data/legacy-compat': 5.1.2 - '@ember-data/model': 5.1.2 - '@ember-data/tracking': 5.1.2 + '@ember-data/tracking': 5.3.0 '@ember/string': ^3.1.1 '@glimmer/tracking': ^1.1.2 - peerDependenciesMeta: - '@ember-data/graph': - optional: true - '@ember-data/json-api': - optional: true - '@ember-data/legacy-compat': - optional: true - '@ember-data/model': - optional: true dependencies: - '@ember-data/graph': 5.1.2(@ember-data/store@5.1.2) - '@ember-data/json-api': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/store@5.1.2) - '@ember-data/legacy-compat': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2) - '@ember-data/model': 5.1.2(@babel/core@7.23.5)(@ember-data/debug@5.1.2)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/store@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2) - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/tracking': 5.1.2 + '@ember-data/private-build-infra': 5.3.0 + '@ember-data/tracking': 5.3.0(@babel/core@7.23.5) '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) '@glimmer/tracking': 1.1.2 ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.23.5)(ember-source@5.1.2) - ember-cli-babel: 7.26.11 + ember-cli-babel: 8.2.0(@babel/core@7.23.5) transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -4362,15 +4179,6 @@ packages: - supports-color dev: true - /@ember-data/tracking@5.1.2: - resolution: {integrity: sha512-t7bpVBF745HWFMDK2UNhpWdN+NxoRlxgMWDvGjZsnrvSnCzNMoERFEF6p2luvnVlyCyJDf+SRRRyvf/vkMnNrg==} - engines: {node: 16.* || >= 18} - dependencies: - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - supports-color - dev: true - /@ember-data/tracking@5.3.0(@babel/core@7.23.5): resolution: {integrity: sha512-CEaV9zbKY40I0c7a7AXIhV4P+veA70plWCGU2fA/AMk69BdT64vKx9r+HPvAVsaz7ER4XCnUqyPAZnCWypa9WA==} engines: {node: 16.* || >= 18} @@ -4761,6 +4569,15 @@ packages: dev: true optional: true + /@esbuild/android-arm64@0.19.9: + resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm@0.17.19: resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} engines: {node: '>=12'} @@ -4779,6 +4596,15 @@ packages: dev: true optional: true + /@esbuild/android-arm@0.19.9: + resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-x64@0.17.19: resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} engines: {node: '>=12'} @@ -4797,6 +4623,15 @@ packages: dev: true optional: true + /@esbuild/android-x64@0.19.9: + resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-arm64@0.17.19: resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} engines: {node: '>=12'} @@ -4815,6 +4650,15 @@ packages: dev: true optional: true + /@esbuild/darwin-arm64@0.19.9: + resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-x64@0.17.19: resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} engines: {node: '>=12'} @@ -4833,6 +4677,15 @@ packages: dev: true optional: true + /@esbuild/darwin-x64@0.19.9: + resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-arm64@0.17.19: resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} engines: {node: '>=12'} @@ -4851,6 +4704,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-arm64@0.19.9: + resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-x64@0.17.19: resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} engines: {node: '>=12'} @@ -4869,6 +4731,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-x64@0.19.9: + resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm64@0.17.19: resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} engines: {node: '>=12'} @@ -4887,6 +4758,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm64@0.19.9: + resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm@0.17.19: resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} engines: {node: '>=12'} @@ -4905,6 +4785,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm@0.19.9: + resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ia32@0.17.19: resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} engines: {node: '>=12'} @@ -4923,6 +4812,15 @@ packages: dev: true optional: true + /@esbuild/linux-ia32@0.19.9: + resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64@0.17.19: resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} engines: {node: '>=12'} @@ -4941,6 +4839,15 @@ packages: dev: true optional: true + /@esbuild/linux-loong64@0.19.9: + resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-mips64el@0.17.19: resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} engines: {node: '>=12'} @@ -4959,6 +4866,15 @@ packages: dev: true optional: true + /@esbuild/linux-mips64el@0.19.9: + resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ppc64@0.17.19: resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} engines: {node: '>=12'} @@ -4977,6 +4893,15 @@ packages: dev: true optional: true + /@esbuild/linux-ppc64@0.19.9: + resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-riscv64@0.17.19: resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} engines: {node: '>=12'} @@ -4995,6 +4920,15 @@ packages: dev: true optional: true + /@esbuild/linux-riscv64@0.19.9: + resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-s390x@0.17.19: resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} engines: {node: '>=12'} @@ -5013,6 +4947,15 @@ packages: dev: true optional: true + /@esbuild/linux-s390x@0.19.9: + resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-x64@0.17.19: resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} engines: {node: '>=12'} @@ -5031,6 +4974,15 @@ packages: dev: true optional: true + /@esbuild/linux-x64@0.19.9: + resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/netbsd-x64@0.17.19: resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} engines: {node: '>=12'} @@ -5049,6 +5001,15 @@ packages: dev: true optional: true + /@esbuild/netbsd-x64@0.19.9: + resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/openbsd-x64@0.17.19: resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} engines: {node: '>=12'} @@ -5067,6 +5028,15 @@ packages: dev: true optional: true + /@esbuild/openbsd-x64@0.19.9: + resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/sunos-x64@0.17.19: resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} engines: {node: '>=12'} @@ -5085,6 +5055,15 @@ packages: dev: true optional: true + /@esbuild/sunos-x64@0.19.9: + resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-arm64@0.17.19: resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} engines: {node: '>=12'} @@ -5103,6 +5082,15 @@ packages: dev: true optional: true + /@esbuild/win32-arm64@0.19.9: + resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-ia32@0.17.19: resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} engines: {node: '>=12'} @@ -5121,6 +5109,15 @@ packages: dev: true optional: true + /@esbuild/win32-ia32@0.19.9: + resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-x64@0.17.19: resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} engines: {node: '>=12'} @@ -5139,6 +5136,15 @@ packages: dev: true optional: true + /@esbuild/win32-x64@0.19.9: + resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@eslint-community/eslint-utils@4.4.0(eslint@7.32.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -6328,6 +6334,110 @@ packages: rollup: 3.29.4 dev: true + /@rollup/rollup-android-arm-eabi@4.9.0: + resolution: {integrity: sha512-+1ge/xmaJpm1KVBuIH38Z94zj9fBD+hp+/5WLaHgyY8XLq1ibxk/zj6dTXaqM2cAbYKq8jYlhHd6k05If1W5xA==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-android-arm64@4.9.0: + resolution: {integrity: sha512-im6hUEyQ7ZfoZdNvtwgEJvBWZYauC9KVKq1w58LG2Zfz6zMd8gRrbN+xCVoqA2hv/v6fm9lp5LFGJ3za8EQH3A==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-arm64@4.9.0: + resolution: {integrity: sha512-u7aTMskN6Dmg1lCT0QJ+tINRt+ntUrvVkhbPfFz4bCwRZvjItx2nJtwJnJRlKMMaQCHRjrNqHRDYvE4mBm3DlQ==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-x64@4.9.0: + resolution: {integrity: sha512-8FvEl3w2ExmpcOmX5RJD0yqXcVSOqAJJUJ29Lca29Ik+3zPS1yFimr2fr5JSZ4Z5gt8/d7WqycpgkX9nocijSw==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.9.0: + resolution: {integrity: sha512-lHoKYaRwd4gge+IpqJHCY+8Vc3hhdJfU6ukFnnrJasEBUvVlydP8PuwndbWfGkdgSvZhHfSEw6urrlBj0TSSfg==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.9.0: + resolution: {integrity: sha512-JbEPfhndYeWHfOSeh4DOFvNXrj7ls9S/2omijVsao+LBPTPayT1uKcK3dHW3MwDJ7KO11t9m2cVTqXnTKpeaiw==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-musl@4.9.0: + resolution: {integrity: sha512-ahqcSXLlcV2XUBM3/f/C6cRoh7NxYA/W7Yzuv4bDU1YscTFw7ay4LmD7l6OS8EMhTNvcrWGkEettL1Bhjf+B+w==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.9.0: + resolution: {integrity: sha512-uwvOYNtLw8gVtrExKhdFsYHA/kotURUmZYlinH2VcQxNCQJeJXnkmWgw2hI9Xgzhgu7J9QvWiq9TtTVwWMDa+w==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.9.0: + resolution: {integrity: sha512-m6pkSwcZZD2LCFHZX/zW2aLIISyzWLU3hrLLzQKMI12+OLEzgruTovAxY5sCZJkipklaZqPy/2bEEBNjp+Y7xg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.9.0: + resolution: {integrity: sha512-VFAC1RDRSbU3iOF98X42KaVicAfKf0m0OvIu8dbnqhTe26Kh6Ym9JrDulz7Hbk7/9zGc41JkV02g+p3BivOdAg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.9.0: + resolution: {integrity: sha512-9jPgMvTKXARz4inw6jezMLA2ihDBvgIU9Ml01hjdVpOcMKyxFBJrn83KVQINnbeqDv0+HdO1c09hgZ8N0s820Q==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-ia32-msvc@4.9.0: + resolution: {integrity: sha512-WE4pT2kTXQN2bAv40Uog0AsV7/s9nT9HBWXAou8+++MBCnY51QS02KYtm6dQxxosKi1VIz/wZIrTQO5UP2EW+Q==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.9.0: + resolution: {integrity: sha512-aPP5Q5AqNGuT0tnuEkK/g4mnt3ZhheiXrDIiSVIHN9mcN21OyXDVbEMqmXPE7e2OplNLDkcvV+ZoGJa2ZImFgw==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@simple-dom/document@1.4.0: resolution: {integrity: sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg==} dependencies: @@ -10610,46 +10720,6 @@ packages: - supports-color dev: true - /ember-auto-import@2.6.1(webpack@5.89.0): - resolution: {integrity: sha512-3bCRi/pXp4QslmuCXGlSz9xwR7DF5oDx3zZO5OXKzNZihtkqAM1xvGuRIdQSl46pvbAXOkp8Odl5fOen1i0dRw==} - engines: {node: 12.* || 14.* || >= 16} - dependencies: - '@babel/core': 7.23.5(supports-color@8.1.1) - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.5) - '@babel/plugin-proposal-decorators': 7.23.5(@babel/core@7.23.5) - '@babel/preset-env': 7.23.5(@babel/core@7.23.5) - '@embroider/macros': 1.13.3(@glint/template@1.2.1) - '@embroider/shared-internals': 2.5.1 - babel-loader: 8.3.0(@babel/core@7.23.5)(webpack@5.89.0) - babel-plugin-ember-modules-api-polyfill: 3.5.0 - babel-plugin-htmlbars-inline-precompile: 5.3.1 - babel-plugin-syntax-dynamic-import: 6.18.0 - broccoli-debug: 0.6.5 - broccoli-funnel: 3.0.8 - broccoli-merge-trees: 4.2.0 - broccoli-plugin: 4.0.7 - broccoli-source: 3.0.1 - css-loader: 5.2.7(webpack@5.89.0) - debug: 4.3.4(supports-color@8.1.1) - fs-extra: 10.1.0 - fs-tree-diff: 2.0.1 - handlebars: 4.7.8 - js-string-escape: 1.0.1 - lodash: 4.17.21 - mini-css-extract-plugin: 2.7.6(webpack@5.89.0) - parse5: 6.0.1 - resolve: 1.22.8 - resolve-package-path: 4.0.3 - semver: 7.5.4 - style-loader: 2.0.0(webpack@5.89.0) - typescript-memoize: 1.1.1 - walk-sync: 3.0.0 - transitivePeerDependencies: - - '@glint/template' - - supports-color - - webpack - dev: true - /ember-auto-import@2.7.0: resolution: {integrity: sha512-cBEBB6IRRmlCVfyaRmDCfLrywm2HibTosJzIKv4BWF1p2ZokUhXBJjMRwuaG3tbLMV8rmJdLWnSKm8CodsdmQA==} engines: {node: 12.* || 14.* || >= 16} @@ -12551,30 +12621,30 @@ packages: - webpack dev: true - /ember-data@5.1.2(@babel/core@7.23.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2): - resolution: {integrity: sha512-uv5N6LAUAW+emDxPAmiBxS/g0ATLMHfcyBknu848LHAjZo2EDCjmutj9ChsPi61g+A74qGYqdlPl1uLJWzMRjA==} + /ember-data@5.3.0(@babel/core@7.23.5)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2): + resolution: {integrity: sha512-ca8udUa2SrWyYxPckYc89Fdv/9pCG3X360zHvlGxtB4C87o3dWp6sle98tP9G1TjximKhrU/PMrqpdhJ8rOGtA==} engines: {node: 16.* || >= 18.*} peerDependencies: '@ember/string': ^3.1.1 dependencies: - '@ember-data/adapter': 5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/debug': 5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1) - '@ember-data/graph': 5.1.2(@ember-data/store@5.1.2) - '@ember-data/json-api': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/store@5.1.2) - '@ember-data/legacy-compat': 5.1.2(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2) - '@ember-data/model': 5.1.2(@babel/core@7.23.5)(@ember-data/debug@5.1.2)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/store@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2) - '@ember-data/private-build-infra': 5.1.2 - '@ember-data/request': 5.1.2 - '@ember-data/serializer': 5.1.2(@ember-data/store@5.1.2)(@ember/string@3.1.1)(ember-inflector@4.0.2) - '@ember-data/store': 5.1.2(@babel/core@7.23.5)(@ember-data/graph@5.1.2)(@ember-data/json-api@5.1.2)(@ember-data/legacy-compat@5.1.2)(@ember-data/model@5.1.2)(@ember-data/tracking@5.1.2)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) - '@ember-data/tracking': 5.1.2 + '@ember-data/adapter': 5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2) + '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1) + '@ember-data/graph': 5.3.0(@babel/core@7.23.5)(@ember-data/store@5.3.0) + '@ember-data/json-api': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2) + '@ember-data/legacy-compat': 5.3.0(@babel/core@7.23.5)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0) + '@ember-data/model': 5.3.0(@babel/core@7.23.5)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@5.1.2) + '@ember-data/private-build-infra': 5.3.0 + '@ember-data/request': 5.3.0(@babel/core@7.23.5) + '@ember-data/request-utils': 5.3.0(@babel/core@7.23.5) + '@ember-data/serializer': 5.3.0(@babel/core@7.23.5)(@ember/string@3.1.1)(ember-inflector@4.0.2) + '@ember-data/store': 5.3.0(@babel/core@7.23.5)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(@glimmer/tracking@1.1.2)(ember-source@5.1.2) + '@ember-data/tracking': 5.3.0(@babel/core@7.23.5) '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.3(@glint/template@1.2.1) - '@glimmer/env': 0.1.7 broccoli-merge-trees: 4.2.0 - ember-auto-import: 2.6.1(webpack@5.89.0) - ember-cli-babel: 7.26.11 + ember-auto-import: 2.7.0(@glint/template@1.2.1)(webpack@5.89.0) + ember-cli-babel: 8.2.0(@babel/core@7.23.5) ember-inflector: 4.0.2 webpack: 5.89.0 transitivePeerDependencies: @@ -14083,6 +14153,36 @@ packages: '@esbuild/win32-x64': 0.18.20 dev: true + /esbuild@0.19.9: + resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.19.9 + '@esbuild/android-arm64': 0.19.9 + '@esbuild/android-x64': 0.19.9 + '@esbuild/darwin-arm64': 0.19.9 + '@esbuild/darwin-x64': 0.19.9 + '@esbuild/freebsd-arm64': 0.19.9 + '@esbuild/freebsd-x64': 0.19.9 + '@esbuild/linux-arm': 0.19.9 + '@esbuild/linux-arm64': 0.19.9 + '@esbuild/linux-ia32': 0.19.9 + '@esbuild/linux-loong64': 0.19.9 + '@esbuild/linux-mips64el': 0.19.9 + '@esbuild/linux-ppc64': 0.19.9 + '@esbuild/linux-riscv64': 0.19.9 + '@esbuild/linux-s390x': 0.19.9 + '@esbuild/linux-x64': 0.19.9 + '@esbuild/netbsd-x64': 0.19.9 + '@esbuild/openbsd-x64': 0.19.9 + '@esbuild/sunos-x64': 0.19.9 + '@esbuild/win32-arm64': 0.19.9 + '@esbuild/win32-ia32': 0.19.9 + '@esbuild/win32-x64': 0.19.9 + dev: true + /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -20073,6 +20173,27 @@ packages: optionalDependencies: fsevents: 2.3.3 + /rollup@4.9.0: + resolution: {integrity: sha512-bUHW/9N21z64gw8s6tP4c88P382Bq/L5uZDowHlHx6s/QWpjJXivIAbEw6LZthgSvlEizZBfLC4OAvWe7aoF7A==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.9.0 + '@rollup/rollup-android-arm64': 4.9.0 + '@rollup/rollup-darwin-arm64': 4.9.0 + '@rollup/rollup-darwin-x64': 4.9.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.9.0 + '@rollup/rollup-linux-arm64-gnu': 4.9.0 + '@rollup/rollup-linux-arm64-musl': 4.9.0 + '@rollup/rollup-linux-riscv64-gnu': 4.9.0 + '@rollup/rollup-linux-x64-gnu': 4.9.0 + '@rollup/rollup-linux-x64-musl': 4.9.0 + '@rollup/rollup-win32-arm64-msvc': 4.9.0 + '@rollup/rollup-win32-ia32-msvc': 4.9.0 + '@rollup/rollup-win32-x64-msvc': 4.9.0 + fsevents: 2.3.3 + dev: true + /route-recognizer@0.3.4: resolution: {integrity: sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==} dev: true @@ -21987,6 +22108,41 @@ packages: fsevents: 2.3.3 dev: true + /vite@5.0.9: + resolution: {integrity: sha512-wVqMd5kp28QWGgfYPDfrj771VyHTJ4UDlCteLH7bJDGDEamaz5hV8IX6h1brSGgnnyf9lI2RnzXq/JmD0c2wwg==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.19.9 + postcss: 8.4.32 + rollup: 4.9.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. diff --git a/tests/vite-app/app/adapters/post.js b/tests/vite-app/app/adapters/post.js index a23e8b777..d3af97d9a 100644 --- a/tests/vite-app/app/adapters/post.js +++ b/tests/vite-app/app/adapters/post.js @@ -1,2 +1,6 @@ import JSONAPIAdapter from '@ember-data/adapter/json-api'; -export default class extends JSONAPIAdapter {} +export default class extends JSONAPIAdapter { + urlForFindRecord(/* id, modelName */) { + return `${super.urlForFindRecord(...arguments)}.json`; + } +} diff --git a/tests/vite-app/package.json b/tests/vite-app/package.json index 24c00fd15..5276f6f18 100644 --- a/tests/vite-app/package.json +++ b/tests/vite-app/package.json @@ -51,7 +51,7 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.1.0", + "ember-data": "~5.3.0", "ember-load-initializers": "^2.1.2", "ember-modifier": "^4.1.0", "ember-page-title": "^7.0.0", @@ -75,7 +75,7 @@ "stylelint-prettier": "^3.0.0", "tracked-built-ins": "^3.1.1", "typescript": "^5.1.6", - "vite": "^4.3.9" + "vite": "^5.0.9" }, "engines": { "node": "16.* || >= 18" diff --git a/tests/vite-app/public/posts/1 b/tests/vite-app/public/posts/1.json similarity index 100% rename from tests/vite-app/public/posts/1 rename to tests/vite-app/public/posts/1.json diff --git a/tests/vite-app/vite.config.mts b/tests/vite-app/vite.config.mjs similarity index 97% rename from tests/vite-app/vite.config.mts rename to tests/vite-app/vite.config.mjs index dd5985900..0ca8f8440 100644 --- a/tests/vite-app/vite.config.mts +++ b/tests/vite-app/vite.config.mjs @@ -4,7 +4,6 @@ import { hbs, scripts, templateTag, - addons, optimizeDeps, } from "@embroider/vite"; import { resolve } from "path"; @@ -32,6 +31,8 @@ export default defineConfig({ ], optimizeDeps: optimizeDeps(), server: { + hmr: false, + port: 4200, watch: { ignored: ["!**/node_modules/.embroider/rewritten-app/**"], }, From 43feacc64f8491ed29514a1a36bac4769d3a96d9 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 15 Dec 2023 13:53:12 +0000 Subject: [PATCH 2/3] remove babel-config editing in vite app --- tests/vite-app/babel.config.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/vite-app/babel.config.js b/tests/vite-app/babel.config.js index 4a1f6e866..6fc0fc2f4 100644 --- a/tests/vite-app/babel.config.js +++ b/tests/vite-app/babel.config.js @@ -1,12 +1,4 @@ // eslint-disable-next-line n/no-missing-require let config = require('./node_modules/.embroider/rewritten-app/_babel_config_'); -let macrosPlugin = config.plugins.find( - (p) => Array.isArray(p) && p[0].endsWith('macros-babel-plugin.js') -); -if (macrosPlugin?.[1].importSyncImplementation !== 'cjs') { - throw new Error('expected to find macrosPlugin'); -} -macrosPlugin[1].importSyncImplementation = 'eager'; - module.exports = config; From ecfeb1a01c4cf3012a111a224c2e23dd4e45d3cc Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 15 Dec 2023 17:42:57 +0000 Subject: [PATCH 3/3] fix app by early importing the gjs file --- tests/vite-app/app/app.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/vite-app/app/app.js b/tests/vite-app/app/app.js index 984ab9c35..e3e2cb103 100644 --- a/tests/vite-app/app/app.js +++ b/tests/vite-app/app/app.js @@ -3,6 +3,14 @@ import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; import config from 'vite-app/config/environment'; +// this is needed because of an issue with the dependency discovery in vite +// where it is not picking up the dependencies of the gjs file because vite +// never even asks the dependency discovery code to load this file. We +// suspect that it has got something to do with the fact that the rewritten +// app is in node_modules so we will revisit this once we have killed the +// need for a rewritten_app +import 'vite-app/components/fancy.gjs'; + export default class App extends Application { modulePrefix = config.modulePrefix; podModulePrefix = config.podModulePrefix;