Skip to content

Commit 99318eb

Browse files
authored
Merge pull request ember-learn#350 from ember-learn/dont-break-auto-import
Don't blow away the host's auto-import config
2 parents 8896149 + b11f84b commit 99318eb

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

index.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ module.exports = {
9191
includer.options.includehighlightJS = false;
9292
includer.options.includeHighlightStyle = false;
9393
includer.options.snippetExtensions = ['js', 'css', 'scss', 'hbs', 'md', 'text', 'json', 'handlebars', 'htmlbars', 'html', 'diff'];
94-
includer.options.autoImport = {
95-
exclude: [ 'qunit' ]
96-
};
9794

9895
// This must come after we add our own options above, or else other addons won't see them.
9996
this._super.included.apply(this, arguments);

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
"eslint-plugin-node": "^7.0.1",
123123
"loader.js": "^4.7.0",
124124
"mocha": "^6.0.2",
125-
"qunit": "^2.6.2",
126125
"qunit-dom": "^0.8.4"
127126
},
128127
"resolutions": {

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10448,7 +10448,7 @@ qunit-dom@^0.8.4:
1044810448
broccoli-funnel "^2.0.0"
1044910449
broccoli-merge-trees "^3.0.1"
1045010450

10451-
qunit@^2.6.2, qunit@~2.6.0:
10451+
qunit@~2.6.0:
1045210452
version "2.6.2"
1045310453
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.2.tgz#551210c5cf857258a4fe39a7fe15d9e14dfef22c"
1045410454
integrity sha512-PHbKulmd4rrDhFto7iHicIstDTX7oMRvAcI7loHstvU8J7AOGwzcchONmy+EG4KU8HDk0K90o7vO0GhlYyKlOg==

0 commit comments

Comments
 (0)