Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Use setupPreprocessorRegistry() hook to register HTMLBars AST plugin" #359

Merged
merged 2 commits into from
Apr 18, 2019
Merged

Revert "Use setupPreprocessorRegistry() hook to register HTMLBars AST plugin" #359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4134746
Revert "Use `setupPreprocessorRegistry()` hook to register HTMLBars A…
Turbo87 Apr 18, 2019
f5956d4
Rename `included()` parameter to `appOrParent`
Turbo87 Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,44 @@ module.exports = {
}
},

setupPreprocessorRegistry(type, registry) {
if (type === 'parent') {
this._assignOptions(this.app);

let pluginFnName = this._stripTestSelectors ? '_buildStripPlugin' : '_buildHashParamPlugin';

let plugin = this[pluginFnName]();
plugin.parallelBabel = {
requireFile: __filename,
buildUsing: pluginFnName,
params: {},
};
_setupPreprocessorRegistry(registry) {
let pluginFnName = this._stripTestSelectors ? '_buildStripPlugin' : '_buildHashParamPlugin';

let plugin = this[pluginFnName]();
plugin.parallelBabel = {
requireFile: __filename,
buildUsing: pluginFnName,
params: {},
};

registry.add('htmlbars-ast-plugin', plugin);
}
registry.add('htmlbars-ast-plugin', plugin);
},

included(app) {
included(appOrParent) {
this._super.included.apply(this, arguments);

let host = this._findHost();
this._assignOptions(host);

// we can't use the setupPreprocessorRegistry() hook as it is called too
// early and we do not have reliable access to `app.tests` there yet
this._setupPreprocessorRegistry(appOrParent.registry);

// add the StripDataTestPropertiesPlugin to the list of plugins used by
// the `ember-cli-babel` addon
if (this._stripTestSelectors && !this._registeredWithBabel) {
let checker = new VersionChecker(this.parent).for('ember-cli-babel', 'npm');

app.options = app.options || {};
appOrParent.options = appOrParent.options || {};

if (checker.satisfies('^5.0.0')) {
app.options.babel = app.options.babel || {};
app.options.babel.plugins = app.options.babel.plugins || [];
app.options.babel.plugins.push(require('./strip-data-test-properties-plugin'));
appOrParent.options.babel = appOrParent.options.babel || {};
appOrParent.options.babel.plugins = appOrParent.options.babel.plugins || [];
appOrParent.options.babel.plugins.push(require('./strip-data-test-properties-plugin'));
} else if (checker.satisfies('^6.0.0-beta.1') || checker.satisfies('^7.0.0')) {
app.options.babel6 = app.options.babel6 || {};
app.options.babel6.plugins = app.options.babel6.plugins || [];
app.options.babel6.plugins.push(require.resolve('./strip-data-test-properties-plugin6'));
appOrParent.options.babel6 = appOrParent.options.babel6 || {};
appOrParent.options.babel6.plugins = appOrParent.options.babel6.plugins || [];
appOrParent.options.babel6.plugins.push(require.resolve('./strip-data-test-properties-plugin6'));
} else {
this.ui.writeWarnLine('ember-test-selectors: You are using an unsupported ember-cli-babel version. data-test ' +
'properties are not automatically stripped from your JS code.');
Expand All @@ -71,7 +74,7 @@ module.exports = {
}

if (!this._stripTestSelectors) {
this.app.import('vendor/ember-test-selectors/patch-component.js');
host.import('vendor/ember-test-selectors/patch-component.js');
}
},

Expand Down