js-build-tools 3.0.4 → 4.0.1

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

@@ -1,13 +1,7 @@
-const cache = require('gulp-cache')
-const { dest, src } = require('gulp')
-const gulpConfig = require('../../gulp.config.js')
-
-let imagemin = (content) => content
-try {
-  imagemin = require('../../vendor/gulp-imagemin').default
-} catch (e) {
-  // It didn't get created yet
-}
+import cache from 'gulp-cache'
+import { dest, src } from 'gulp'
+import * as gulpConfig from '../../gulp.config.mjs'
+import imagemin from 'gulp-imagemin'
 
 /**
  * Move and optimize images into the browser directory.
@@ -16,7 +10,7 @@ try {
  * @param {string} [imageDest=dest/image/folder]
  * @return {stream.Stream}
  */
-const imagesFor = (imageSrc = gulpConfig.get('images.from'), imageDest = gulpConfig.get('images.to')) =>
+export const imagesFor = (imageSrc = gulpConfig.get('images.from'), imageDest = gulpConfig.get('images.to')) =>
   src(imageSrc)
     .pipe(
       // Caching images that ran through imagemin
@@ -29,5 +23,3 @@ const imagesFor = (imageSrc = gulpConfig.get('images.from'), imageDest = gulpCon
       )
     )
     .pipe(dest(imageDest))
-
-module.exports = imagesFor

package/functions/partials/{imagesFor.test.js → imagesFor.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 { imagesFor } from './imagesFor.mjs'
+
 setUp.setDefaults('test-images-for')
 const gulpConfig = setUp.gulpConfig
-const imagesFor = require('./imagesFor.js')
 
 const imageContents = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n' +
   '<!-- Created with Inkscape (http://www.inkscape.org/) -->\n' +

package/functions/partials/minifyFor.mjs

@@ -0,0 +1,15 @@
+import { dest, src } from 'gulp'
+import { default as gulpUglify } from 'gulp-uglify-es'
+import rename from 'gulp-rename'
+
+const uglify = gulpUglify.hasOwnProperty('default') ? gulpUglify.default : gulpUglify
+
+/**
+ * Minify files and rename the output with '.min' extension.
+ * @memberOf module:partials
+ * @returns {*}
+ */
+export const minifyFor = (srcSearch, destination) => src(srcSearch)
+  .pipe(uglify())
+  .pipe(rename({ extname: '.min.js' }))
+  .pipe(dest(destination))

package/functions/partials/{minifyFor.test.js → minifyFor.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 { minifyFor } from './minifyFor.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-minify-for')
 const gulpConfig = setUp.gulpConfig
-const minifyFor = require('./minifyFor')
-const { countMatches } = require('test-filesystem')
 
 const rawContents = 'const { dest, src } = require(\'gulp\')\n' +
   'const { default: uglify } = require(\'gulp-uglify-es\')\n' +

package/functions/partials/readmeTemplate.mjs

@@ -0,0 +1,12 @@
+import { dest, src } from 'gulp'
+import * as gulpConfig from '../../gulp.config.mjs'
+import rename from 'gulp-rename'
+
+/**
+ * Copy a readme template into the README.md file.
+ * @memberOf module:partials
+ * @returns {*}
+ */
+export const readmeTemplate = () => src(gulpConfig.get('readme.template'))
+  .pipe(rename(gulpConfig.get('readme.file')))
+  .pipe(dest(gulpConfig.get('readme.to')))

package/functions/partials/{readmeTemplate.test.js → readmeTemplate.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 { readmeTemplate } from './readmeTemplate.mjs'
+
 setUp.setDefaults('test-readme-template')
 const gulpConfig = setUp.gulpConfig
-const readmeTemplate = require('./readmeTemplate')
 
 const mainMd = 'MAIN.md'
 const mainTestPath = gulpConfig.get('readme.template')

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

@@ -1,4 +1,4 @@
-const { rm, exists } = require('fs')
+import { rm, exists } from 'fs'
 
 /**
  * Return a promise to be completed once the specified directory is deleted.
@@ -6,7 +6,7 @@ const { rm, exists } = require('fs')
  * @param {string} dirPath
  * @returns {Promise<*>}
  */
-const removeDirectory = dirPath => new Promise(
+export const removeDirectory = dirPath => new Promise(
   (resolve, reject) => exists(
     dirPath,
     doesExist => doesExist
@@ -18,5 +18,3 @@ const removeDirectory = dirPath => new Promise(
       : resolve(dirPath)
   )
 )
-
-module.exports = removeDirectory

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

@@ -1,28 +1,28 @@
-const fs = require('fs')
-const removeDirectory = require('./removeDirectory')
-
-describe('removeDirectory', () => {
-  test('able to delete the remove-directory',  async () => {
-    const dirPath = 'remove-directory'
-    fs.mkdirSync(dirPath)
-    expect(fs.existsSync(dirPath)).toBeTruthy()
-    await removeDirectory(dirPath)
-    expect(fs.existsSync(dirPath)).toBeFalsy()
-  })
-
-  test('able to delete directory with sub-directories',  async () => {
-    const dirPath = 'remove-directory'
-    fs.mkdirSync(dirPath)
-    const subDir = `${dirPath}/sub`
-    fs.mkdirSync(subDir)
-    expect(fs.existsSync(subDir)).toBeTruthy()
-    await removeDirectory(dirPath)
-    expect(fs.existsSync(subDir)).toBeFalsy()
-  })
-
-  test('ends cleanly if directory does not exist',  async () => {
-    const dirPath = 'remove-directory'
-    expect(fs.existsSync(dirPath)).toBeFalsy()
-    expect(await removeDirectory(dirPath)).toBe(dirPath)
-  })
-})
+import fs from 'fs'
+import { removeDirectory } from './removeDirectory.mjs'
+
+describe('removeDirectory', () => {
+  test('able to delete the remove-directory', async () => {
+    const dirPath = 'remove-directory'
+    fs.mkdirSync(dirPath)
+    expect(fs.existsSync(dirPath)).toBeTruthy()
+    await removeDirectory(dirPath)
+    expect(fs.existsSync(dirPath)).toBeFalsy()
+  })
+
+  test('able to delete directory with sub-directories', async () => {
+    const dirPath = 'remove-directory'
+    fs.mkdirSync(dirPath)
+    const subDir = `${dirPath}/sub`
+    fs.mkdirSync(subDir)
+    expect(fs.existsSync(subDir)).toBeTruthy()
+    await removeDirectory(dirPath)
+    expect(fs.existsSync(subDir)).toBeFalsy()
+  })
+
+  test('ends cleanly if directory does not exist', async () => {
+    const dirPath = 'remove-directory'
+    expect(fs.existsSync(dirPath)).toBeFalsy()
+    expect(await removeDirectory(dirPath)).toBe(dirPath)
+  })
+})

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

@@ -1,8 +1,8 @@
-const gulpConfig = require('../../gulp.config.js')
-const bundle = require('../bundle')
-const distSeries = require('./distSeries')
-const { parallel, series } = require('gulp')
-const testQuick = require('../testQuick')
+import * as gulpConfig from '../../gulp.config.mjs'
+import { bundle } from '../bundle.mjs'
+import { distSeries } from './distSeries.mjs'
+import { parallel, series } from 'gulp'
+import { testQuick } from '../testQuick.mjs'
 
 /**
  * Run this function when the watched files are modified.
@@ -29,7 +29,7 @@ const testQuick = require('../testQuick')
  * @param {string} path
  * @returns {stream.Stream}
  */
-const runOnChange = path => {
+export const runOnChange = path => {
   const useTs = gulpConfig.get('typescript.enabled')
   const distPath = gulpConfig.get('dist.to')
   const srcPath = gulpConfig.get('srcPath')
@@ -52,5 +52,3 @@ const runOnChange = path => {
     ? parallel(testQuick, series(runSeries, bundle))()
     : series(testQuick, runSeries)()
 }
-
-module.exports = runOnChange

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

@@ -1,19 +1,20 @@
-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 { distFor } from './distFor.mjs'
+import { runOnChange } from './runOnChange.mjs'
+import { tsFor } from './tsFor.mjs'
+import { testQuick } from '../testQuick.mjs'
+
 setUp.setDefaults('test-run-on-change')
 const gulpConfig = setUp.gulpConfig
-const bundle = require('../bundle')
-const distFor = require('./distFor')
-const runOnChange = require('./runOnChange')
-const tsFor = require('./tsFor')
-const testQuick = require('../testQuick')
 
 const genericFunction = () => Promise.resolve(true)
 
-jest.mock('../bundle', () => jest.fn(genericFunction))
-jest.mock('./distFor', () => jest.fn(genericFunction))
-jest.mock('./tsFor', () => jest.fn(() => genericFunction))
-jest.mock('../testQuick', () => jest.fn(genericFunction))
+jest.mock('../bundle.mjs', () => ({ bundle: jest.fn(genericFunction) }))
+jest.mock('./distFor.mjs', () => ({ distFor: jest.fn(genericFunction) }))
+jest.mock('./tsFor.mjs', () => ({ tsFor: jest.fn(() => genericFunction) }))
+jest.mock('../testQuick.mjs', () => ({ testQuick: jest.fn(genericFunction) }))
 
 const rawContents = 'export function sayHello(name: string) {\n' +
   '  return `Hello from ${name}`;\n' +

package/functions/partials/sassFor.mjs

@@ -0,0 +1,22 @@
+import { dest, src } from 'gulp'
+import * as gulpConfig from '../../gulp.config.mjs'
+import cssnano from 'gulp-cssnano'
+import rename from 'gulp-rename'
+import * as sass from 'sass'
+import { default as gulpSass } from 'gulp-sass'
+
+const runSass = gulpSass(sass)
+
+/**
+ * Build the CSS for a given source pattern.
+ * @memberOf module:partials
+ * @param {string|array} [srcSearch='src/config/path/sass/for']
+ * @param {string} [cssPath='css/config/path']
+ * @returns {stream.Stream}
+ */
+export const sassFor = (srcSearch = gulpConfig.get('sass.from'), cssPath = gulpConfig.get('sass.to')) => src(srcSearch)
+  .pipe(runSass().on('error', runSass.logError)) // Passes it through a gulp-sass, log errors to console
+  .pipe(dest(cssPath))
+  .pipe(cssnano())
+  .pipe(rename({ extname: '.min.css' }))
+  .pipe(dest(cssPath))

package/functions/partials/{sassFor.test.js → sassFor.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 { sassFor } from './sassFor.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-sass-for')
 const gulpConfig = setUp.gulpConfig
-const sassFor = require('./sassFor')
-const { countMatches } = require('test-filesystem')
 
 const sassContents = 'html\n' +
   '  font-size: 62.5%\n' +

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

@@ -1,6 +1,6 @@
-const { dest, parallel, src } = require('gulp')
-const gulpConfig = require('../../gulp.config.js')
-const ts = require('gulp-typescript')
+import { dest, parallel, src } from 'gulp'
+import * as gulpConfig from '../../gulp.config.mjs'
+import ts from 'gulp-typescript'
 
 /**
  * Starting at the source directory, find all the ts files and convert them into the distribution directory.
@@ -10,12 +10,10 @@ const ts = require('gulp-typescript')
  * @returns {Function}
  * @see `https://www.typescriptlang.org/docs/handbook/gulp.html` for more info
  */
-const tsFor = (srcPath = gulpConfig.get('typescript.from'), distPath = gulpConfig.get('typescript.to')) => {
+export const tsFor = (srcPath = gulpConfig.get('typescript.from'), distPath = gulpConfig.get('typescript.to')) => {
   const declarationProject = ts.createProject(gulpConfig.get('typescript.config'))
   const tsProject = ts.createProject(gulpConfig.get('typescript.config'))
   const makeDeclarations = () => src(srcPath).pipe(declarationProject()).dts.pipe(dest(distPath))
   const compileJS = () => src(srcPath).pipe(tsProject()).js.pipe(dest(distPath))
   return parallel(makeDeclarations, compileJS)
 }
-
-module.exports = tsFor

package/functions/partials/{tsFor.test.js → tsFor.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 { tsFor } from './tsFor.mjs'
+import { countMatches } from 'test-filesystem'
+
 setUp.setDefaults('test-ts-for')
 const gulpConfig = setUp.gulpConfig
-const tsFor = require('./tsFor')
-const { countMatches } = require('test-filesystem')
 
 const rawContents = 'export function sayHello(name: string) {\n' +
   '  return `Hello from ${name}`;\n' +

package/functions/partials.mjs

@@ -0,0 +1,23 @@
+/**
+ * Micro-functions used as components for the main gulp functions.
+ * @file
+ * @author Joshua Heagle <joshuaheagle@gmail.com>
+ * @version 3.0.0
+ * @module partials
+ * @memberOf module:js-build-tools
+ */
+
+export { addToReadme } from './partials/addToReadme.mjs'
+export { beginWatcher } from './partials/beginWatcher.mjs'
+export { clean } from './partials/clean.mjs'
+export { copyFor } from './partials/copyFor.mjs'
+export { distFor } from './partials/distFor.mjs'
+export { distForSrc } from './partials/distForSrc.mjs'
+export { distSeries } from './partials/distSeries.mjs'
+export { imagesFor } from './partials/imagesFor.mjs'
+export { minifyFor } from './partials/minifyFor.mjs'
+export { readmeTemplate } from './partials/readmeTemplate.mjs'
+export { removeDirectory } from './partials/removeDirectory.mjs'
+export { runOnChange } from './partials/runOnChange.mjs'
+export { sassFor } from './partials/sassFor.mjs'
+export { tsFor } from './partials/tsFor.mjs'

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

@@ -1,4 +1,4 @@
-const partials = require('./partials')
+import * as partials from './partials.mjs'
 
 describe('partials', () => {
   test('is object with all partial exports', () => {

package/functions/sass.mjs

@@ -0,0 +1,4 @@
+import { sassFor } from './partials/sassFor.mjs'
+
+// Compile sass into CSS & auto-inject into browsers
+export const sass = () => sassFor()

package/functions/{sass.test.js → sass.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 { sass } from './sass.mjs'
+
 setUp.setDefaults('test-sass')
 const gulpConfig = setUp.gulpConfig
-const sass = require('./sass')
 
 beforeEach(() => setUp.beforeEach().then(
   () => {

package/functions/test-helpers/{setUp.js → setUp.mjs}

@@ -1,6 +1,6 @@
 // Import the configurations and override some of them to direct to the temp directory.
-const gulpConfig = require('../../gulp.config.js')
-const { setUp } = require('test-filesystem')
+import * as gulpConfig from '../../gulp.config.mjs'
+import * as setUp from 'test-filesystem'
 
 let tempDir = 'test-temp/'
 let srcPath = `${tempDir}src`
@@ -10,7 +10,7 @@ let srcPath = `${tempDir}src`
  * @memberOf module:testHelpers
  * @param {string} testDir
  */
-const setDefaults = (testDir = 'test-temp') => {
+export const setDefaults = (testDir = 'test-temp') => {
   tempDir = `${testDir}/`
   srcPath = `${tempDir}src`
   setUp.setDefaults(tempDir)
@@ -40,28 +40,26 @@ const setDefaults = (testDir = 'test-temp') => {
   gulpConfig.set('test.watch', `${srcPath}/**/*.js`)
 }
 
-exports.setDefaults = setDefaults
+export { gulpConfig, setUp }
 
-exports.gulpConfig = gulpConfig
-
-/**
- * Ensure that the del has completed, recursively attempt to delete and recreate
- * @memberOf module:testHelpers
- * @param {boolean} [exists=true]
- * @returns {Promise<*|void>}
- */
-exports.createTempDir = setUp.createTempDir
-
-/**
- * In the Jest.beforeEach function call this one to set up the temp directory.
- * @memberOf module:testHelpers
- * @returns {Promise<*|void>}
- */
-exports.beforeEach = setUp.beforeEach
-
-/**
- * In the Jest.afterEach function call this one to clean up and remove the temp directory.
- * @memberOf module:testHelpers
- * @returns {Promise<*>}
- */
-exports.afterEach = setUp.afterEach
+export {
+  /**
+   * Ensure that the del has completed, recursively attempt to delete and recreate
+   * @memberOf module:testHelpers
+   * @param {boolean} [exists=true]
+   * @returns {Promise<*|void>}
+   */
+    createTempDir,
+  /**
+   * In the Jest.beforeEach function call this one to set up the temp directory.
+   * @memberOf module:testHelpers
+   * @returns {Promise<*|void>}
+   */
+    beforeEach,
+  /**
+   * In the Jest.afterEach function call this one to clean up and remove the temp directory.
+   * @memberOf module:testHelpers
+   * @returns {Promise<*>}
+   */
+    afterEach
+} from 'test-filesystem'

package/functions/test-helpers/setUp.test.mjs

@@ -0,0 +1,19 @@
+import { afterEach, createTempDir, gulpConfig, setDefaults } from './setUp.mjs'
+import fs from 'fs'
+
+setDefaults()
+
+describe('setUp', () => {
+  test('able to create the test-temp/src directory', async () => {
+    const srcPath = gulpConfig.get('srcPath')
+    expect(fs.existsSync(srcPath)).toBeFalsy()
+    await createTempDir()
+    expect(fs.existsSync(srcPath)).toBeTruthy()
+  })
+
+  test('able to delete the test-temp/src directory', async () => {
+    expect(fs.existsSync(gulpConfig.get('srcPath'))).toBeTruthy()
+    await afterEach()
+    expect(fs.existsSync(gulpConfig.get('srcPath'))).toBeFalsy()
+  })
+})

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

@@ -1,5 +1,5 @@
-const gulpConfig = require('../gulp.config.js')
-const { runCLI } = require('jest')
+import * as gulpConfig from '../gulp.config.mjs'
+import { default as jest } from 'jest'
 
 /**
  * Run all tests with jest.
@@ -7,13 +7,11 @@ const { runCLI } = require('jest')
  * @memberOf module:js-build-tools
  * @returns {Promise<*>}
  */
-const testFull = () => {
+export const testFull = () => {
   let testPath = gulpConfig.get('test.path')
   if (!Array.isArray(testPath)) {
     // The testPath must be an array of strings
     testPath = [testPath]
   }
-  return runCLI(gulpConfig.get('test.options'), testPath)
+  return jest.runCLI(gulpConfig.get('test.options'), testPath)
 }
-
-module.exports = testFull

package/functions/testFull.test.mjs

@@ -0,0 +1,17 @@
+import { testHelpers } from './testHelpers.mjs'
+import { default as jestImport } from 'jest'
+import { testFull } from './testFull.mjs'
+
+const gulpConfig = testHelpers.gulpConfig
+
+jest.mock('jest', () => ({
+  'runCLI': jest.fn(() => Promise.resolve(true))
+}))
+
+describe('testFull', () => {
+  test('runs the Jest CLI with the configured options', () => {
+    expect.assertions(1)
+    testFull()
+    expect(jestImport.runCLI).toHaveBeenCalledWith(gulpConfig.get('test.options'), [gulpConfig.get('test.path')])
+  })
+})

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

@@ -7,9 +7,4 @@
  * @memberOf module:js-build-tools
  */
 
-
-const setUp = require('./test-helpers/setUp')
-
-module.exports = {
-  setUp,
-}
+export * as testHelpers from './test-helpers/setUp.mjs'

package/functions/testHelpers.test.mjs

@@ -0,0 +1,7 @@
+import { testHelpers } from './testHelpers.mjs'
+
+describe('testHelpers', () => {
+  test('is object with all helper exports', () => {
+    expect(Object.keys(testHelpers).length).toBe(6)
+  })
+})

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

@@ -1,5 +1,5 @@
-const gulpConfig = require('../gulp.config.js')
-const { runCLI } = require('jest')
+import * as gulpConfig from '../gulp.config.mjs'
+import { default as jest } from 'jest'
 
 /**
  * Run the Jest tests for files which have been modified (based on git status).
@@ -7,13 +7,11 @@ const { runCLI } = require('jest')
  * @memberOf module:js-build-tools
  * @returns {Promise<*>}
  */
-const testQuick = () => {
+export const testQuick = () => {
   let testPath = gulpConfig.get('test.path')
   if (!Array.isArray(testPath)) {
     // The testPath must be an array of strings
     testPath = [testPath]
   }
-  return runCLI({ onlyChanged: true }, testPath)
+  return jest.runCLI({ onlyChanged: true }, testPath)
 }
-
-module.exports = testQuick

package/functions/testQuick.test.mjs

@@ -0,0 +1,17 @@
+import { testHelpers } from './testHelpers.mjs'
+import { default as jestImport } from 'jest'
+import { testQuick } from './testQuick.mjs'
+
+const gulpConfig = testHelpers.gulpConfig
+
+jest.mock('jest', () => ({
+  'runCLI': jest.fn(() => Promise.resolve(true))
+}))
+
+describe('testQuick', () => {
+  test('runs the jest CLI with onlyChanged option', () => {
+    expect.assertions(1)
+    testQuick()
+    expect(jestImport.runCLI).toHaveBeenCalledWith({ onlyChanged: true }, [gulpConfig.get('test.path')])
+  })
+})

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

@@ -1,10 +1,8 @@
-const tsFor = require('./partials/tsFor')
+import { tsFor } from './partials/tsFor.mjs'
 
 /**
  * Simplified typescript task using tsFor.
  * @memberOf module:js-build-tools
  * @returns {Function}
  */
-const typeScript = tsFor()
-
-module.exports = typeScript
+export const typeScript = tsFor()

package/functions/typeScript.test.mjs

@@ -0,0 +1,11 @@
+import { typeScript } from './typeScript.mjs'
+import { tsFor } from './partials/tsFor.mjs'
+
+jest.mock('./partials/tsFor.mjs', () => ({ tsFor: jest.fn(() => () => null) }))
+
+describe('typeScript', () => {
+  test('calls tsFor with no parameters', () => {
+    typeScript()
+    expect(tsFor).toHaveBeenCalled()
+  })
+})

package/functions/utilities/{dotGet.js → dotGet.mjs}

@@ -1,6 +1,6 @@
-const isObject = require('./isObject')
-const strAfter = require('./strAfter')
-const strBefore = require('./strBefore')
+import { isObject } from './isObject.mjs'
+import { strAfter } from './strAfter.mjs'
+import { strBefore } from './strBefore.mjs'
 
 /**
  * Get a nested property value from an object.
@@ -10,7 +10,7 @@ const strBefore = require('./strBefore')
  * @param {string|null} [defaultValue=null] - The default value to return if the property is not found
  * @returns {*} The value of the property
  */
-const dotGet = (arrayObject, dotNotation, defaultValue = null) => {
+export const dotGet = (arrayObject, dotNotation, defaultValue = null) => {
   let key = strBefore(dotNotation, '.')
   const lastKey = !key
   if (lastKey) {
@@ -43,5 +43,3 @@ const dotGet = (arrayObject, dotNotation, defaultValue = null) => {
   }
   return dotGet(next, strAfter(dotNotation, '.'), defaultValue)
 }
-
-module.exports = dotGet

package/functions/utilities/{dotNotate.js → dotNotate.mjs}

@@ -1,4 +1,4 @@
-const isObject = require('./isObject')
+import { isObject } from './isObject.mjs'
 
 /**
  * Convert an array of keys into a regex, return a function to test if incoming keys match.
@@ -63,6 +63,4 @@ const performDotNotate = (arrayObject, didRetain, prepend = '', results = {}) =>
  * @param {Array.<string>} [retainObjects=[]] - An array of keys to retain as objects
  * @returns {Object<string, *>} The dot-notated object
  */
-const dotNotate = (arrayObject, retainObjects = []) => performDotNotate(arrayObject, handleRetainObjects(retainObjects))
-
-module.exports = dotNotate
+export const dotNotate = (arrayObject, retainObjects = []) => performDotNotate(arrayObject, handleRetainObjects(retainObjects))