Skip to content

Commit 79c96d1

Browse files
committed
chore: πŸ€– hacky work to get vite working for admin
1 parent b92cce1 commit 79c96d1

File tree

23 files changed

+147
-407
lines changed

23 files changed

+147
-407
lines changed

β€Žaddons/api/addon/mirage/config.jsβ€Ž

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import makeBooleanFilter from './helpers/bexpr-filter';
1212
import { faker } from '@faker-js/faker';
1313
import { asciicasts } from './data/asciicasts';
1414
import { TYPE_WORKER_PKI } from 'api/models/worker';
15-
import environmentConfig from 'ember-get-config';
1615

1716
// mirage models (alphabetical)
1817
import accountModel from './models/account';
@@ -92,7 +91,8 @@ import targetFactory from './factories/target';
9291
import userFactory from './factories/user';
9392
import workerFactory from './factories/worker';
9493

95-
const isTesting = environmentConfig.environment === 'test';
94+
const environmentConfig = {};
95+
const isTesting = false; // environmentConfig.environment === 'test';
9696

9797
// Main function
9898
// More info about server configuration:
@@ -210,8 +210,9 @@ function routes() {
210210
return metadata;
211211
});
212212

213+
debugger;
213214
// make this `/api`, for example, if your API is namespaced
214-
this.namespace = environmentConfig.api?.namespace;
215+
this.namespace = '/v1';
215216
// delay for each request, automatically set to 0 during testing
216217
this.timing = 1;
217218

β€Žaddons/api/package.jsonβ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"broccoli-plugin": "^4.0.7",
3434
"broccoli-source": "^3.0.1",
3535
"ember-auto-import": "^2.10.0",
36-
"ember-can": "^6.0.0",
36+
"ember-can": "^8.0.0",
3737
"ember-cli-babel": "^8.2.0",
3838
"ember-cli-htmlbars": "^6.3.0",
3939
"ember-data": "~5.3.12",
@@ -63,11 +63,10 @@
6363
"ember-cli-sri": "^2.1.1",
6464
"ember-cli-terser": "^4.0.2",
6565
"ember-exam": "^8.0.0",
66-
"ember-get-config": "^2.1.1",
6766
"ember-load-initializers": "^2.1.2",
6867
"ember-page-title": "^8.2.3",
6968
"ember-qunit": "^8.1.0",
70-
"ember-resolver": "^12.0.1",
69+
"ember-resolver": "^13.1.1",
7170
"ember-source": "~5.12.0",
7271
"ember-source-channel-url": "^3.0.0",
7372
"ember-template-lint": "^6.0.0",

β€Žaddons/auth/package.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"ember-load-initializers": "^2.1.2",
5454
"ember-page-title": "^8.2.3",
5555
"ember-qunit": "^8.1.0",
56-
"ember-resolver": "^12.0.1",
56+
"ember-resolver": "^13.1.1",
5757
"ember-source": "~5.12.0",
5858
"ember-source-channel-url": "^3.0.0",
5959
"ember-template-lint": "^6.0.0",

β€Žaddons/core/addon/decorators/confirm.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ export function confirm(confirmationTextKey, options) {
2929
};
3030
};
3131
}
32+

β€Žaddons/core/addon/decorators/debounce.jsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ export function debounce(timeToWait, options) {
2424
);
2525
};
2626
}
27+
28+
export default debounce;

β€Žaddons/core/addon/decorators/notify.jsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,5 @@ export function notifyError(
116116
};
117117
};
118118
}
119+
120+
export default notifySuccess;

β€Žaddons/core/addon/decorators/resource-filter.jsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,3 +272,5 @@ export function resourceFilter({
272272
};
273273
};
274274
}
275+
276+
export default resourceFilter;

β€Žaddons/core/app/decorators/confirm.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
* SPDX-License-Identifier: BUSL-1.1
44
*/
55

6-
export { default } from 'core/decorators/confirm';
6+
export { confirm, confirm as default } from 'core/decorators/confirm';

β€Žaddons/core/app/decorators/debounce.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*/
55

66
export { default } from 'core/decorators/debounce';
7+
export { default as debounce } from 'core/decorators/debounce';

β€Žaddons/core/app/decorators/notify.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*/
55

66
export { default } from 'core/decorators/notify';
7+
export { notifySuccess, notifyError } from 'core/decorators/notify';

0 commit comments

Comments
Β (0)