@jscad/core 2.6.6 → 3.0.0-alpha.0

package/package.json

@@ -1,29 +1,30 @@
 {
   "name": "@jscad/core",
-  "version": "2.6.6",
+  "version": "3.0.0-alpha.0",
   "description": "Core functionality for JSCAD Applications",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "main": "src/index.js",
+  "type": "module",
   "unpkg": "dist/jscad-core.min.js",
+  "module": "dist/jscad-core.es.js",
   "scripts": {
-    "build": "browserify src/index.js -o dist/jscad-core.min.js -g uglifyify --standalone jscadCore",
-    "version": "npm run build && git add dist",
-    "coverage": "nyc --all --reporter=html --reporter=text npm test",
+    "build": "rollup --config",
+    "coverage": "c8 --all --reporter=html --reporter=text pnpm test",
     "test": "ava './src/**/*.test.js' --verbose --timeout 2m"
   },
   "contributors": [
     {
       "name": "Rene K. Mueller",
-      "url": "http://renekmueller.com"
+      "url": "https://github.com/Spiritdude"
     },
     {
       "name": "z3dev",
-      "url": "http://www.z3d.jp"
+      "url": "https://github.com/z3dev"
     },
     {
       "name": "Mark 'kaosat-dev' Moissette",
-      "url": "http://kaosat.net"
+      "url": "https://github.com/kaosat-dev"
     }
   ],
   "keywords": [
@@ -35,23 +36,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jscad/array-utils": "2.1.4",
-    "@jscad/io": "2.4.5",
-    "@jscad/io-utils": "2.0.24",
-    "@jscad/modeling": "2.11.1",
+    "@jscad/array-utils": "3.0.0-alpha.0",
+    "@jscad/io": "3.0.0-alpha.0",
+    "@jscad/io-utils": "3.0.0-alpha.0",
+    "@jscad/modeling": "3.0.0-alpha.0",
     "json5": "2.2.3",
     "strip-bom": "4.0.0"
   },
   "devDependencies": {
-    "ava": "3.15.0",
-    "browserify": "16.5.1",
-    "nyc": "15.1.0",
-    "uglifyify": "5.0.2"
+    "ava": "^4.3.3",
+    "c8": "^8.0.0"
   },
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "4313974b50957018d2edd010e3a251f59bea46a4"
+  "gitHead": "3656d36ed9cd738ab884e86aae5a2ce08d52adf7"
 }

package/src/code-evaluation/index.js

@@ -1,6 +1,4 @@
-module.exports = {
-  rebuildGeometry: require('./rebuildGeometry'),
-  rebuildGeometryCli: require('./rebuildGeometryCli'),
-  rebuildGeometryWorker: require('./rebuildGeometryWorker'),
-  serializeSolids: require('./serializeSolids')
-}
+export { rebuildGeometry } from './rebuildGeometry.js'
+export { rebuildGeometryCli } from './rebuildGeometryCli.js'
+export { rebuildGeometryWorker } from './rebuildGeometryWorker.js'
+export { serializeSolids } from './serializeSolids.js'

package/src/code-evaluation/instanciateDesign.js

@@ -1,22 +1,20 @@
-const isGeom2 = require('@jscad/modeling').geometries.geom2.isA
-const isGeom3 = require('@jscad/modeling').geometries.geom3.isA
-const isPath2 = require('@jscad/modeling').geometries.path2.isA
+import { geom2, geom3, path2 } from '@jscad/modeling'
 
-const { flatten, toArray } = require('@jscad/array-utils')
+import { flatten, toArray } from '@jscad/array-utils'
 
-const serializeSolids = require('./serializeSolids')
+import { serializeSolids } from './serializeSolids.js'
 
 /*
  * determine if the given results contain valid geometry
  */
 const isResultGeometry = (results) => {
   if (Array.isArray(results) && results.length > 0) {
-    return results.reduce((acc, result) => acc || (isGeom3(result) || isGeom2(result) || isPath2(result)), false)
+    return results.reduce((acc, result) => acc || (geom3.isA(result) || geom2.isA(result) || path2.isA(result)), false)
   }
   return false
 }
 
-const instanciateDesign = (rootModule, parameterValues, options) => {
+export const instanciateDesign = (rootModule, parameterValues, options) => {
   const { serialize } = options
   // deal with the actual solids generation
   let solids
@@ -29,5 +27,3 @@ const instanciateDesign = (rootModule, parameterValues, options) => {
     throw new Error('bad output from script: expected geom3/geom2/path2 objects')
   }
 }
-
-module.exports = instanciateDesign

package/src/code-evaluation/rebuildGeometry.js

@@ -1,6 +1,6 @@
-const loadDesign = require('../code-loading/loadDesign')
-const instanciateDesign = require('./instanciateDesign')
-const applyParameterDefinitions = require('../parameters/applyParameterDefinitions')
+import { loadDesign } from '../code-loading/loadDesign.js'
+import { instanciateDesign } from './instanciateDesign.js'
+import { applyParameterDefinitions } from '../parameters/index.js'
 
 /**
  * Rebuild JSCAD solids from the given filesAndFolders.
@@ -26,7 +26,7 @@ const applyParameterDefinitions = require('../parameters/applyParameterDefinitio
  * Everything is together in a single function, because this is usually run in the context of a web worker
  * And transfering data back & forth is both complex (see transferables) and costly (time)
  **/
-const rebuildSolids = (data, callback) => {
+export const rebuildGeometry = (data, callback) => {
   const defaults = {
     mainPath: '',
     apiMainPath: '@jscad/modeling',
@@ -83,5 +83,3 @@ const rebuildSolids = (data, callback) => {
     }, null)
   }
 }
-
-module.exports = rebuildSolids

package/src/code-evaluation/rebuildGeometryCli.js

@@ -1,17 +1,19 @@
+import path from 'path'
+import { createRequire } from 'module'
 
-const path = require('path')
-const { toArray } = require('@jscad/array-utils')
-const requireDesignFromModule = require('../code-loading/requireDesignFromModule')
-const getAllParameterDefintionsAndValues = require('../parameters/getParameterDefinitionsAndValues')
-const makeWebRequire = require('../code-loading/webRequire')
+import { toArray } from '@jscad/array-utils'
 
-const rebuildSolids = (data) => {
+import { requireDesignFromModule } from '../code-loading/requireDesignFromModule.js'
+import { getParameterDefinitionsAndValues } from '../parameters/index.js'
+import { makeWebRequire } from '../code-loading/webRequire.js'
+
+export const rebuildGeometryCli = async (data) => {
   const defaults = {
     apiMainPath: '@jscad/modeling'
   }
   let { apiMainPath, mainPath, parameterValues, useFakeFs } = Object.assign({}, defaults, data)
   // we need to update the source for our module
-  let requireFn = require
+  let requireFn = createRequire(import.meta.url)
 
   // source came from conversion, i.e. not from file system
   if (useFakeFs) {
@@ -32,13 +34,14 @@ const rebuildSolids = (data) => {
   }
 
   // rootModule should contain exported main and getParameterDefinitions functions
-  const rootModule = requireDesignFromModule(mainPath, requireFn)
+  // const rootModule = requireDesignFromModule(mainPath, requireFn)
+  // FIXME HACK for designs with import / export
+  const rootModule = await import(mainPath)
+
   // the design (module tree) has been loaded at this stage
   // now we can get our usefull data (definitions and values/defaults)
-  const parameters = getAllParameterDefintionsAndValues(rootModule, parameterValues)
+  const parameters = getParameterDefinitionsAndValues(rootModule, parameterValues)
 
   const rawResults = toArray(rootModule.main(parameters.parameterValues))
   return rawResults
 }
-
-module.exports = rebuildSolids

package/src/code-evaluation/rebuildGeometryWorker.js

@@ -1,4 +1,3 @@
-
 /**
  * evaluate script & rebuild solids, in seperate thread/webworker
  * @param {String} script the script
@@ -7,8 +6,9 @@
  * @param {Object} callback the callback to call once evaluation is done /failed
  * @param {Object} options the settings to use when rebuilding the solid
  */
-const rebuildGeometryWorker = (self) => {
-  const rebuildGeometry = require('./rebuildGeometry')
+import { rebuildGeometry } from './rebuildGeometry.js'
+
+export const rebuildGeometryWorker = (self) => {
   self.onmessage = function (event) {
     if (event.data instanceof Object) {
       const { data } = event
@@ -21,5 +21,3 @@ const rebuildGeometryWorker = (self) => {
     }
   }
 }
-
-module.exports = rebuildGeometryWorker

package/src/code-evaluation/serializeSolids.js

@@ -1,11 +1,11 @@
-const { geom2, geom3, path2 } = require('@jscad/modeling').geometries
+import { geom2, geom3, path2 } from '@jscad/modeling'
 
 /*
  * Serialize the given solids/objects into web worker message content.
  * @param {Array} solids - list of solids to serialize
  * @return {Array} web worker message contents
  */
-const serializeSolids = (solids) => {
+export const serializeSolids = (solids) => {
   // NOTE: the use of compactBinary formats was removed due to
   // that lack of support for additional attributes, as well as
   // imcomplete support for transfering objects via web workers
@@ -22,5 +22,3 @@ const serializeSolids = (solids) => {
   })
   return solids
 }
-
-module.exports = serializeSolids

package/src/code-loading/index.js

@@ -1,4 +1,2 @@
-module.exports = {
-  makeFakeFs: require('./makeFakeFs.js'),
-  requireDesignUtilsFs: require('./requireDesignUtilsFs')
-}
+export { makeFakeFs } from './makeFakeFs.js'
+export { getDesignEntryPoint, getDesignName } from './requireDesignUtilsFs.js'

package/src/code-loading/isCommonJsModule.js

@@ -1,3 +1 @@
-const isCommonJsModule = (string) => string.includes('module.exports') || string.includes('require(')
-
-module.exports = isCommonJsModule
+export const isCommonJsModule = (string) => string.includes('module.exports') || string.includes('require(')

package/src/code-loading/loadDesign.js

@@ -1,10 +1,10 @@
-const { registerAllExtensions } = require('../io/registerExtensions')
+import { registerAllExtensions } from '../io/registerExtensions.js'
 
-const transformSources = require('./transformSources')
-const makeFakeFs = require('./makeFakeFs')
-const makeWebRequire = require('./webRequire')
-const normalizeDesignModule = require('./normalizeDesignModule')
-const getAllParameterDefintionsAndValues = require('../parameters/getParameterDefinitionsAndValues')
+import { transformSources } from './transformSources.js'
+import { makeFakeFs } from './makeFakeFs.js'
+import { makeWebRequire } from './webRequire.js'
+import { normalizeDesignModule } from './normalizeDesignModule.js'
+import { getParameterDefinitionsAndValues } from '../parameters/index.js'
 
 /**
  * load a jscad script, injecting the basic dependencies if necessary
@@ -14,7 +14,7 @@ const getAllParameterDefintionsAndValues = require('../parameters/getParameterDe
  * @param {Array} filesAndFolders - array of files and folders to use
  * @param {Object} parameterValuesOverride - the values to use to override the defaults for the current design
  */
-const loadDesign = (mainPath, apiMainPath, filesAndFolders, parameterValuesOverride) => {
+export const loadDesign = (mainPath, apiMainPath, filesAndFolders, parameterValuesOverride) => {
   // transform the source if passed non-javascript content, i.e. stl
   filesAndFolders = transformSources({ apiMainPath }, filesAndFolders)
 
@@ -45,9 +45,7 @@ const loadDesign = (mainPath, apiMainPath, filesAndFolders, parameterValuesOverr
   // rootModule SHOULD contain a main() entry and optionally a getParameterDefinitions entry
   // the design (module tree) has been loaded at this stage
   // now we can get our usefull data (definitions and values/defaults)
-  const parameters = getAllParameterDefintionsAndValues(rootModule, parameterValuesOverride)
+  const parameters = getParameterDefinitionsAndValues(rootModule, parameterValuesOverride)
 
   return { rootModule, ...parameters }
 }
-
-module.exports = loadDesign

package/src/code-loading/makeFakeFs.js

@@ -1,4 +1,4 @@
-const makeFakeFs = (filesAndFolders) => {
+export const makeFakeFs = (filesAndFolders) => {
   const findMatch = (path, inputs = filesAndFolders) => {
     for (let i = 0; i < inputs.length; i++) {
       const entry = inputs[i]
@@ -22,6 +22,7 @@ const makeFakeFs = (filesAndFolders) => {
       isDirectory: (_) => (entry && (!('source' in entry) && ('children' in entry)))
     }
   }
+
   const fakeFs = {
     statSync,
     existsSync: (path) => {
@@ -61,5 +62,3 @@ const makeFakeFs = (filesAndFolders) => {
   }
   return fakeFs
 }
-
-module.exports = makeFakeFs

package/src/code-loading/modulifySource.js

@@ -1,37 +1,19 @@
-/** transform an old type 'implicit imports' jscad script into one with explicit imports
+/**
+ * Transform an old type 'implicit imports' jscad script into one with explicit imports
  * @param  {} source
  * @param  {} apiMainPath
  */
-const modulifySource = (source, apiMainPath) => {
+export const modulifySource = (source, apiMainPath) => {
   const getParamsString = source.includes('getParameterDefinitions')
-    ? 'module.exports.getParameterDefinitions = getParameterDefinitions'
+    ? 'export getParameterDefinitions'
     : ''
   const updatedSource = `
-    const {geom2, geom3, path2, pol2, poly3} = require('${apiMainPath}').geometries
-
-    const {square, circle, polygon, rectangle, ellipse, roundedRectangle} = require('${apiMainPath}').primitives
-    const {cube, cylinder, sphere, polyhedron, torus} = require('${apiMainPath}').primitives
-    const {colorize, hsl2rgb} = require('${apiMainPath}').colors
-
-    const {extrudeFromSlices, extrudeLinear, extrudeRectangular, extrudeRotate, slice} = require('${apiMainPath}').extrusions
-    const {rotate, translate, scale, mirror, transform} = require('${apiMainPath}').transforms
-    const {hull, hullChain} = require('${apiMainPath}').hulls
-    const {expand, offset} = require('${apiMainPath}').expansions
-    const {union, difference, intersection} = require('${apiMainPath}').booleans
-    const { measureArea, measureBounds, measureVolume} = require('${apiMainPath}').measurements
-
-    const connectors = require('${apiMainPath}').connectors
-
-    const {vec2, vec3, vec4, constants, line2, line3, mat4, plane, utils} = require('${apiMainPath}').maths
-
-    const {vectorText, vectorChar} = require('${apiMainPath}').text
+    import * from '${apiMainPath}'
 
     ${source}
 
-    module.exports = {main}
+    export main
     ${getParamsString}
   `
   return updatedSource
 }
-
-module.exports = modulifySource

package/src/code-loading/normalizeDesignModule.js

@@ -1,7 +1,7 @@
 /*
  * Normalize the given design module for internal use.
  */
-const normalizeDesignModule = (rootModule) => {
+export const normalizeDesignModule = (rootModule) => {
   if (!rootModule) {
     throw new Error('no root module found, please check the project structure')
   }
@@ -17,5 +17,3 @@ const normalizeDesignModule = (rootModule) => {
   }
   return rootModule
 }
-
-module.exports = normalizeDesignModule

package/src/code-loading/requireDesignFromModule.js

@@ -1,19 +1,14 @@
-
-const validateDesignModule = require('./validateDesignModule')
-const normalizeDesignModule = require('./normalizeDesignModule')
+import { validateDesignModule } from './validateDesignModule.js'
+import { normalizeDesignModule } from './normalizeDesignModule.js'
 
 /** load a jscad script, injecting the basic dependencies if necessary
  * @param  {string} filePath
- * @param  {function} requireFn : the 'require' function to use: defaults to the standard 'require' under node.js
+ * @param  {function} requireFn : the 'require' function to use; Node require or webRequire
  */
-const requireDesignFromModule = (filePath, requireFn = require) => {
-  // const requireUncached = require('../code-loading/requireUncached')
-  // TODO: only uncache when needed
+export const requireDesignFromModule = (filePath, requireFn) => {
   // requireUncached(mainPath)
   const designRootModule = requireFn(filePath)
   // make sure everything is ok
   validateDesignModule(designRootModule)
   return normalizeDesignModule(designRootModule)
 }
-
-module.exports = requireDesignFromModule

package/src/code-loading/requireDesignUtilsFs.js

@@ -1,5 +1,6 @@
-const path = require('path')
-const { toArray } = require('@jscad/array-utils')
+import path from 'path'
+
+import { toArray } from '@jscad/array-utils'
 
 // NOTE/ path.parse is NOT included by browserify & co , hence this function ...
 // https://github.com/substack/path-browserify/pull/3
@@ -36,7 +37,7 @@ const assertPath = (path) => {
  * statSync, existSync, readFileSync, readdirSync
  * @param  {} paths
  */
-const getDesignEntryPoint = (fs, paths) => {
+export const getDesignEntryPoint = (fs, paths) => {
   if (!paths) {
     return
   }
@@ -91,7 +92,7 @@ const packageNameFromDir = (fs, dirName, filePath) => {
  * @param  {Object} fs a file-system like object (either node's fs or some other) providing at least statSync, existSync, readFileSync
  * @param  {Array} paths an array of paths (strings) or a single path
  */
-const getDesignName = (fs, paths) => {
+export const getDesignName = (fs, paths) => {
   if (!paths) {
     return 'undefined'
   }
@@ -105,8 +106,3 @@ const getDesignName = (fs, paths) => {
     return packageNameFromDir(fs, mainPath)
   }
 }
-
-module.exports = {
-  getDesignEntryPoint,
-  getDesignName
-}

package/src/code-loading/transformSources.js

@@ -1,4 +1,4 @@
-const { deserializers } = require('@jscad/io')
+import { deserializers } from '@jscad/io'
 
 /*
  * Transform the entry into a ready-to-use module.
@@ -21,7 +21,7 @@ const createJscadEntry = (entry, source) => {
  * Transforms are only applied to single files as current deserializers create source with a main() function. Only one.
  * Transforms are NOT applied to projects.
  */
-const transformSources = (options, filesAndFolders) => {
+export const transformSources = (options, filesAndFolders) => {
   if (filesAndFolders && filesAndFolders.length > 1) return filesAndFolders // skip projects
 
   const codeTransforms = {
@@ -51,5 +51,3 @@ const transformSources = (options, filesAndFolders) => {
   }
   return filesAndFolders
 }
-
-module.exports = transformSources

package/src/code-loading/validateDesignModule.js

@@ -1,4 +1,4 @@
-const validateDesignModule = (scriptRootModule) => {
+export const validateDesignModule = (scriptRootModule) => {
   if (!scriptRootModule) {
     throw new Error('undefined root module passed !')
   }
@@ -9,5 +9,3 @@ const validateDesignModule = (scriptRootModule) => {
     throw new Error('no main() function found in the input script')
   }
 }
-
-module.exports = validateDesignModule

package/src/code-loading/vtreeApi.js

@@ -1 +1 @@
-module.exports = require('@jscad/vtree').api
+export api from '@jscad/vtree'

package/src/code-loading/webRequire.js

@@ -1,11 +1,18 @@
-const path = require('path')
+import path from 'path'
+import { createRequire } from 'module'
+
+import stripBom from 'strip-bom'
+
+import * as jscadModule from '@jscad/modeling'
+
+import { getFileExtensionFromString } from '../utils/getFileExtensionFromString.js'
+import { combineParameterDefinitions, getParameterDefinitionsFromSource } from '../parameters/getParameterDefinitionsFromSource.js'
+
+import * as fsModule from './makeFakeFs.js'
 
 // use posix versions of path, even in the browser
 const posix = path.posix ? path.posix : path
 
-const getFileExtensionFromString = require('../utils/getFileExtensionFromString')
-const { combineParameterDefinitions, getParameterDefinitionsFromSource } = require('../parameters/getParameterDefinitionsFromSource')
-
 /* find matching path in inputs
  * @param  {} path
  * @param  {} inputs=filesAndFolders
@@ -27,7 +34,6 @@ const findMatch = (path, inputs) => {
 }
 
 const registerJsExtension = (fs, _require) => {
-  const stripBom = require('strip-bom')
   _require.extensions['.js'] = (module, filename) => {
     const content = fs.readFileSync(filename, 'utf8')
     module._compile(stripBom(content), filename)
@@ -41,36 +47,46 @@ const registerJsonExtension = (fs, _require) => {
   }
 }
 
-/* Make require callback functions based on the given file system.
+/*
+ * Make require callback functions based on the given file system.
  */
-const makeWebRequire = (filesAndFolders, options) => {
+export const makeWebRequire = (filesAndFolders, options) => {
   const defaults = {
     apiMainPath: '@jscad/modeling',
-    fakeFs: require('./makeFakeFs')(filesAndFolders)
+    fakeFs: null
   }
   const { apiMainPath, fakeFs } = Object.assign({}, defaults, options)
-  const apiModule = apiMainPath === '@jscad/modeling' ? require('@jscad/modeling') : require(apiMainPath)
+
+  // HACK create the require function if necessary
+  if (typeof self === 'undefined') {
+    // create require via Node API
+    const require = createRequire(import.meta.url)
+  }
+
+  const { makeFakeFs } = fsModule
+
+  // FIXME const apiModule = apiMainPath === '@jscad/modeling' ? jscadModule : require(apiMainPath)
+  const apiModule = apiMainPath === '@jscad/modeling' ? jscadModule : import(apiMainPath)
+  // const fsModule = fakeFs ? fakeFs : makeFakeFs
 
   // preset core modules
   // FIXME this list of modules should be an option, replacing apiMainPath
   const coreModules = {
-    '@jscad/io': {
-      exports: require('@jscad/io')
-    },
-    '@jscad/array-utils': {
-      exports: require('@jscad/array-utils')
-    },
+    // '@jscad/io': {
+    //   exports: require('@jscad/io')
+    // },
+    // '@jscad/array-utils': {
+    //   exports: require('@jscad/array-utils')
+    // },
     '@jscad/modeling': {
       exports: apiModule
     },
     // expose the fake fs module
     fs: {
-      exports: fakeFs
+      exports: fsModule
     }
   }
 
-  // console.log('*****\n',filesAndFolders,'\n*****')
-
   const extensions = {}
   const moduleCache = {}
 
@@ -79,8 +95,6 @@ const makeWebRequire = (filesAndFolders, options) => {
    * @see https://nodejs.org/dist/latest-v12.x/docs/api/modules.html#modules_all_together
    */
   const _require = (currentPath, requirePath) => {
-    // console.log('***** require: cur:', currentPath, ' req:', requirePath)
-
     // core modules
     const directModule = coreModules[requirePath]
     if (directModule) {
@@ -92,7 +106,6 @@ const makeWebRequire = (filesAndFolders, options) => {
     }
 
     const loadAsFile = (requirePath) => {
-      // console.log('***** load as file', requirePath)
       let baseExt = getFileExtensionFromString(requirePath)
       if (!baseExt) {
         baseExt = 'js' // for lookups
@@ -146,7 +159,6 @@ const makeWebRequire = (filesAndFolders, options) => {
     }
 
     const loadIndex = (requirePath) => {
-      // console.log('***** load index', requirePath)
       const entry = findMatch(requirePath, filesAndFolders)
       if (!entry) return null
 
@@ -164,7 +176,6 @@ const makeWebRequire = (filesAndFolders, options) => {
     }
 
     const loadAsDirectory = (requirePath) => {
-      // console.log('***** load as directory', requirePath)
       let entry = findMatch(requirePath, filesAndFolders)
       if (!entry) return null
 
@@ -223,7 +234,6 @@ const makeWebRequire = (filesAndFolders, options) => {
     }
 
     const loadNodeModules = (requirePath, basePath) => {
-      // console.log('loadNodeModules',requirePath, basePath)
       const dirs = nodeModulesPaths(basePath)
       for (let i = 0; i < dirs.length; i++) {
         const dir = dirs[i]
@@ -250,9 +260,7 @@ const makeWebRequire = (filesAndFolders, options) => {
   req.extensions = extensions
   req.resolve = () => {}
 
-  registerJsExtension(fakeFs, req)
-  registerJsonExtension(fakeFs, req)
+  registerJsExtension(makeFakeFs(filesAndFolders), req)
+  registerJsonExtension(makeFakeFs(filesAndFolders), req)
   return req
 }
-
-module.exports = makeWebRequire

package/src/code-loading/webRequire.test.js

@@ -1,9 +1,9 @@
-const test = require('ava')
+import test from 'ava'
 
-const { registerAllExtensions } = require('../io/registerExtensions')
+import { registerAllExtensions } from '../io/registerExtensions.js'
 
-const makeWebRequire = require('./webRequire')
-const makeFakeFs = require('./makeFakeFs')
+import { makeWebRequire } from './webRequire.js'
+import { makeFakeFs } from './makeFakeFs.js'
 
 test.beforeEach((t) => {
 })
@@ -76,10 +76,9 @@ test('webRequire: should support require, from a directory with dependent files'
 
 test('webRequire: should allow using require.extensions like the native node require (simple)', (t) => {
   const registerJscadExtension = (fs, _require) => {
-    const stripBom = require('strip-bom')
     _require.extensions['.jscad'] = (module, filename) => {
       const content = fs.readFileSync(filename, 'utf8')
-      module._compile(stripBom(content), filename)
+      module._compile(content, filename)
     }
   }
 
@@ -107,7 +106,7 @@ test('webRequire: should allow using require.extensions like the native node req
   t.true(designRootModule.main instanceof Function)
 })
 
-test('webRequire: should allow using require.extensions like the native node require (parser)', (t) => {
+test.skip('webRequire: should allow using require.extensions like the native node require (parser)', (t) => {
   const registerStlExtension = (fs, _require) => {
     const { deserializers } = require('@jscad/io')
     const deserializer = deserializers.stl
@@ -168,7 +167,7 @@ const singleFileJs = [
     fullPath: '/logo.js',
     name: 'logo.js',
     source: `
-      const { cube } = require('@jscad/modeling').primitives
+      const { cube } = require('@jscad/modeling')
 
       const main = () => {
         return cube()
@@ -317,7 +316,7 @@ const directoryWithDependencies = [
         fullPath: '/project/file2.js',
         name: 'file2.js',
         source: `
-          const { cube } = require('@jscad/modeling').primitives
+          const { cube } = require('@jscad/modeling')
 
           const file2 = () => {
             return cube()