From 38a388c69905de33234b6cf7929fa324f851ed0a Mon Sep 17 00:00:00 2001 From: Markus Sanin Date: Fri, 5 Dec 2025 21:21:10 +0100 Subject: [PATCH] Update to @embroider/addon-dev v8 --- ember-basic-dropdown/.gitignore | 2 +- ember-basic-dropdown/package.json | 11 +- ember-basic-dropdown/rollup.config.mjs | 7 +- ember-basic-dropdown/src/styles.ts | 2 +- pnpm-lock.yaml | 134 ++++++++++--------------- 5 files changed, 63 insertions(+), 93 deletions(-) diff --git a/ember-basic-dropdown/.gitignore b/ember-basic-dropdown/.gitignore index 81bf2fee..ed426648 100644 --- a/ember-basic-dropdown/.gitignore +++ b/ember-basic-dropdown/.gitignore @@ -5,7 +5,7 @@ # compiled output /dist /declarations -/vendor +/src/vendor # npm/pnpm/yarn pack output *.tgz diff --git a/ember-basic-dropdown/package.json b/ember-basic-dropdown/package.json index 108a06ed..9ae9ede5 100644 --- a/ember-basic-dropdown/package.json +++ b/ember-basic-dropdown/package.json @@ -25,7 +25,7 @@ "./scss/base.scss": "./scss/base.scss", "./less/variables.less": "./less/variables.less", "./scss/variables.scss": "./scss/variables.scss", - "./vendor/*": "./vendor/*" + "./vendor/*": "./dist/vendor/*" }, "typesVersions": { "*": { @@ -43,8 +43,7 @@ "ember-basic-dropdown.less", "ember-basic-dropdown.scss", "less", - "scss", - "vendor" + "scss" ], "scripts": { "build": "rollup --config", @@ -63,8 +62,8 @@ }, "dependencies": { "@embroider/addon-shim": "^1.10.2", - "@embroider/macros": "^1.19.4", - "@embroider/util": "^1.13.4", + "@embroider/macros": "^1.19.5", + "@embroider/util": "^1.13.5", "decorator-transforms": "^2.3.0", "ember-element-helper": "^0.8.8", "ember-modifier": "^4.2.2", @@ -79,7 +78,7 @@ "@ember/library-tsconfig": "^1.1.3", "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.1", - "@embroider/addon-dev": "^7.1.1", + "@embroider/addon-dev": "^8.1.2", "@eslint/js": "^9.39.1", "@glint/core": "^1.5.2", "@glint/environment-ember-loose": "^1.5.2", diff --git a/ember-basic-dropdown/rollup.config.mjs b/ember-basic-dropdown/rollup.config.mjs index fe765b9e..5f5a1f67 100644 --- a/ember-basic-dropdown/rollup.config.mjs +++ b/ember-basic-dropdown/rollup.config.mjs @@ -13,19 +13,19 @@ export default [ { input: './_index.scss', output: { - file: './vendor/ember-basic-dropdown.js', + file: './src/vendor/ember-basic-dropdown.js', assetFileNames: '[name][extname]', }, plugins: [ sass({ - output: './vendor/ember-basic-dropdown.css', + output: './src/vendor/ember-basic-dropdown.css', }), ], }, { input: './_index.scss', output: { - file: './vendor/ember-basic-dropdown.js', + file: './src/vendor/ember-basic-dropdown.js', assetFileNames: '[name][extname]', }, plugins: [ @@ -60,6 +60,7 @@ export default [ 'modifiers/**/*.js', 'test-support/**/*.js', 'utils/**/*.js', + 'vendor/**/*.js', ]), // These are the modules that should get reexported into the traditional diff --git a/ember-basic-dropdown/src/styles.ts b/ember-basic-dropdown/src/styles.ts index 8a2123fb..e4fefa66 100644 --- a/ember-basic-dropdown/src/styles.ts +++ b/ember-basic-dropdown/src/styles.ts @@ -1 +1 @@ -import '../vendor/ember-basic-dropdown.css'; +import './vendor/ember-basic-dropdown.css'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2e7a2c6..8bb9e2c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -232,11 +232,11 @@ importers: specifier: ^1.10.2 version: 1.10.2 '@embroider/macros': - specifier: ^1.19.4 - version: 1.19.4(@glint/template@1.5.2) + specifier: ^1.19.5 + version: 1.19.5(@glint/template@1.5.2) '@embroider/util': - specifier: ^1.13.4 - version: 1.13.4(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.8.1(@glimmer/component@2.0.0)(rsvp@4.8.5)) + specifier: ^1.13.5 + version: 1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.8.1(@glimmer/component@2.0.0)(rsvp@4.8.5)) decorator-transforms: specifier: ^2.3.0 version: 2.3.0(@babel/core@7.28.5) @@ -275,8 +275,8 @@ importers: specifier: ^5.4.1 version: 5.4.1(@babel/core@7.28.5)(@glint/template@1.5.2) '@embroider/addon-dev': - specifier: ^7.1.1 - version: 7.1.5(@glint/template@1.5.2)(rollup@4.53.2) + specifier: ^8.1.2 + version: 8.1.2(@glint/template@1.5.2)(rollup@4.53.2) '@eslint/js': specifier: ^9.39.1 version: 9.39.1 @@ -387,7 +387,7 @@ importers: version: 1.19.4(@glint/template@1.5.2) '@embroider/test-setup': specifier: ^4.0.0 - version: 4.0.0(@embroider/core@3.5.7(@glint/template@1.5.2)) + version: 4.0.0 '@eslint/js': specifier: ^9.39.1 version: 9.39.1 @@ -1225,8 +1225,8 @@ packages: '@ember/test-waiters@4.1.1': resolution: {integrity: sha512-HbK70JYCDJcGI0CrwcbjeL2QHAn0HLwa3oGep7mr6l/yO95U7JYA8VN+/9VTsWJTmKueLtWayUqEmGS3a3mVOg==} - '@embroider/addon-dev@7.1.5': - resolution: {integrity: sha512-fa7PqRePEPk41AGSydRg9XgFBSTRGzcez2Rh9HFZ4Lz0aGZtvkZMEnetQYCUNDzDGUyc9mDodA9uBN2KU3Cb/A==} + '@embroider/addon-dev@8.1.2': + resolution: {integrity: sha512-4F0/gCZ1YxN8YKMuCuNuFcGBjRwYJNnl52hK2p82Pztoi9saglPDpZBkjOoaEg2yWoqaVJRAGg3GBKQjDCZltw==} engines: {node: 12.* || 14.* || >= 16} hasBin: true peerDependencies: @@ -1249,16 +1249,16 @@ packages: resolution: {integrity: sha512-qznkdjgEGPe6NM94hZNXvOm/WhrJwBh8FtSQZ+nGjh9TOjY42tOiTEevFuM0onNXUn6bpdGzmjwKo2xY2jxQxQ==} engines: {node: 12.* || 14.* || >= 16} - '@embroider/core@3.5.7': - resolution: {integrity: sha512-0oytko2+iaYS31TG9Axj7Py0e0FAccUhu9J1h7ldEnQegK+Eu5+OINU0dYQgt0ijp6f2yF4+o3J7u9CJCLZ1gw==} - engines: {node: 12.* || 14.* || >= 16} - '@embroider/core@4.2.7': resolution: {integrity: sha512-ZHAyMGzNbIt2XthY6KUIQT15YiBYrZgWqCgOpioRPQS+HpMPkKETHkDWjftOJh9RpQL7hfLMvucnvxeCVXXPbw==} engines: {node: 12.* || 14.* || >= 16} - '@embroider/macros@1.16.13': - resolution: {integrity: sha512-2oGZh0m1byBYQFWEa8b2cvHJB2LzaF3DdMCLCqcRAccABMROt1G3sultnNCT30NhfdGWMEsJOT3Jm4nFxXmTRw==} + '@embroider/core@4.4.0': + resolution: {integrity: sha512-s2qc5//C4TbhFvHroOnQ5A+mcnoMT9bgPLol+N7eiPbsk0jW8K+DNdNFmZ4GQfZnHHEF3zZb7+8qseI+tIrw3w==} + engines: {node: 12.* || 14.* || >= 16} + + '@embroider/macros@1.19.4': + resolution: {integrity: sha512-x4wrnkE6fPN6mOyJeJv2I+lpKE2pHPq25S8bCiRJJb3H3RyiTm2LjSeB4AOVTi8YUjiWToI4PBgZOtx44hM4LA==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: '@glint/template': ^1.0.0 @@ -1266,8 +1266,8 @@ packages: '@glint/template': optional: true - '@embroider/macros@1.19.4': - resolution: {integrity: sha512-x4wrnkE6fPN6mOyJeJv2I+lpKE2pHPq25S8bCiRJJb3H3RyiTm2LjSeB4AOVTi8YUjiWToI4PBgZOtx44hM4LA==} + '@embroider/macros@1.19.5': + resolution: {integrity: sha512-zwpe7J9jyh8YPLzblk8WR3AQf6m+Ln/8Prlz9/DEwHD1m7GjJog1TIT0Sjv8guEj/hXCGntbNOzfE2Vj1T0Uug==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: '@glint/template': ^1.0.0 @@ -1278,8 +1278,8 @@ packages: '@embroider/reverse-exports@0.1.2': resolution: {integrity: sha512-TgjQalfB42RnwdRVApjcvHSVjBe+7MJfCZV0Cs1jv2QgnFGr/6f5X19PKvmF4FU4xbBf7yOsIWrVvYvidWnXlw==} - '@embroider/shared-internals@2.9.0': - resolution: {integrity: sha512-8untWEvGy6av/oYibqZWMz/yB+LHsKxEOoUZiLvcpFwWj2Sipc0DcXeTJQZQZ++otNkLCWyDrDhOLrOkgjOPSg==} + '@embroider/reverse-exports@0.2.0': + resolution: {integrity: sha512-WFsw8nQpHZiWGEDYpa/A79KEFfTisqteXbY+jg9eZiww1r1G+LZvsmdszDp86TkotUSCqrMbK/ewn0jR1CJmqg==} engines: {node: 12.* || 14.* || >= 16} '@embroider/shared-internals@2.9.1': @@ -1305,8 +1305,8 @@ packages: '@embroider/webpack': optional: true - '@embroider/util@1.13.4': - resolution: {integrity: sha512-TqA0SNQarSJUdYGv+39MBCHkiuxhr2u0iKJP/JnDmQkCiVhvuFWy3P3n5sI26fVrVwG3DJLfxE2XVnB37udFOA==} + '@embroider/util@1.13.5': + resolution: {integrity: sha512-rHhGUzAQ5iOr5Swvk7yaarVe5SJtcjK2t/C8ts9agWfhTq4DVfy8+axF0KOf1jALRiJao3l9ALRGd6letKw2ZQ==} engines: {node: 12.* || 14.* || >= 16} peerDependencies: '@glint/environment-ember-loose': ^1.0.0 @@ -2091,10 +2091,6 @@ packages: rollup: optional: true - '@rollup/pluginutils@4.2.1': - resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} - engines: {node: '>= 8.0.0'} - '@rollup/pluginutils@5.3.0': resolution: {integrity: sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==} engines: {node: '>=14.0.0'} @@ -2839,10 +2835,6 @@ packages: resolution: {integrity: sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==} engines: {node: 6.* || 8.* || >= 10.*} - babel-plugin-ember-template-compilation@2.3.0: - resolution: {integrity: sha512-4ZrKVSqdw5PxEKRbqfOpPhrrNBDG3mFPhyT6N1Oyyem81ZIkCvNo7TPKvlTHeFxqb6HtUvCACP/pzFpZ74J4pg==} - engines: {node: '>= 12.*'} - babel-plugin-ember-template-compilation@2.4.1: resolution: {integrity: sha512-n+ktQ3JeyWrpRutSyPn2PsHeH+A94SVm+iUoogzf9VUqpP47FfWem24gpQXhn+p6+x5/BpuFJXMLXWt7ZoYAKA==} engines: {node: '>= 12.*'} @@ -9377,15 +9369,15 @@ snapshots: '@ember/test-waiters@4.1.1(@glint/template@1.5.2)': dependencies: '@embroider/addon-shim': 1.10.2 - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) transitivePeerDependencies: - '@glint/template' - supports-color - '@embroider/addon-dev@7.1.5(@glint/template@1.5.2)(rollup@4.53.2)': + '@embroider/addon-dev@8.1.2(@glint/template@1.5.2)(rollup@4.53.2)': dependencies: - '@embroider/core': 3.5.7(@glint/template@1.5.2) - '@rollup/pluginutils': 4.2.1 + '@embroider/core': 4.4.0(@glint/template@1.5.2) + '@rollup/pluginutils': 5.3.0(rollup@4.53.2) content-tag: 3.1.3 execa: 5.1.1 fs-extra: 10.1.0 @@ -9466,22 +9458,23 @@ snapshots: '@embroider/config-meta-loader@1.0.0': {} - '@embroider/core@3.5.7(@glint/template@1.5.2)': + '@embroider/core@4.2.7(@glint/template@1.5.2)': dependencies: '@babel/core': 7.28.5 '@babel/parser': 7.28.5 '@babel/traverse': 7.28.5 - '@embroider/macros': 1.16.13(@glint/template@1.5.2) - '@embroider/shared-internals': 2.9.1 + '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/reverse-exports': 0.1.2 + '@embroider/shared-internals': 3.0.1 assert-never: 1.4.0 - babel-plugin-ember-template-compilation: 2.3.0 + babel-plugin-ember-template-compilation: 3.0.1 broccoli-node-api: 1.7.0 broccoli-persistent-filter: 3.1.3 broccoli-plugin: 4.0.7 broccoli-source: 3.0.1 debug: 4.4.3 + escape-string-regexp: 4.0.0 fast-sourcemap-concat: 2.1.1 - filesize: 10.1.6 fs-extra: 9.1.0 fs-tree-diff: 2.0.1 handlebars: 4.7.8 @@ -9490,6 +9483,7 @@ snapshots: lodash: 4.17.21 resolve: 1.22.11 resolve-package-path: 4.0.3 + resolve.exports: 2.0.3 semver: 7.7.3 typescript-memoize: 1.1.1 walk-sync: 3.0.0 @@ -9500,13 +9494,13 @@ snapshots: - supports-color - utf-8-validate - '@embroider/core@4.2.7(@glint/template@1.5.2)': + '@embroider/core@4.4.0(@glint/template@1.5.2)': dependencies: '@babel/core': 7.28.5 '@babel/parser': 7.28.5 '@babel/traverse': 7.28.5 - '@embroider/macros': 1.19.4(@glint/template@1.5.2) - '@embroider/reverse-exports': 0.1.2 + '@embroider/macros': 1.19.5(@glint/template@1.5.2) + '@embroider/reverse-exports': 0.2.0 '@embroider/shared-internals': 3.0.1 assert-never: 1.4.0 babel-plugin-ember-template-compilation: 3.0.1 @@ -9536,11 +9530,11 @@ snapshots: - supports-color - utf-8-validate - '@embroider/macros@1.16.13(@glint/template@1.5.2)': + '@embroider/macros@1.19.4(@glint/template@1.5.2)': dependencies: - '@embroider/shared-internals': 2.9.0 + '@embroider/shared-internals': 3.0.1 assert-never: 1.4.0 - babel-import-util: 2.1.1 + babel-import-util: 3.0.1 ember-cli-babel: 7.26.11 find-up: 5.0.0 lodash: 4.17.21 @@ -9551,7 +9545,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/macros@1.19.4(@glint/template@1.5.2)': + '@embroider/macros@1.19.5(@glint/template@1.5.2)': dependencies: '@embroider/shared-internals': 3.0.1 assert-never: 1.4.0 @@ -9571,22 +9565,10 @@ snapshots: mem: 8.1.1 resolve.exports: 2.0.3 - '@embroider/shared-internals@2.9.0': + '@embroider/reverse-exports@0.2.0': dependencies: - babel-import-util: 2.1.1 - debug: 4.4.3 - ember-rfc176-data: 0.3.18 - fs-extra: 9.1.0 - is-subdir: 1.2.0 - js-string-escape: 1.0.1 - lodash: 4.17.21 - minimatch: 3.1.2 - pkg-entry-points: 1.1.1 - resolve-package-path: 4.0.3 - semver: 7.7.3 - typescript-memoize: 1.1.1 - transitivePeerDependencies: - - supports-color + mem: 8.1.1 + resolve.exports: 2.0.3 '@embroider/shared-internals@2.9.1': dependencies: @@ -9623,16 +9605,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/test-setup@4.0.0(@embroider/core@3.5.7(@glint/template@1.5.2))': + '@embroider/test-setup@4.0.0': dependencies: lodash: 4.17.21 resolve: 1.22.11 - optionalDependencies: - '@embroider/core': 3.5.7(@glint/template@1.5.2) - '@embroider/util@1.13.4(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5))': + '@embroider/util@1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5))': dependencies: - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) broccoli-funnel: 3.0.8 ember-cli-babel: 7.26.11 ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5) @@ -9642,9 +9622,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/util@1.13.4(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.8.1(@glimmer/component@2.0.0)(rsvp@4.8.5))': + '@embroider/util@1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.8.1(@glimmer/component@2.0.0)(rsvp@4.8.5))': dependencies: - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) broccoli-funnel: 3.0.8 ember-cli-babel: 7.26.11 ember-source: 6.8.1(@glimmer/component@2.0.0)(rsvp@4.8.5) @@ -10461,11 +10441,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@rollup/pluginutils@4.2.1': - dependencies: - estree-walker: 2.0.2 - picomatch: 2.3.1 - '@rollup/pluginutils@5.3.0(rollup@4.53.2)': dependencies: '@types/estree': 1.0.8 @@ -10850,7 +10825,7 @@ snapshots: '@warp-drive/build-config@5.8.0(@babel/core@7.28.5)(@glint/template@1.5.2)': dependencies: '@embroider/addon-shim': 1.10.2 - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) babel-import-util: 2.1.1 babel-plugin-debug-macros: 2.0.0(@babel/core@7.28.5) semver: 7.7.3 @@ -10861,7 +10836,7 @@ snapshots: '@warp-drive/core@5.8.0(@babel/core@7.28.5)(@glint/template@1.5.2)': dependencies: - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) '@warp-drive/build-config': 5.8.0(@babel/core@7.28.5)(@glint/template@1.5.2) transitivePeerDependencies: - '@babel/core' @@ -10871,7 +10846,7 @@ snapshots: '@warp-drive/ember@5.8.0(@babel/core@7.28.5)(@ember/test-waiters@4.1.1(@glint/template@1.5.2))(@glint/template@1.5.2)': dependencies: '@ember/test-waiters': 4.1.1(@glint/template@1.5.2) - '@embroider/macros': 1.19.4(@glint/template@1.5.2) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) '@warp-drive/core': 5.8.0(@babel/core@7.28.5)(@glint/template@1.5.2) transitivePeerDependencies: - '@babel/core' @@ -11265,11 +11240,6 @@ snapshots: dependencies: ember-rfc176-data: 0.3.18 - babel-plugin-ember-template-compilation@2.3.0: - dependencies: - '@glimmer/syntax': 0.84.3 - babel-import-util: 3.0.1 - babel-plugin-ember-template-compilation@2.4.1: dependencies: '@glimmer/syntax': 0.95.0 @@ -12630,8 +12600,8 @@ snapshots: dependencies: '@ember/test-helpers': 5.4.1(@babel/core@7.28.5)(@glint/template@1.5.2) '@embroider/addon-shim': 1.10.2 - '@embroider/macros': 1.19.4(@glint/template@1.5.2) - '@embroider/util': 1.13.4(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + '@embroider/macros': 1.19.5(@glint/template@1.5.2) + '@embroider/util': 1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) '@glimmer/component': 2.0.0 decorator-transforms: 2.3.0(@babel/core@7.28.5) ember-element-helper: 0.8.8