Merge pull request #49 from ianwalter/fix-48

Inlining ky instead of promise-complete

dist/dist.js

@@ -9,7 +9,7 @@ var cjsPlugin = _interopDefault(require('rollup-plugin-commonjs'));
 var nodeResolvePlugin = _interopDefault(require('rollup-plugin-node-resolve'));
 var jsonPlugin = _interopDefault(require('rollup-plugin-json'));
 var npmShortName = _interopDefault(require('@ianwalter/npm-short-name'));
-var babel = _interopDefault(require('rollup-plugin-babel'));
+var babelPlugin = _interopDefault(require('rollup-plugin-babel'));
 var requireFromString = _interopDefault(require('require-from-string'));
 
 async function dist (options) {
@@ -69,6 +69,14 @@ async function dist (options) {
     ...dependencies.filter(d => inlineDependencies.indexOf(d) === -1)
   ];
 
+  // Set the default babel config.
+  const babelConfig = {
+    runtimeHelpers: true,
+    externalHelpers: true,
+    babelrc: false,
+    ...pkg.babel
+  };
+
   // Determine which Rollup plugins should be used.
   const rollupPlugins = [
     // Allows dependencies to be bundled:
@@ -78,7 +86,7 @@ async function dist (options) {
     // Allows JSON to be imported:
     jsonPlugin(),
     // Allows source to be transpiled with babel:
-    ...(options.babel ? [babel({ runtimeHelpers: true })] : []),
+    ...(options.babel ? [babelPlugin(babelConfig)] : []),
     // Allow users to pass in their own rollup plugins:
     ...plugins
   ];

index.js

@@ -5,7 +5,7 @@ import cjsPlugin from 'rollup-plugin-commonjs'
 import nodeResolvePlugin from 'rollup-plugin-node-resolve'
 import jsonPlugin from 'rollup-plugin-json'
 import npmShortName from '@ianwalter/npm-short-name'
-import babel from 'rollup-plugin-babel'
+import babelPlugin from 'rollup-plugin-babel'
 import requireFromString from 'require-from-string'
 
 export default async function dist (options) {
@@ -65,6 +65,14 @@ export default async function dist (options) {
     ...dependencies.filter(d => inlineDependencies.indexOf(d) === -1)
   ]
 
+  // Set the default babel config.
+  const babelConfig = {
+    runtimeHelpers: true,
+    externalHelpers: true,
+    babelrc: false,
+    ...pkg.babel
+  }
+
   // Determine which Rollup plugins should be used.
   const rollupPlugins = [
     // Allows dependencies to be bundled:
@@ -74,7 +82,7 @@ export default async function dist (options) {
     // Allows JSON to be imported:
     jsonPlugin(),
     // Allows source to be transpiled with babel:
-    ...(options.babel ? [babel({ runtimeHelpers: true })] : []),
+    ...(options.babel ? [babelPlugin(babelConfig)] : []),
     // Allow users to pass in their own rollup plugins:
     ...plugins
   ]

package.json

@@ -39,6 +39,7 @@
     "test": "ava"
   },
   "dependencies": {
+    "@babel/core": "^7.2.2",
     "@ianwalter/npm-short-name": "^1.0.0",
     "@ianwalter/promise-complete": "^3.0.1",
     "chalk": "^2.4.2",
@@ -53,6 +54,8 @@
     "rollup-plugin-node-resolve": "^4.0.0"
   },
   "devDependencies": {
+    "@babel/runtime": "^7.3.1",
+    "@ianwalter/babel-preset-lib": "^1.1.0",
     "@ianwalter/execa-helper": "^1.0.0",
     "ava": "^1.2.1",
     "common-tags": "^1.8.0",
@@ -63,11 +66,21 @@
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
+    "ky": "^0.8.0",
     "np": "^3.1.0",
     "postcss": "^7.0.14",
     "rollup-plugin-vue": "^4.7.1",
     "vue-template-compiler": "^2.6.4"
   },
+  "babel": {
+    "env": {
+      "test": {
+        "presets": [
+          "@ianwalter/lib"
+        ]
+      }
+    }
+  },
   "eslintConfig": {
     "root": true,
     "extends": [

test/cli.test.js

@@ -3,6 +3,7 @@ import test from 'ava'
 import execaHelper from '@ianwalter/execa-helper'
 
 const withCli = execaHelper('./cli.js')
+const withCnt = execaHelper('./cli.js', false)
 
 test('cjs file not generated when --no-cjs passed', withCli, async (t, cli) => {
   const input = 'test/fixtures/exportDefaultFunction.js'
@@ -12,7 +13,7 @@ test('cjs file not generated when --no-cjs passed', withCli, async (t, cli) => {
   t.snapshot(readFileSync(esm, 'utf8'))
 })
 
-test('dist file is transpiled when --babel passed', withCli, async (t, cli) => {
+test('dist file is transpiled when --babel passed', withCnt, async (t, cli) => {
   const input = 'test/fixtures/exportDefaultNewExpression.js'
   const cjs = 'tmp/two.js'
   const { stdout } = await cli('-i', input, '--cjs', cjs, '--babel')

test/dist.test.js

@@ -56,6 +56,6 @@ test('dist bundles specified imports with module into dist files', async t => {
   const name = 'exportObjectWithImports'
   const input = join(__dirname, `fixtures/${name}.js`)
   const cjs = join(output, `${name}.js`)
-  const inline = '@ianwalter/promise-complete'
-  t.snapshot(await dist({ name, input, output, cjs, inline }))
+  const babel = true
+  t.snapshot(await dist({ name, input, output, cjs, inline: 'ky', babel }))
 })

test/fixtures/exportObjectWithImports.js

@@ -1,9 +1,9 @@
 import npmShortName from '@ianwalter/npm-short-name'
-import promiseComplete from '@ianwalter/promise-complete'
+import ky from 'ky'
 import greeting from './exportDefaultFunction'
 
 export {
   npmShortName,
   greeting,
-  promiseComplete
+  ky
 }

test/snapshots/cli.test.js.md

@@ -173,7 +173,13 @@ Generated by [AVA](https://ava.li).
 
     `'use strict';␊
     ␊
-    class SomeClass {}␊
+    function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }␊
+    ␊
+    var _classCallCheck = _interopDefault(require('@babel/runtime/helpers/classCallCheck'));␊
+    ␊
+    var SomeClass = function SomeClass() {␊
+      _classCallCheck(this, SomeClass);␊
+    };␊
     ␊
     var exportDefaultNewExpression = new SomeClass();␊
     ␊