Skip to content

Commit 369ce70

Browse files
authored
Update ember-addon blueprint v0.17.0...v0.17.1 (#635)
1 parent de2d16c commit 369ce70

5 files changed

Lines changed: 61 additions & 27 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ ember-cli-build.cjs
1616
node_modules/
1717
.eslintcache
1818
.prettiercache
19+
20+
# potentially containing secrets
21+
*.local

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
{
66
"name": "@ember/addon-blueprint",
7-
"version": "0.17.0",
7+
"version": "0.17.1",
88
"blueprints": [
99
{
1010
"name": "@ember/addon-blueprint",

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
},
6363
"dependencies": {
6464
"@embroider/addon-shim": "^1.10.2",
65+
"@embroider/macros": "^1.20.1",
6566
"decorator-transforms": "^2.3.1",
66-
"@embroider/macros": "^1.19.7",
6767
"ember-element-helper": "^0.8.8",
6868
"ember-modifier": "^4.3.0",
6969
"ember-truth-helpers": "^5.0.0"
@@ -94,9 +94,9 @@
9494
"babel-plugin-ember-template-compilation": "^4.0.0",
9595
"concurrently": "^9.0.1",
9696
"ember-basic-dropdown": "git+https://github.com/cibernox/ember-basic-dropdown#f3cb963ca0a2728c2580e71e9c822e9c6bee08c5",
97-
"ember-power-calendar-moment": "^1.0.4",
9897
"ember-concurrency": "^5.1.0",
9998
"ember-page-title": "^9.0.3",
99+
"ember-power-calendar-moment": "^1.0.4",
100100
"ember-qunit": "^9.0.2",
101101
"ember-route-template": "^1.0.3",
102102
"ember-source": "^6.7.0",
@@ -118,11 +118,11 @@
118118
"release-it": "^19.2.4",
119119
"rollup": "^4.22.5",
120120
"rollup-plugin-sass": "^1.15.3",
121+
"rsvp": "^4.8.5",
121122
"sass": "^1.97.3",
122123
"sass-embedded": "^1.97.3",
123124
"testem": "^3.15.1",
124125
"tracked-built-ins": "^4.1.0",
125-
"rsvp": "^4.8.5",
126126
"typescript": "~5.8.3",
127127
"typescript-eslint": "^8.19.1",
128128
"vite": "^7.1.9"

pnpm-lock.yaml

Lines changed: 52 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/test-helper.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import PowerCalendarService from '#src/services/power-calendar.ts';
1111
import DateUtils from 'ember-power-calendar-moment';
1212
import { registerDateLibrary } from '#src/utils.ts';
1313
import { setConfig, type Config } from 'ember-basic-dropdown/config';
14-
// @ts-expect-error Could not find a declaration file for module '@embroider/macros/src/addon/runtime'.
15-
import { getGlobalConfig } from '@embroider/macros/src/addon/runtime';
14+
import { setTesting } from '@embroider/macros';
1615
import 'moment/dist/locale/es';
1716
import 'moment/dist/locale/ru';
1817
import 'moment/dist/locale/fr';
@@ -35,6 +34,7 @@ class TestApp extends EmberApp {
3534
Router.map(function () {});
3635

3736
export function start() {
37+
setTesting(true);
3838
registerDateLibrary(DateUtils);
3939
initialize();
4040
setApplication(
@@ -52,12 +52,6 @@ export function start() {
5252
setup(QUnit.assert);
5353
setupEmberOnerrorValidation();
5454

55-
//eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
56-
const config = getGlobalConfig()['@embroider/macros'];
57-
58-
//eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
59-
if (config) config.isTesting = true;
60-
6155
setConfig(defaultBasicDropdownConfig);
6256

6357
qunitStart();
@@ -68,8 +62,4 @@ export const defaultBasicDropdownConfig: Config = {
6862
import.meta.env.VITE_SHADOW_DOM_BUILD === 'true'
6963
? '#ember-basic-dropdown-wormhole'
7064
: '#ember-testing',
71-
destination:
72-
import.meta.env.VITE_SHADOW_DOM_BUILD === 'true'
73-
? 'ember-basic-dropdown-wormhole'
74-
: 'ember-testing', // Workaround, because embroider.isTesting isn't working
7565
};

0 commit comments

Comments
 (0)