refactor to not need babel, require node 6+

7 files changed, 23 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index deeb78b..3af1d9e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ export PATH := ./node_modules/.bin/:$(PATH):./bin/
 
 PACKAGE = asyncjs
 REQUIRE_NAME = async
-BABEL_NODE = babel-node
 UGLIFY = uglifyjs
 XYZ = support/xyz.sh --repo git@github.com:caolan/async.git
 
@@ -44,14 +43,14 @@ lint:
 build-bundle: build-modules $(UMD_BUNDLE) $(CJS_BUNDLE)
 
 build-modules:
-	$(BABEL_NODE) $(SCRIPTS)/build/modules-cjs.js
+	node $(SCRIPTS)/build/modules-cjs.js
 
 $(UMD_BUNDLE): $(JS_SRC) package.json
 	mkdir -p "$(@D)"
-	$(BABEL_NODE) $(SCRIPTS)/build/aggregate-bundle.js
+	node $(SCRIPTS)/build/aggregate-bundle.js
 
 $(CJS_BUNDLE): $(JS_SRC) package.json
-	$(BABEL_NODE) $(SCRIPTS)/build/aggregate-cjs.js
+	node $(SCRIPTS)/build/aggregate-cjs.js
 
 # Create the minified UMD versions and copy them to dist/ for bower
 build-dist: $(DIST) $(UMD_BUNDLE) $(UMD_BUNDLE_MIN) $(DIST)/async.js $(DIST)/async.min.js
diff --git a/support/build/aggregate-build.js b/support/build/aggregate-build.js
index 7269291..54ccf96 100644
--- a/support/build/aggregate-build.js
+++ b/support/build/aggregate-build.js
@@ -1,8 +1,8 @@
-import compileModules from './compile-modules';
-import {rollup} from 'rollup';
-import rimraf from 'rimraf/rimraf';
+const compileModules = require('./compile-modules');
+const {rollup} = require('rollup');
+const rimraf = require('rimraf/rimraf');
 
-export default function buildBundle(options) {
+module.exports = function buildBundle(options) {
     function bundle() {
         rollup({
             entry: options.outpath + '/index.js'
diff --git a/support/build/aggregate-bundle.js b/support/build/aggregate-bundle.js
index 482bfcd..a933033 100644
--- a/support/build/aggregate-bundle.js
+++ b/support/build/aggregate-bundle.js
@@ -1,4 +1,4 @@
-import aggregateBuild from './aggregate-build';
+const aggregateBuild = require('./aggregate-build');
 
 aggregateBuild({
     es6: true,
diff --git a/support/build/aggregate-cjs.js b/support/build/aggregate-cjs.js
index 077ca49..4b6896f 100644
--- a/support/build/aggregate-cjs.js
+++ b/support/build/aggregate-cjs.js
@@ -1,4 +1,4 @@
-import aggregateBuild from './aggregate-build';
+const aggregateBuild = require('./aggregate-build');
 
 aggregateBuild({
     es6: true,
diff --git a/support/build/compile-modules.js b/support/build/compile-modules.js
index 16aa1ca..00e7381 100644
--- a/support/build/compile-modules.js
+++ b/support/build/compile-modules.js
@@ -1,14 +1,14 @@
-import async from '../../lib';
-import {transformFile} from 'babel-core';
-import _ from 'lodash';
-import readdirR from 'recursive-readdir';
-import pluginCJS from 'babel-plugin-transform-es2015-modules-commonjs';
-import pluginModuleExports from 'babel-plugin-add-module-exports';
-import pluginLodashImportRename from './plugin-lodash-import-rename';
-import {join as joinPath} from 'path';
-import fs from 'fs-extra';
+const async = require('async');
+const {transformFile} = require('babel-core');
+const _ = require('lodash');
+const readdirR = require('recursive-readdir');
+const pluginCJS = require('babel-plugin-transform-es2015-modules-commonjs');
+const pluginModuleExports = require('babel-plugin-add-module-exports');
+const pluginLodashImportRename = require('./plugin-lodash-import-rename');
+const joinPath = require('path').join;
+const fs = require('fs-extra');
 
-export default function(cb, options) {
+module.exports = function(cb, options) {
     options = _.defaults({}, options, {
         path:'lib/',
         outpath:'build',
diff --git a/support/build/modules-cjs.js b/support/build/modules-cjs.js
index 09632ff..3ae9a8b 100644
--- a/support/build/modules-cjs.js
+++ b/support/build/modules-cjs.js
@@ -1,3 +1,3 @@
-import compileModules from './compile-modules';
+const compileModules = require('./compile-modules');
 
 compileModules(function() {}, {es6: false});
diff --git a/support/build/plugin-lodash-import-rename.js b/support/build/plugin-lodash-import-rename.js
index 6fe893b..b14304f 100644
--- a/support/build/plugin-lodash-import-rename.js
+++ b/support/build/plugin-lodash-import-rename.js
@@ -1,7 +1,7 @@
-import _ from 'lodash';
-import {dirname, sep} from 'path';
+const _ = require('lodash');
+const {dirname, sep} = require('path');
 
-export default function() {
+module.exports = function() {
     return {
         visitor: {