Merge branch 'master' into gh-actions

dfreeman · web-flow · commit 3b03a82a92df · 2019-11-14T16:37:04.000+01:00
diff --git a/ts/addon.ts b/ts/addon.ts
@@ -185,7 +185,7 @@ export default addon({
   _addBabelPluginIfNotPresent(pluginName: string, pluginOptions?: AddPluginOptions) {
     let target = this._getConfigurationTarget();
     if (!hasPlugin(target, pluginName)) {
-      addPlugin(target, pluginName, pluginOptions);
+      addPlugin(target, require.resolve(pluginName), pluginOptions);
     }
   },
 

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ export default addon({`
`185`	`185`	`_addBabelPluginIfNotPresent(pluginName: string, pluginOptions?: AddPluginOptions) {`
`186`	`186`	`let target = this._getConfigurationTarget();`
`187`	`187`	`if (!hasPlugin(target, pluginName)) {`
`188`		`- addPlugin(target, pluginName, pluginOptions);`
	`188`	`+ addPlugin(target, require.resolve(pluginName), pluginOptions);`
`189`	`189`	`}`
`190`	`190`	`},`
`191`	`191`