Skip to content

Commit 97a21e2

Browse files
committed
fix a couple of tests
1 parent ebdf1cc commit 97a21e2

File tree

3 files changed

+204
-2260
lines changed

3 files changed

+204
-2260
lines changed

test-app/ember-cli-build.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

33
// eslint-disable-next-line node/no-unpublished-require
44
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
5+
const packageJson = require('./package');
56

67
module.exports = function (defaults) {
78
let app = new EmberApp(defaults, {
89
// Add options here
10+
autoImport: {
11+
watchDependencies: Object.keys(packageJson.dependencies),
12+
},
913
});
1014

1115
/*
@@ -15,11 +19,11 @@ module.exports = function (defaults) {
1519
behave. You most likely want to be modifying `./index.js` or app's build file
1620
*/
1721

18-
if (app.env === 'test') {
19-
app.import('node_modules/ember-source/dist/ember-template-compiler.js', {
20-
type: 'test',
21-
});
22-
}
22+
// if (app.env === 'test') {
23+
// app.import('node_modules/ember-source/dist/ember-template-compiler.js', {
24+
// type: 'test',
25+
// });
26+
// }
2327

2428
// eslint-disable-next-line node/no-unpublished-require
2529
const { maybeEmbroider } = require('@embroider/test-setup');

test-app/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@
2020
"test": "npm-run-all lint test:*",
2121
"test:ember": "ember test"
2222
},
23+
"dependencies": {
24+
"ember-element-helper": "*"
25+
},
2326
"devDependencies": {
2427
"@ember/optional-features": "^2.0.0",
2528
"@ember/test-helpers": "^2.6.0",
26-
"@embroider/compat": "^1.2.0",
27-
"@embroider/core": "^1.2.0",
28-
"@embroider/macros": "^1.0.0",
29-
"@embroider/test-setup": "^1.8.3",
30-
"@embroider/webpack": "^1.2.0",
29+
"@ember/string": "^3.1.1",
30+
"@embroider/compat": "^3.2.0",
31+
"@embroider/core": "^3.2.0",
32+
"@embroider/macros": "^1.13.0",
33+
"@embroider/test-setup": "^3.0.1",
34+
"@embroider/webpack": "^3.1.4",
3135
"@glimmer/component": "^1.0.4",
3236
"@glimmer/tracking": "^1.0.4",
3337
"babel-eslint": "^10.1.0",
@@ -41,16 +45,12 @@
4145
"ember-cli-inject-live-reload": "^2.1.0",
4246
"ember-cli-sri": "^2.1.1",
4347
"ember-cli-terser": "^4.0.2",
44-
"ember-data": "~4.2.0",
45-
"ember-disable-prototype-extensions": "^1.1.3",
46-
"ember-element-helper": "*",
47-
"ember-export-application-global": "^2.0.1",
4848
"ember-fetch": "^8.1.1",
4949
"ember-load-initializers": "^2.1.2",
5050
"ember-page-title": "^7.0.0",
5151
"ember-qunit": "^5.1.5",
5252
"ember-resolver": "^8.0.3",
53-
"ember-source": "~4.2.0",
53+
"ember-source": "~4.12.3",
5454
"ember-source-channel-url": "^3.0.0",
5555
"ember-template-lint": "^4.2.0",
5656
"ember-try": "^1.4.0",

0 commit comments

Comments
 (0)