Skip to content

Commit 67597ae

Browse files
committed
use the new load initializers and resolver
1 parent 1743eb5 commit 67597ae

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

files-override/js/app/app.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@ import Resolver from 'ember-resolver';
44
import loadInitializers from 'ember-load-initializers';
55
import config from './config/environment';
66

7-
let d = window.define;
8-
9-
for (const [name, module] of Object.entries(compatModules)) {
10-
d(name, function () {
11-
return module;
12-
});
13-
}
14-
157
export default class App extends Application {
168
modulePrefix = config.modulePrefix;
179
podModulePrefix = config.podModulePrefix;
18-
Resolver = Resolver;
10+
Resolver = Resolver.withModules(compatModules) ;
1911
}
2012

21-
loadInitializers(App, config.modulePrefix);
13+
loadInitializers(App, config.modulePrefix, compatModules);

index.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ module.exports = {
4545
...Object.keys(manifest.devDependencies || {}),
4646
];
4747

48-
let ensureLatestDeps = [
49-
'eslint',
50-
'eslint-plugin-ember',
51-
'eslint-plugin-n',
52-
'@babel/eslint-parser',
53-
];
54-
5548
// this.addPackagesToProject doesn't respect the packageManager that the blueprint specified 🙈 so we're skipping a level here
5649
let installTask = this.taskFor('npm-install');
5750
let uninstallTask = this.taskFor('npm-uninstall');
@@ -68,8 +61,6 @@ module.exports = {
6861
'ember-cli-dependency-checker',
6962
'ember-cli-sri',
7063
'ember-cli-terser',
71-
72-
...ensureLatestDeps,
7364
// Linting
7465
'@babel/plugin-proposal-decorators',
7566
].filter((depToRemove) => existingDeps.includes(depToRemove)),
@@ -89,7 +80,12 @@ module.exports = {
8980
'@rollup/plugin-babel',
9081
'decorator-transforms',
9182

92-
...ensureLatestDeps,
83+
'eslint@latest',
84+
'eslint-plugin-ember@latest',
85+
'eslint-plugin-n@latest',
86+
'@babel/eslint-parser@latest',
87+
'ember-resolver@latest',
88+
'ember-load-initializers@latest',
9389
// Needed for eslint
9490
'globals',
9591
'babel-plugin-ember-template-compilation',

0 commit comments

Comments
 (0)