js-build-tools 3.0.4 → 4.0.1

package/functions/{bundle.js → bundle.mjs}

@@ -1,16 +1,14 @@
-const browserify = require('browserify')
-const { dest } = require('gulp')
-const gulpConfig = require('../gulp.config.js')
-const source = require('vinyl-source-stream')
+import browserify from 'browserify'
+import { dest } from 'gulp'
+import * as gulpConfig from '../gulp.config.mjs'
+import source from 'vinyl-source-stream'
 
 /**
  * Starting at the distribution entry point, bundle all the files into a single file and store them in the specified output directory.
  * @memberOf module:js-build-tools
  * @returns {stream.Stream}
  */
-const bundle = () => browserify(gulpConfig.get('dist.main'))
+export const bundle = () => browserify(gulpConfig.get('dist.main'))
   .bundle()
   .pipe(source(`${gulpConfig.get('browser.name')}.js`))
   .pipe(dest(gulpConfig.get('browser.to')))
-
-module.exports = bundle

package/functions/{bundle.test.js → bundle.test.mjs}

@@ -1,9 +1,10 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { bundle } from './bundle.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-bundle')
 const gulpConfig = setUp.gulpConfig
-const bundle = require('./bundle')
-const { countMatches } = require('test-filesystem')
 
 const file1Contents = 'function file1 () {\n' +
   '  console.log(\'Hello from file1\')\n' +

package/functions/{bundleLint.js → bundleLint.mjs}

@@ -1,18 +1,16 @@
-const { dest, src } = require('gulp')
-const gulpConfig = require('../gulp.config.js')
-const standard = require('gulp-standard')
+import { dest, src } from 'gulp'
+import * as gulpConfig from '../gulp.config.mjs'
+import standard from 'gulp-standard'
 
 /**
  * Applies Standard code style linting to bundled file.
  * @memberOf module:js-build-tools
  * @returns {stream.Stream}
  */
-const bundleLint = () => src(`${gulpConfig.get('browser.to')}/${gulpConfig.get('browser.name')}.js`)
+export const bundleLint = () => src(`${gulpConfig.get('browser.to')}/${gulpConfig.get('browser.name')}.js`)
   .pipe(standard({ fix: true }))
   .pipe(standard.reporter('default', {
     fix: true,
     quiet: true
   }))
   .pipe(dest(gulpConfig.get('browser.to')))
-
-module.exports = bundleLint

package/functions/{bundleLint.test.js → bundleLint.test.mjs}

@@ -1,9 +1,10 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { bundleLint } from './bundleLint.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-bundle-lint')
 const gulpConfig = setUp.gulpConfig
-const bundleLint = require('./bundleLint')
-const { countMatches } = require('test-filesystem')
 
 const lintableContents = 'const gulpConfig = require("../gulp.config.js");\n' +
   'const { dest, src } = require("gulp");\n' +

package/functions/bundleMinify.mjs

@@ -0,0 +1,9 @@
+import * as gulpConfig from '../gulp.config.mjs'
+import { minifyFor } from './partials/minifyFor.mjs'
+
+/**
+ * Creates the minified bundle file.
+ * @memberOf module:js-build-tools
+ * @returns {*}
+ */
+export const bundleMinify = () => minifyFor(`${gulpConfig.get('browser.to')}/${gulpConfig.get('browser.name')}.js`, gulpConfig.get('browser.to'))

package/functions/bundleMinify.test.mjs

@@ -0,0 +1,15 @@
+import { testHelpers } from './testHelpers.mjs'
+import { bundleMinify } from './bundleMinify.mjs'
+import { minifyFor } from './partials/minifyFor.mjs'
+
+const gulpConfig = testHelpers.gulpConfig
+
+jest.mock('./partials/minifyFor.mjs', () => ({ minifyFor: jest.fn(() => Promise.resolve(true)) }))
+
+describe('bundleMinify', () => {
+  test('calls minifyFor with configurations', () => {
+    expect.assertions(1)
+    bundleMinify()
+    expect(minifyFor).toHaveBeenCalledWith(`${gulpConfig.get('browser.to')}/${gulpConfig.get('browser.name')}.js`, gulpConfig.get('browser.to'))
+  })
+})

package/functions/compileReadme.mjs

@@ -0,0 +1,9 @@
+import { addToReadme, readmeTemplate } from './partials.mjs'
+import { series } from 'gulp'
+
+/**
+ * Generate the README.md file based off of the template, then append the generated documentation.
+ * @memberOf module:js-build-tools
+ * @returns {stream.Stream}
+ */
+export const compileReadme = series(readmeTemplate, addToReadme)

package/functions/{compileReadme.test.js → compileReadme.test.mjs}

@@ -1,9 +1,9 @@
-const compileReadme = require('./compileReadme')
-const { addToReadme, readmeTemplate} = require('./partials')
+import { compileReadme } from './compileReadme.mjs'
+import { addToReadme, readmeTemplate } from './partials.mjs'
 
 const genericFunction = () => Promise.resolve(true)
-jest.mock('./partials/addToReadme', () => jest.fn(genericFunction))
-jest.mock('./partials/readmeTemplate', () => jest.fn(genericFunction))
+jest.mock('./partials/addToReadme.mjs', () => ({ addToReadme: jest.fn(genericFunction) }))
+jest.mock('./partials/readmeTemplate.mjs', () => ({ readmeTemplate: jest.fn(genericFunction) }))
 
 describe('compileReadme', () => {
   test('calls readmeTemplate and addToReadme', done => {

package/functions/copyFonts.mjs

@@ -0,0 +1,9 @@
+import { copyFor } from './partials/copyFor.mjs'
+import * as gulpConfig from '../gulp.config.mjs'
+
+/**
+ * Move the font files into the browser directory.
+ * @memberOf module:js-build-tools
+ * @return {stream.Stream}
+ */
+export const copyFonts = () => copyFor(gulpConfig.get('fonts.from'), gulpConfig.get('fonts.to'))

package/functions/{copyFonts.test.js → copyFonts.test.mjs}

@@ -1,8 +1,9 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { copyFonts } from './copyFonts.mjs'
+
 setUp.setDefaults('test-copy-fonts')
 const gulpConfig = setUp.gulpConfig
-const copyFonts = require('./copyFonts')
 
 const fontContent = 'comic sans'
 

package/functions/default.mjs

@@ -0,0 +1,12 @@
+import { dist } from './dist.mjs'
+import { bundle } from './bundle.mjs'
+import * as gulpConfig from '../gulp.config.mjs'
+import { series } from 'gulp'
+
+/**
+ * Recommended as the default task, runs the simple dist and bundle tasks.
+ * @memberOf module:js-build-tools
+ * @param {function} [done=null]
+ * @returns {stream.Stream}
+ */
+export const defaultCmd = (done = null) => gulpConfig.get('browser.enabled') ? series(dist, bundle)(done) : series(dist)(done)

package/functions/{default.test.js → default.test.mjs}

@@ -1,12 +1,13 @@
-const { setUp } = require('./testHelpers')
-const gulpConfig = setUp.gulpConfig
-const bundle = require('./bundle')
-const dist = require('./dist')
-const defaultCmd = require('./default')
+import { testHelpers } from './testHelpers.mjs'
+import { bundle } from './bundle.mjs'
+import { dist } from './dist.mjs'
+import { defaultCmd } from './default.mjs'
+
+const gulpConfig = testHelpers.gulpConfig
 
 const genericFunction = () => Promise.resolve(true)
-jest.mock('./bundle', () => jest.fn(genericFunction))
-jest.mock('./dist', () => jest.fn(genericFunction))
+jest.mock('./bundle.mjs', () => ({ bundle: jest.fn(genericFunction) }))
+jest.mock('./dist.mjs', () => ({ dist: jest.fn(genericFunction) }))
 
 describe('distMinify', () => {
   test('calls dist for nodeOnly true', done => {

package/functions/{dist.js → dist.mjs}

@@ -1,10 +1,8 @@
-const distFor = require('./partials/distFor.js')
+import { distFor } from './partials/distFor.mjs'
 
 /**
  * Simplified distribution tasks which will use arguments from distFor.
  * @memberOf module:js-build-tools
  * @returns {*}
  */
-const dist = () => distFor()
-
-module.exports = dist
+export const dist = () => distFor()

package/functions/{dist.test.js → dist.test.mjs}

@@ -1,8 +1,9 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { dist } from './dist.mjs'
+
 setUp.setDefaults('test-dist')
 const gulpConfig = setUp.gulpConfig
-const dist = require('./dist')
 
 const rawContents = 'const distFor = require(\'./distFor.js\')\n' +
   '\n' +

package/functions/{distLint.js → distLint.mjs}

@@ -1,18 +1,16 @@
-const gulpConfig = require('../gulp.config.js')
-const { dest, src } = require('gulp')
-const standard = require('gulp-standard')
+import * as gulpConfig from '../gulp.config.mjs'
+import { dest, src } from 'gulp'
+import standard from 'gulp-standard'
 
 /**
  * Applies Standard code style linting to distribution files.
  * @memberOf module:js-build-tools
  * @returns {*}
  */
-const distLint = () => src(gulpConfig.get('browser.from'))
+export const distLint = () => src(gulpConfig.get('browser.from'))
   .pipe(standard({ fix: true }))
   .pipe(standard.reporter('default', {
     fix: true,
     quiet: true
   }))
   .pipe(dest(gulpConfig.get('dist.to')))
-
-module.exports = distLint

package/functions/{distLint.test.js → distLint.test.mjs}

@@ -1,9 +1,10 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { distLint } from './distLint.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-dist-lint')
 const gulpConfig = setUp.gulpConfig
-const distLint = require('./distLint')
-const { countMatches } = require('test-filesystem')
 
 const lintableContents = 'const gulpConfig = require("../gulp.config.js");\n' +
   'const { dest, src } = require("gulp");\n' +

package/functions/distMinify.mjs

@@ -0,0 +1,9 @@
+import * as gulpConfig from '../gulp.config.mjs'
+import { minifyFor } from './partials/minifyFor.mjs'
+
+/**
+ * Creates minified versions of the dist files.
+ * @memberOf module:js-build-tools
+ * @returns {*}
+ */
+export const distMinify = () => minifyFor(gulpConfig.get('browser.from'), gulpConfig.get('dist.to'))

package/functions/distMinify.test.mjs

@@ -0,0 +1,15 @@
+import { testHelpers } from './testHelpers.mjs'
+import { distMinify } from './distMinify.mjs'
+import { minifyFor } from './partials/minifyFor.mjs'
+
+const gulpConfig = testHelpers.gulpConfig
+
+jest.mock('./partials/minifyFor.mjs', () => ({ minifyFor: jest.fn(() => Promise.resolve(true)) }))
+
+describe('distMinify', () => {
+  test('calls minifyFor with configurations', () => {
+    expect.assertions(1)
+    distMinify()
+    expect(minifyFor).toHaveBeenCalledWith(gulpConfig.get('browser.from'), gulpConfig.get('dist.to'))
+  })
+})

package/functions/{images.js → images.mjs}

@@ -1,10 +1,8 @@
-const imagesFor = require('./partials/imagesFor.js')
+import { imagesFor } from './partials/imagesFor.mjs'
 
 /**
  * Move and optimize the images into the browser folder using configured settings.
  * @memberOf module:js-build-tools
  * @return {stream.Stream}
  */
-const images = () => imagesFor()
-
-module.exports = images
+export const images = () => imagesFor()

package/functions/{images.test.js → images.test.mjs}

@@ -1,8 +1,9 @@
-const fs = require('fs')
-const setUp = require('./test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from './test-helpers/setUp.mjs'
+import { images } from './images.mjs'
+
 setUp.setDefaults('test-images')
 const gulpConfig = setUp.gulpConfig
-const images = require('./images')
 
 const imageContents = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n' +
   '<!-- Created with Inkscape (http://www.inkscape.org/) -->\n' +

package/functions/partials/{addToReadme.js → addToReadme.mjs}

@@ -1,7 +1,7 @@
-const fs = require('fs')
-const gulpConfig = require('../../gulp.config.js')
-const jsdoc2md = require('jsdoc-to-markdown')
-const { globSync } = require('glob')
+import fs from 'fs'
+import * as gulpConfig from '../../gulp.config.mjs'
+import jsdoc2md from 'jsdoc-to-markdown'
+import { globSync } from 'glob'
 
 /**
  * Appends all the jsdoc comments to the readme file. Assumes empty or templated file.
@@ -9,10 +9,8 @@ const { globSync } = require('glob')
  * @memberOf module:partials
  * @returns {string|Uint8Array}
  */
-const addToReadme = () => jsdoc2md
+export const addToReadme = () => jsdoc2md
   .render({ files: globSync(gulpConfig.get('readme.from')) })
   .then(
     readme => fs.appendFileSync(gulpConfig.get('readme.to') + gulpConfig.get('readme.file'), readme, gulpConfig.get('readmeOptions'))
   )
-
-module.exports = addToReadme

package/functions/partials/{addToReadme.test.js → addToReadme.test.mjs}

@@ -1,9 +1,10 @@
-const fs = require('fs')
-const setUp = require('../test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from '../test-helpers/setUp.mjs'
+import { addToReadme } from './addToReadme.mjs'
+
 setUp.setDefaults('test-add-to-readme')
 const gulpConfig = setUp.gulpConfig
 gulpConfig.set('dist.from', 'test-temp/src/addToReadme.js')
-const addToReadme = require('./addToReadme')
 
 const rawContents = '/**\n' +
   ' * Say hello with a given name.\n' +

package/functions/partials/beginWatcher.mjs

@@ -0,0 +1,9 @@
+import * as gulpConfig from '../../gulp.config.mjs'
+import { watch } from 'gulp'
+
+/**
+ * Create a chokidar instance which watches and triggers change when the globed files are modified.
+ * @memberOf module:partials
+ * @returns {FSWatcher}
+ */
+export const beginWatcher = () => watch(gulpConfig.get('test.watch'))

package/functions/partials/{beginWatcher.test.js → beginWatcher.test.mjs}

@@ -1,8 +1,9 @@
-const setUp = require('../test-helpers/setUp')
+import * as setUp from '../test-helpers/setUp.mjs'
+import { beginWatcher } from './beginWatcher.mjs'
+import { EventEmitter } from 'node:events'
+
 setUp.setDefaults('test-begin-watcher')
 const gulpConfig = setUp.gulpConfig
-const beginWatcher = require('./beginWatcher')
-const { EventEmitter } = require('node:events')
 
 beforeEach(setUp.beforeEach)
 

package/functions/partials/clean.mjs

@@ -0,0 +1,13 @@
+import * as gulpConfig from '../../gulp.config.mjs'
+import { removeDirectory } from './removeDirectory.mjs'
+
+/**
+ * Deletes all the distribution and browser files (used before create a new build).
+ * Configure array of directories to remove with 'cleanPaths'.
+ * @memberOf module:partials
+ * @returns {Promise<string[]> | *}
+ */
+export const clean = () => gulpConfig.get('cleanPaths').reduce(
+  (promise, path) => promise.then(() => removeDirectory(path)),
+  Promise.resolve()
+)

package/functions/partials/{clean.test.js → clean.test.mjs}

@@ -1,10 +1,11 @@
-const fs = require('fs')
-const setUp = require('../test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from '../test-helpers/setUp.mjs'
+import { clean } from './clean.mjs'
+
 setUp.setDefaults('test-clean')
 const gulpConfig = setUp.gulpConfig
 const srcPath = gulpConfig.get('srcPath')
 gulpConfig.set('cleanPaths', [srcPath])
-const clean = require('./clean')
 
 beforeEach(setUp.beforeEach)
 

package/functions/partials/{copyFor.js → copyFor.mjs}

@@ -1,4 +1,4 @@
-const { dest, src } = require('gulp')
+import { dest, src } from 'gulp'
 
 /**
  * Copy some files to a different location.
@@ -7,7 +7,5 @@ const { dest, src } = require('gulp')
  * @param {string} destPath
  * @returns {stream.Stream}
  */
-const copyFor = (srcPath, destPath) => src(srcPath)
+export const copyFor = (srcPath, destPath) => src(srcPath)
   .pipe(dest(destPath))
-
-module.exports = copyFor

package/functions/partials/{copyFor.test.js → copyFor.test.mjs}

@@ -1,8 +1,9 @@
-const fs = require('fs')
-const setUp = require('../test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from '../test-helpers/setUp.mjs'
+import { copyFor } from './copyFor.mjs'
+
 setUp.setDefaults('test-copy-for')
 const gulpConfig = setUp.gulpConfig
-const copyFor = require('./copyFor')
 
 const fileContents = 'some file contents'
 

package/functions/partials/distFor.mjs

@@ -0,0 +1,22 @@
+import babel from 'gulp-babel'
+import { dest, src } from 'gulp'
+import { distForSrc } from './distForSrc.mjs'
+import * as gulpConfig from '../../gulp.config.mjs'
+import through from 'through2'
+
+/**
+ * Build the distribution for a given source pattern.
+ * @memberOf module:partials
+ * @param {string|array} [srcPath='src/config/path/dist/for']
+ * @param {string} [destPath='dist/config/path']
+ * @returns {stream.Stream}
+ */
+export const distFor = (srcPath = distForSrc(), destPath = gulpConfig.get('dist.to')) => src(srcPath)
+  .pipe(babel())
+  .pipe(through.obj(function (file, enc, callback) {
+    const regex = /\.mjs(['"]\s*\))/gi
+    file.contents = Buffer.from(file.contents.toString().replaceAll(regex, '.js$1'))
+    this.push(file)
+    callback()
+  }))
+  .pipe(dest(destPath))

package/functions/partials/{distFor.test.js → distFor.test.mjs}

@@ -1,10 +1,11 @@
-const fs = require('fs')
-const setUp = require('../test-helpers/setUp')
+import fs from 'fs'
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distFor } from './distFor.mjs'
+import { countMatches, fileExists } from 'test-filesystem'
+import { tsFor } from './tsFor.mjs'
+
 setUp.setDefaults('test-dist-for')
 const gulpConfig = setUp.gulpConfig
-const distFor = require('./distFor')
-const { countMatches } = require('test-filesystem')
-const typeScript = require('../typeScript')
 
 const rawContents = 'const babel = require(\'gulp-babel\')\n' +
   'const { dest, src } = require(\'gulp\')\n' +
@@ -59,6 +60,23 @@ const rawTsContents = '// @ts-ignore\n' +
   '\n' +
   'export default distFor\n'
 
+const rawMjsContents = 'import babel from \'gulp-babel\'\n' +
+  'import { dest, src } from \'gulp\'\n' +
+  'import { distForSrc } from \'./distForSrc.mjs\'\n' +
+  'import * as gulpConfig from \'../../gulp.config.mjs\'\n' +
+  '\n' +
+  '/**\n' +
+  ' * Build the distribution for a given source pattern.\n' +
+  ' * @memberOf module:partials\n' +
+  ' * @param {string|array} [srcPath=\'src/config/path/dist/for\']\n' +
+  ' * @param {string} [destPath=\'dist/config/path\']\n' +
+  ' * @returns {stream.Stream}\n' +
+  ' */\n' +
+  'export const distFor = (srcPath = distForSrc(), destPath = gulpConfig.get(\'dist.to\')) => src(srcPath)\n' +
+  '  .pipe(babel())\n' +
+  '  .pipe((result) => console.log(result) || result)\n' +
+  '  .pipe(dest(destPath))\n'
+
 beforeEach(setUp.beforeEach)
 
 afterEach(setUp.afterEach)
@@ -74,7 +92,7 @@ describe('distFor', () => {
     const distPath = gulpConfig.get('dist.to')
     distFor(srcFile)
       .on('finish', () => {
-        expect(fs.existsSync(distPath)).toBeTruthy()
+        expect(fileExists(distPath)).toBeTruthy()
         const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
         expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
         /* There used to be a nice check here where `const` and `let` would be swapped to `var`, but that no longer
@@ -100,10 +118,12 @@ describe('distFor', () => {
     const oldContents = fs.readFileSync(srcFile).toString()
     expect(countMatches(oldContents, 'const ')).toEqual(3)
     const distPath = gulpConfig.get('dist.to')
-    typeScript(() => {
+    const tsFrom = gulpConfig.get('typescript.from')
+    const tsTo = gulpConfig.get('typescript.to')
+    tsFor(tsFrom, tsTo)(() => {
       distFor()
         .on('finish', () => {
-          expect(fs.existsSync(distPath)).toBeTruthy()
+          expect(fileExists(distPath)).toBeTruthy()
           const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
           expect(countMatches(babelifiedContents, '"use strict"')).toEqual(1)
           expect(countMatches(babelifiedContents, 'const ')).toEqual(0)
@@ -118,4 +138,25 @@ describe('distFor', () => {
         })
     })
   }, 60000)
+
+  test('converts .mjs file extension to .js', done => {
+    const srcPath = gulpConfig.get('srcPath')
+    const srcFile = `${srcPath}/distFor.mjs`
+    fs.writeFileSync(srcFile, rawMjsContents)
+    // expect.assertions(5)
+    const oldContents = fs.readFileSync(srcFile).toString()
+    expect(countMatches(oldContents, '.mjs')).toEqual(2)
+    const distPath = gulpConfig.get('dist.to')
+    distFor(srcFile)
+      .on('finish', () => {
+        expect(fileExists(distPath)).toBeTruthy()
+        const babelifiedContents = fs.readFileSync(`${distPath}/distFor.js`).toString()
+        expect(countMatches(babelifiedContents, '.js')).toEqual(3)
+        done()
+      })
+      .on('error', error => {
+        console.error('Encountered error', error)
+        done()
+      })
+  }, 5000)
 })

package/functions/partials/{distForSrc.js → distForSrc.mjs}

@@ -1,4 +1,4 @@
-const gulpConfig = require('../../gulp.config')
+import * as gulpConfig from '../../gulp.config.mjs'
 
 /**
  * Retrieve the correct distFor search path based on TS Config.
@@ -6,8 +6,6 @@ const gulpConfig = require('../../gulp.config')
  * @param {module:gulpConfig~FlagStringSetting} [useTs='config/for/ts']
  * @returns {string}
  */
-const distForSrc = (useTs = gulpConfig.get('typescript.enabled')) => useTs
+export const distForSrc = (useTs = gulpConfig.get('typescript.enabled')) => useTs
   ? gulpConfig.get('browser.from')
   : gulpConfig.get('dist.from')
-
-module.exports = distForSrc

package/functions/partials/{distForSrc.test.js → distForSrc.test.mjs}

@@ -1,6 +1,7 @@
-const setUp = require('../test-helpers/setUp')
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distForSrc } from './distForSrc.mjs'
+
 const gulpConfig = setUp.gulpConfig
-const distForSrc = require('./distForSrc')
 
 describe('distForSrc', () => {
   test('typescript.enabled as false returns srcSearch', () => {

package/functions/partials/{distSeries.js → distSeries.mjs}

@@ -1,8 +1,8 @@
-const gulpConfig = require('../../gulp.config')
-const distFor = require('./distFor')
-const distForSrc = require('./distForSrc')
-const { series } = require('gulp')
-const tsFor = require('./tsFor')
+import * as gulpConfig from '../../gulp.config.mjs'
+import { distFor } from './distFor.mjs'
+import { distForSrc } from './distForSrc.mjs'
+import { series } from 'gulp'
+import { tsFor } from './tsFor.mjs'
 
 /**
  * When using TypeScript, ensure that we process the ts first then run babel (dist)
@@ -12,12 +12,10 @@ const tsFor = require('./tsFor')
  * @param {string} [tsSearch='ts/search/config/path']
  * @returns {function(null=): stream.Stream}
  */
-const distSeries = (srcPath = distForSrc(), distFinalPath = gulpConfig.get('dist.to'), tsSearch = gulpConfig.get('typescript.from')) => {
+export const distSeries = (srcPath = distForSrc(), distFinalPath = gulpConfig.get('dist.to'), tsSearch = gulpConfig.get('typescript.from')) => {
   const typescript = tsFor(tsSearch, distFinalPath)
   const dist = () => distFor(srcPath, distFinalPath)
   return gulpConfig.get('typescript.enabled')
     ? series(typescript, dist)
     : dist
 }
-
-module.exports = distSeries

package/functions/partials/{distSeries.test.js → distSeries.test.mjs}

@@ -1,13 +1,14 @@
-const setUp = require('../test-helpers/setUp')
+import * as setUp from '../test-helpers/setUp.mjs'
+import { distSeries } from './distSeries.mjs'
+import { tsFor } from './tsFor.mjs'
+import { distFor } from './distFor.mjs'
+
 const gulpConfig = setUp.gulpConfig
-const distSeries = require('./distSeries')
-const tsFor = require('./tsFor')
-const distFor = require('./distFor')
 
 const genericFunction = () => Promise.resolve(true)
 
-jest.mock('./distFor', () => jest.fn(genericFunction))
-jest.mock('./tsFor', () => jest.fn(() => genericFunction))
+jest.mock('./distFor.mjs', () => ({ distFor: jest.fn(genericFunction) }))
+jest.mock('./tsFor.mjs', () => ({ tsFor: jest.fn(() => genericFunction) }))
 
 describe('distSeries', () => {
   test('when not using ts config only returns runnable distFor', done => {