Merge pull request #109 from rollup/gh-95

Allow custom runtime-helpers moduleName
rollup · Dec 13, 2016 · 6ebbbe9 · 6ebbbe9
2 parents 6406fa5 + 1eb55ac
commit 6ebbbe9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/src/preflightCheck.js b/src/preflightCheck.js
@@ -22,7 +22,7 @@ export default function preflightCheck ( options, dir ) {
 
 		if ( !~check.indexOf( 'export default' ) && !~check.indexOf( 'export { Foo as default }' ) ) throw new Error( 'It looks like your Babel configuration specifies a module transformer. Please disable it. See https://github.com/rollup/rollup-plugin-babel#configuring-babel for more information' );
 
-		if ( /import _classCallCheck from ["']babel-runtime/.test( check ) ) helpers = RUNTIME;
+		if ( ~check.indexOf( 'import _classCallCheck from' ) ) helpers = RUNTIME;
 		else if ( ~check.indexOf( 'function _classCallCheck' ) ) helpers = INLINE;
 		else if ( ~check.indexOf( 'babelHelpers' ) ) helpers = BUNDLED;
 

diff --git a/test/samples/runtime-helpers-custom-name/.babelrc b/test/samples/runtime-helpers-custom-name/.babelrc
@@ -0,0 +1,6 @@
+{
+	"presets": [ "es2015-rollup" ],
+	"plugins": [
+		["transform-runtime", { "moduleName": "custom-name" }]
+	]
+}
diff --git a/test/samples/runtime-helpers-custom-name/main.js b/test/samples/runtime-helpers-custom-name/main.js
@@ -0,0 +1,3 @@
+export default class Foo {
+
+}
diff --git a/test/test.js b/test/test.js
@@ -157,6 +157,21 @@ describe( 'rollup-plugin-babel', function () {
 		});
 	});
 
+	it( 'allows transform-runtime to be used with custom moduleName', function () {
+		return rollup.rollup({
+			entry: 'samples/runtime-helpers-custom-name/main.js',
+			plugins: [
+				babelPlugin({ runtimeHelpers: true })
+			],
+			onwarn: function ( msg ) {
+				assert.equal( msg, 'Treating \'custom-name/helpers/classCallCheck\' as external dependency' );
+			}
+		}).then( function ( bundle ) {
+			var cjs = bundle.generate({ format: 'cjs' }).code;
+			assert.ok( !~cjs.indexOf( 'babelHelpers' ) );
+		});
+	});
+
 	it( 'correctly renames helpers (#22)', () => {
 		return rollup.rollup({
 			entry: 'samples/named-function-helper/main.js',