diff --git a/addon/package.json b/addon/package.json index 7014afb7..866f5601 100644 --- a/addon/package.json +++ b/addon/package.json @@ -38,9 +38,9 @@ "prepack": "rollup --config" }, "dependencies": { - "@embroider/addon-shim": "^1.0.0", - "@embroider/macros": "^1.11.1", - "ember-cli-test-loader": "^3.0.0" + "@embroider/addon-shim": "^1.8.6", + "@embroider/macros": "^1.13.1", + "ember-cli-test-loader": "^3.1.0" }, "devDependencies": { "@babel/core": "^7.22.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24fdba3f..06be94e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,14 +11,14 @@ importers: addon: dependencies: '@embroider/addon-shim': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.8.6 + version: 1.8.6 '@embroider/macros': - specifier: ^1.11.1 - version: 1.11.1 + specifier: ^1.13.1 + version: 1.13.1 ember-cli-test-loader: - specifier: ^3.0.0 - version: 3.0.0 + specifier: ^3.1.0 + version: 3.1.0 devDependencies: '@babel/core': specifier: ^7.22.5 @@ -118,8 +118,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 '@embroider/macros': - specifier: ^1.11.1 - version: 1.11.1 + specifier: ^1.13.1 + version: 1.13.1 '@embroider/test-setup': specifier: ^3.0.1 version: 3.0.1 @@ -540,7 +540,7 @@ packages: '@babel/helper-plugin-utils': 7.22.5 debug: 4.3.4(supports-color@9.4.0) lodash.debounce: 4.0.8 - resolve: 1.22.2 + resolve: 1.22.4 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -1645,7 +1645,7 @@ packages: ember-source: ^4.0.0 || ^5.0.0 dependencies: '@ember/test-waiters': 3.0.2 - '@embroider/macros': 1.11.1 + '@embroider/macros': 1.13.1 broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 ember-auto-import: 2.6.3(webpack@5.86.0) @@ -1690,14 +1690,6 @@ packages: - utf-8-validate dev: true - /@embroider/addon-shim@1.0.0: - resolution: {integrity: sha512-RkUkQDe56M/15pA7rAL9mTdxYnw/MukQYM2JcJ+9x8mTjkFc6mRnuHVdjVt/r6mUw9YG6FvN3G5nIadsDdXTyQ==} - engines: {node: 12.* || 14.* || >= 16} - dependencies: - '@embroider/shared-internals': 1.8.3 - semver: 7.5.1 - dev: false - /@embroider/addon-shim@1.8.6: resolution: {integrity: sha512-siC9kP78uucEbpDcVyxjkwa76pcs5rVzDVpWO4PDc9EAXRX+pzmUuSTLAK3GztUwx7/PWhz1BenAivqdSvSgfg==} engines: {node: 12.* || 14.* || >= 16} @@ -1728,7 +1720,7 @@ packages: broccoli-persistent-filter: 3.1.3 broccoli-plugin: 4.0.7 broccoli-source: 3.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) escape-string-regexp: 4.0.0 fast-sourcemap-concat: 1.4.0 filesize: 5.0.3 @@ -1738,7 +1730,7 @@ packages: js-string-escape: 1.0.1 jsdom: 16.7.0 lodash: 4.17.21 - resolve: 1.22.2 + resolve: 1.22.4 resolve-package-path: 4.0.3 typescript-memoize: 1.1.1 walk-sync: 3.0.0 @@ -1759,8 +1751,8 @@ packages: ember-cli-babel: 7.26.11 find-up: 5.0.0 lodash: 4.17.21 - resolve: 1.22.2 - semver: 7.5.1 + resolve: 1.22.4 + semver: 7.5.4 transitivePeerDependencies: - supports-color dev: true @@ -1784,20 +1776,27 @@ packages: semver: 7.5.1 transitivePeerDependencies: - supports-color + dev: true - /@embroider/shared-internals@1.8.3: - resolution: {integrity: sha512-N5Gho6Qk8z5u+mxLCcMYAoQMbN4MmH+z2jXwQHVs859bxuZTxwF6kKtsybDAASCtd2YGxEmzcc1Ja/wM28824w==} + /@embroider/macros@1.13.1: + resolution: {integrity: sha512-4htraP/rNIht8uCxXoc59Bw2EsBFfc4YUQD9XSpzJ4xUr1V0GQf9wL/noeSuYSxIhwRfZOErnJhsdyf1hH+I/A==} engines: {node: 12.* || 14.* || >= 16} + peerDependencies: + '@glint/template': ^1.0.0 + peerDependenciesMeta: + '@glint/template': + optional: true dependencies: - babel-import-util: 1.3.0 - ember-rfc176-data: 0.3.18 - fs-extra: 9.1.0 - js-string-escape: 1.0.1 + '@embroider/shared-internals': 2.4.0 + assert-never: 1.2.1 + babel-import-util: 2.0.0 + ember-cli-babel: 7.26.11 + find-up: 5.0.0 lodash: 4.17.21 - resolve-package-path: 4.0.3 - semver: 7.5.1 - typescript-memoize: 1.1.1 - dev: false + resolve: 1.22.4 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color /@embroider/shared-internals@2.0.0: resolution: {integrity: sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==} @@ -1809,7 +1808,7 @@ packages: js-string-escape: 1.0.1 lodash: 4.17.21 resolve-package-path: 4.0.3 - semver: 7.5.1 + semver: 7.5.4 typescript-memoize: 1.1.1 dev: true @@ -1823,7 +1822,7 @@ packages: js-string-escape: 1.0.1 lodash: 4.17.21 resolve-package-path: 4.0.3 - semver: 7.5.1 + semver: 7.5.4 typescript-memoize: 1.1.1 /@embroider/shared-internals@2.4.0: @@ -1841,7 +1840,6 @@ packages: typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color - dev: false /@embroider/test-setup@3.0.1: resolution: {integrity: sha512-t7R2f10iZDSNw3ovWAPM63GRQTu63uihpVh6CvHev5XkLt8B7tdxcxGyO6RbdF5Hu+pbsUu8sD0kAlR1gopmxg==} @@ -2118,7 +2116,7 @@ packages: resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==} dependencies: '@gar/promisify': 1.1.3 - semver: 7.5.1 + semver: 7.5.4 dev: true /@npmcli/move-file@1.1.2: @@ -3144,7 +3142,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -3153,7 +3151,7 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -3162,7 +3160,7 @@ packages: resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==} engines: {node: '>= 8.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) depd: 1.1.2 humanize-ms: 1.2.1 transitivePeerDependencies: @@ -3519,7 +3517,6 @@ packages: /babel-import-util@2.0.0: resolution: {integrity: sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw==} engines: {node: '>= 12.*'} - dev: false /babel-loader@8.2.5(@babel/core@7.22.5)(webpack@5.86.0): resolution: {integrity: sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==} @@ -3599,7 +3596,7 @@ packages: glob: 7.2.3 pkg-up: 2.0.0 reselect: 3.0.1 - resolve: 1.22.2 + resolve: 1.22.4 /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.22.5): resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==} @@ -4230,7 +4227,7 @@ packages: /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} dependencies: - semver: 7.5.1 + semver: 7.5.4 dev: true /bundle-name@3.0.0: @@ -5075,7 +5072,7 @@ packages: postcss-modules-values: 4.0.0(postcss@8.4.18) postcss-value-parser: 4.2.0 schema-utils: 3.2.0 - semver: 7.5.1 + semver: 7.5.4 webpack: 5.86.0 /css-tree@2.3.1: @@ -5161,18 +5158,6 @@ packages: ms: 2.1.3 dev: true - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true - /debug@4.3.4(supports-color@9.4.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -5488,7 +5473,7 @@ packages: '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.5) '@babel/plugin-proposal-decorators': 7.19.6(@babel/core@7.22.5) '@babel/preset-env': 7.19.4(@babel/core@7.22.5) - '@embroider/macros': 1.11.1 + '@embroider/macros': 1.13.1 '@embroider/shared-internals': 2.1.0 babel-loader: 8.2.5(@babel/core@7.22.5)(webpack@5.86.0) babel-plugin-ember-modules-api-polyfill: 3.5.0 @@ -5649,15 +5634,6 @@ packages: - supports-color dev: true - /ember-cli-test-loader@3.0.0: - resolution: {integrity: sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==} - engines: {node: 10.* || >= 12} - dependencies: - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - supports-color - dev: false - /ember-cli-test-loader@3.1.0: resolution: {integrity: sha512-0aocZV9SIoOHiU3hrH3IuLR6busWhTX6UVXgd490hmJkIymmOXNH2+jJoC7Ebkeo3PiOfAdjqhb765QDlHSJOw==} engines: {node: 10.* || >= 12} @@ -5686,7 +5662,7 @@ packages: ember-cli-babel-plugin-helpers: 1.1.1 execa: 1.0.0 fs-extra: 7.0.1 - resolve: 1.22.2 + resolve: 1.22.4 rsvp: 4.8.5 semver: 6.3.0 stagehand: 1.0.0 @@ -5719,7 +5695,7 @@ packages: resolution: {integrity: sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==} engines: {node: '>= 4'} dependencies: - resolve: 1.22.2 + resolve: 1.22.4 semver: 5.7.1 dev: true @@ -5745,7 +5721,7 @@ packages: engines: {node: 10.* || >= 12.*} dependencies: resolve-package-path: 3.1.0 - semver: 7.5.1 + semver: 7.5.4 silent-error: 1.1.1 transitivePeerDependencies: - supports-color @@ -6081,7 +6057,7 @@ packages: lodash: 4.17.21 package-json: 6.5.0 remote-git-tags: 3.0.0 - semver: 7.5.1 + semver: 7.5.4 transitivePeerDependencies: - encoding dev: true @@ -7409,7 +7385,7 @@ packages: dependencies: basic-ftp: 5.0.3 data-uri-to-buffer: 5.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) fs-extra: 8.1.0 transitivePeerDependencies: - supports-color @@ -7760,7 +7736,7 @@ packages: heimdalljs: 0.2.6 heimdalljs-logger: 0.1.10 path-root: 0.1.1 - resolve: 1.22.2 + resolve: 1.22.4 resolve-package-path: 1.2.7 transitivePeerDependencies: - supports-color @@ -7862,7 +7838,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -7872,7 +7848,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -7901,7 +7877,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -7911,7 +7887,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -8220,12 +8196,12 @@ packages: resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==} dependencies: has: 1.0.3 + dev: true /is-core-module@2.13.0: resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} dependencies: has: 1.0.3 - dev: true /is-data-descriptor@0.1.4: resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==} @@ -8749,14 +8725,14 @@ packages: /jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: - graceful-fs: 4.2.10 + graceful-fs: 4.2.11 /jsonfile@6.1.0: resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} dependencies: universalify: 2.0.0 optionalDependencies: - graceful-fs: 4.2.10 + graceful-fs: 4.2.11 /jsonify@0.0.1: resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} @@ -9517,7 +9493,7 @@ packages: resolution: {integrity: sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==} dependencies: '@types/debug': 4.1.7 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) decode-named-character-reference: 1.0.2 micromark-core-commonmark: 1.0.6 micromark-factory-space: 1.0.0 @@ -10311,7 +10287,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) get-uri: 6.0.1 http-proxy-agent: 7.0.0 https-proxy-agent: 7.0.0 @@ -10347,7 +10323,7 @@ packages: got: 12.6.1 registry-auth-token: 5.0.1 registry-url: 6.0.1 - semver: 7.5.1 + semver: 7.5.4 dev: true /parent-module@1.0.1: @@ -10731,7 +10707,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) http-proxy-agent: 7.0.0 https-proxy-agent: 7.0.0 lru-cache: 7.18.3 @@ -10925,7 +10901,7 @@ packages: resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==} engines: {node: '>= 0.10'} dependencies: - resolve: 1.22.2 + resolve: 1.22.4 dev: true /redeyed@1.0.1: @@ -11157,21 +11133,21 @@ packages: resolution: {integrity: sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==} dependencies: path-root: 0.1.1 - resolve: 1.22.2 + resolve: 1.22.4 /resolve-package-path@2.0.0: resolution: {integrity: sha512-/CLuzodHO2wyyHTzls5Qr+EFeG6RcW4u6//gjYvUfcfyuplIX1SSccU+A5A9A78Gmezkl3NBkFAMxLbzTY9TJA==} engines: {node: 8.* || 10.* || >= 12} dependencies: path-root: 0.1.1 - resolve: 1.22.2 + resolve: 1.22.4 /resolve-package-path@3.1.0: resolution: {integrity: sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==} engines: {node: 10.* || >= 12} dependencies: path-root: 0.1.1 - resolve: 1.22.2 + resolve: 1.22.4 /resolve-package-path@4.0.3: resolution: {integrity: sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==} @@ -11205,7 +11181,7 @@ packages: resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==} hasBin: true dependencies: - is-core-module: 2.12.1 + is-core-module: 2.13.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 @@ -11225,7 +11201,6 @@ packages: is-core-module: 2.13.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - dev: true /responselike@1.0.2: resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==} @@ -11510,7 +11485,7 @@ packages: resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==} engines: {node: '>=12'} dependencies: - semver: 7.5.1 + semver: 7.5.4 dev: true /semver@5.7.1: @@ -11756,7 +11731,7 @@ packages: engines: {node: '>= 10'} dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) socks: 2.7.1 transitivePeerDependencies: - supports-color @@ -11767,7 +11742,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@9.4.0) socks: 2.7.1 transitivePeerDependencies: - supports-color @@ -12753,7 +12728,7 @@ packages: is-yarn-global: 0.4.0 latest-version: 7.0.0 pupa: 3.1.0 - semver: 7.5.1 + semver: 7.5.4 semver-diff: 4.0.0 xdg-basedir: 5.1.0 dev: true @@ -12839,7 +12814,7 @@ packages: resolution: {integrity: sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==} dependencies: resolve-package-path: 3.1.0 - semver: 7.5.1 + semver: 7.5.4 dev: true /validate-peer-dependencies@2.2.0: @@ -12847,7 +12822,7 @@ packages: engines: {node: '>= 12'} dependencies: resolve-package-path: 4.0.3 - semver: 7.5.1 + semver: 7.5.4 dev: true /vary@1.1.2: @@ -13340,7 +13315,7 @@ packages: dependencies: '@ember/test-helpers': 3.0.3(ember-source@5.0.0)(webpack@5.86.0) '@embroider/addon-shim': 1.8.6 - '@embroider/macros': 1.11.1 + '@embroider/macros': 1.13.1 ember-cli-test-loader: 3.1.0 ember-source: 5.0.0(@babel/core@7.22.5)(@glimmer/component@1.1.2)(webpack@5.86.0) qunit: 2.19.4 diff --git a/test-app/package.json b/test-app/package.json index d3327815..0fe35594 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -36,7 +36,7 @@ "@ember/string": "^3.0.1", "@ember/test-helpers": "^3.0.3", "@ember/test-waiters": "^3.0.2", - "@embroider/macros": "^1.11.1", + "@embroider/macros": "^1.13.1", "@embroider/test-setup": "^3.0.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2",