@jscad/cli 2.3.5 → 3.0.1-alpha.0

package/cli.conversions.test.js

@@ -1,36 +1,34 @@
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
+import { cwd } from 'process'
 
-const path = require('path')
-const { execSync } = require('child_process')
-const fs = require('fs')
+import test from 'ava'
+
+import { execSync } from 'child_process'
 
 test.afterEach.always((t) => {
   // remove files
   try {
     if (t.context.file1Path) fs.unlinkSync(t.context.file1Path)
-  } catch (err) { }
+  } catch (err) {}
 
   try {
     if (t.context.file2Path) fs.unlinkSync(t.context.file2Path)
-  } catch (err) { }
+  } catch (err) {}
 
   try {
     if (t.context.file3Path) fs.unlinkSync(t.context.file3Path)
-  } catch (err) { }
+  } catch (err) {}
 
   try {
     if (t.context.file4Path) fs.unlinkSync(t.context.file4Path)
-  } catch (err) { }
-
-  try {
-    if (t.context.file5Path) fs.unlinkSync(t.context.file5Path)
-  } catch (err) { }
+  } catch (err) {}
 })
 
 test.beforeEach((t) => {
   const cliName = './cli.js'
   t.context = {
-    cliPath: path.resolve(__dirname, cliName)
+    cliPath: path.resolve(cwd(), cliName)
   }
 })
 
@@ -42,86 +40,34 @@ test.beforeEach((t) => {
 // the script should produce ALL geometry types
 const createJscad = (id) => {
   const jscadScript = `// test script ${id}
-const { flatten } = require('@jscad/array-utils')
-const { primitives } = require('@jscad/modeling')
+import { flatten } from '@jscad/array-utils'
+import { arc, ellipse, ellipsoid } from '@jscad/modeling'
 
-const getParameterDefinitions = () => {
+export const getParameterDefinitions = () => {
   return flatten([
     { name: 'segments', caption: 'Segements:', type: 'int', initial: 10, min: 5, max: 20, step: 1 }
   ])
 }
 
-const main = (params) => {
+export const main = (params) => {
   // parameters
   let segments = params.segments || 16
 
   // shapes
-  let apath2 = primitives.arc()
-  let ageom2 = primitives.ellipse()
-  let ageom3 = primitives.ellipsoid()
+  let apath2 = arc()
+  let ageom2 = ellipse()
+  let ageom3 = ellipsoid()
 
   return [apath2, ageom2, ageom3]
 }
-
-module.exports = { main, getParameterDefinitions }
 `
 
-  const fileName = `./test${id}.jscad`
-  const filePath = path.resolve(__dirname, fileName)
+  const fileName = `./base${id}.js`
+  const filePath = path.resolve(cwd(), fileName)
   fs.writeFileSync(filePath, jscadScript)
   return filePath
 }
 
-const createImportJscad = (id, extension) => {
-  const jscadScript = `// test script ${id} -- import
-
-const main = () => {
-  return require('./test${id}.${extension}')
-}
-
-module.exports = { main }
-`
-
-  const fileName = `./test${id}-import.jscad`
-  const filePath = path.resolve(__dirname, fileName)
-  fs.writeFileSync(filePath, jscadScript)
-  return filePath
-}
-
-const testBackImport = (t, testID, extension) => {
-  const cliPath = t.context.cliPath
-
-  const file4Path = createImportJscad(testID, extension)
-  t.context.file4Path = file4Path
-  t.true(fs.existsSync(file4Path))
-
-  const file5Name = `./test${testID}-import.stl`
-  const file5Path = path.resolve(__dirname, file5Name)
-  t.context.file5Path = file5Path
-  t.false(fs.existsSync(file5Path))
-
-  const cmd = `node ${cliPath} ${file4Path}`
-  execSync(cmd, { stdio: [0, 1, 2] })
-  t.true(fs.existsSync(file5Path))
-}
-
-const runOnFixture = (t, fixtureName) => {
-  const inputFile = path.resolve(
-    __dirname,
-    path.join('test_fixtures', fixtureName, 'index.js'))
-
-  const outputFile = inputFile.replace('.js', '.stl')
-  t.context.file1Path = outputFile
-
-  t.false(fs.existsSync(outputFile))
-
-  const cmd = `node ${t.context.cliPath} ${inputFile}`
-  execSync(cmd, { stdio: [0, 1, 2] })
-  t.true(fs.existsSync(outputFile))
-
-  return outputFile
-}
-
 test('cli (conversions STL)', (t) => {
   const testID = 11
 
@@ -132,20 +78,20 @@ test('cli (conversions STL)', (t) => {
   t.context.file1Path = file1Path
 
   const file2Name = `./test${testID}.stl`
-  const file2Path = path.resolve(__dirname, file2Name)
+  const file2Path = path.resolve(cwd(), file2Name)
   t.false(fs.existsSync(file2Path))
 
   t.context.file2Path = file2Path
 
   const cliPath = t.context.cliPath
 
-  let cmd = `node ${cliPath} ${file1Path}`
+  let cmd = `node ${cliPath} ${file1Path} -o ${file2Path}`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file2Path))
 
   // convert from STL to JSCAD script
   const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
+  const file3Path = path.resolve(cwd(), file3Name)
   t.false(fs.existsSync(file3Path))
 
   t.context.file3Path = file3Path
@@ -153,8 +99,6 @@ test('cli (conversions STL)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -o ${file3Path} -v -add-metadata false`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
-
-  testBackImport(t, testID, 'stl')
 })
 
 test('cli (conversions DXF)', (t) => {
@@ -167,55 +111,20 @@ test('cli (conversions DXF)', (t) => {
   t.context.file1Path = file1Path
 
   const file2Name = `./test${testID}.dxf`
-  const file2Path = path.resolve(__dirname, file2Name)
+  const file2Path = path.resolve(cwd(), file2Name)
   t.false(fs.existsSync(file2Path))
 
   t.context.file2Path = file2Path
 
   const cliPath = t.context.cliPath
 
-  let cmd = `node ${cliPath} ${file1Path} -of dxf`
+  let cmd = `node ${cliPath} ${file1Path} -o ${file2Path}`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file2Path))
 
   // convert from DXF to JS
   const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
-  t.false(fs.existsSync(file3Path))
-
-  t.context.file3Path = file3Path
-
-  cmd = `node ${cliPath} ${file2Path} -of js`
-  execSync(cmd, { stdio: [0, 1, 2] })
-  t.true(fs.existsSync(file3Path))
-
-  testBackImport(t, testID, 'dxf')
-})
-
-test('cli (conversions AMF)', (t) => {
-  const testID = 13
-
-  // convert from JSCAD to AMF
-  const file1Path = createJscad(testID)
-  t.true(fs.existsSync(file1Path))
-
-  t.context.file1Path = file1Path
-
-  const file2Name = `./test${testID}.amf`
-  const file2Path = path.resolve(__dirname, file2Name)
-  t.false(fs.existsSync(file2Path))
-
-  t.context.file2Path = file2Path
-
-  const cliPath = t.context.cliPath
-
-  let cmd = `node ${cliPath} ${file1Path} -of amf`
-  execSync(cmd, { stdio: [0, 1, 2] })
-  t.true(fs.existsSync(file2Path))
-
-  // convert from AMF to JS
-  const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
+  const file3Path = path.resolve(cwd(), file3Name)
   t.false(fs.existsSync(file3Path))
 
   t.context.file3Path = file3Path
@@ -223,8 +132,6 @@ test('cli (conversions AMF)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
-
-  testBackImport(t, testID, 'amf')
 })
 
 test('cli (conversions JSON)', (t) => {
@@ -237,20 +144,20 @@ test('cli (conversions JSON)', (t) => {
   t.context.file1Path = file1Path
 
   const file2Name = `./test${testID}.json`
-  const file2Path = path.resolve(__dirname, file2Name)
+  const file2Path = path.resolve(cwd(), file2Name)
   t.false(fs.existsSync(file2Path))
 
   t.context.file2Path = file2Path
 
   const cliPath = t.context.cliPath
 
-  let cmd = `node ${cliPath} ${file1Path} -of json`
+  let cmd = `node ${cliPath} ${file1Path} -o ${file2Path}`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file2Path))
 
   // convert from JSON to JS
   const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
+  const file3Path = path.resolve(cwd(), file3Name)
   t.false(fs.existsSync(file3Path))
 
   t.context.file3Path = file3Path
@@ -258,8 +165,6 @@ test('cli (conversions JSON)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
-
-  testBackImport(t, testID, 'json')
 })
 
 test('cli (conversions SVG)', (t) => {
@@ -272,20 +177,20 @@ test('cli (conversions SVG)', (t) => {
   t.context.file1Path = file1Path
 
   const file2Name = `./test${testID}.svg`
-  const file2Path = path.resolve(__dirname, file2Name)
+  const file2Path = path.resolve(cwd(), file2Name)
   t.false(fs.existsSync(file2Path))
 
   t.context.file2Path = file2Path
 
   const cliPath = t.context.cliPath
 
-  let cmd = `node ${cliPath} ${file1Path} -of svg`
+  let cmd = `node ${cliPath} ${file1Path} -o ${file2Path}`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file2Path))
 
   // convert from SVG to JS
   const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
+  const file3Path = path.resolve(cwd(), file3Name)
   t.false(fs.existsSync(file3Path))
 
   t.context.file3Path = file3Path
@@ -305,20 +210,20 @@ test('cli (conversions X3D)', (t) => {
   t.context.file1Path = file1Path
 
   const file2Name = `./test${testID}.x3d`
-  const file2Path = path.resolve(__dirname, file2Name)
+  const file2Path = path.resolve(cwd(), file2Name)
   t.false(fs.existsSync(file2Path))
 
   t.context.file2Path = file2Path
 
   const cliPath = t.context.cliPath
 
-  let cmd = `node ${cliPath} ${file1Path} -of x3d`
+  let cmd = `node ${cliPath} ${file1Path} -o ${file2Path}`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file2Path))
 
   // convert from X3D to JS
   const file3Name = `./test${testID}.js`
-  const file3Path = path.resolve(__dirname, file3Name)
+  const file3Path = path.resolve(cwd(), file3Name)
   t.false(fs.existsSync(file3Path))
 
   t.context.file3Path = file3Path
@@ -326,12 +231,4 @@ test('cli (conversions X3D)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
-
-  testBackImport(t, testID, 'x3d')
-})
-
-test('cli (import STL)', (t) => {
-  // const testID = 17
-
-  runOnFixture(t, 'stl_import')
 })

package/cli.js

@@ -21,16 +21,17 @@
 //   jscad test.jscad -of stl
 //   jscad name_plate.jscad --name "Just Me" --title "CEO" -o amf test.amf
 //
-const fs = require('fs')
-const JSZip = require('jszip')
+import fs from 'fs'
+import JSZip from 'jszip'
 
-const { formats } = require('@jscad/io/formats')
+import { supportedFormats } from '@jscad/io'
 
-const version = require('./package.json').version
-const generateOutputData = require('./src/generateOutputData')
-const determineOutputNameAndFormat = require('./src/determineOutputNameAndFormat')
-const writeOutput = require('./src/writeOutput')
-const parseArgs = require('./src/parseArgs')
+import { generateOutputData } from './src/generateOutputData.js'
+import { determineOutputNameAndFormat } from './src/determineOutputNameAndFormat.js'
+import { writeOutput } from './src/writeOutput.js'
+import { parseArgs } from './src/parseArgs.js'
+
+const version = '[VI]{version}[/VI]' // version is injected by rollup
 
 // handle arguments (inputs, outputs, etc)
 const args = process.argv.splice(2)
@@ -52,12 +53,16 @@ const clicolors = {
 const logFileOutput = (outputFile) => {
   console.log(`${clicolors.blue}JSCAD: generating output ${clicolors.red}
     from: ${clicolors.green} ${inputFile} ${clicolors.red}
-    to: ${clicolors.green} ${outputFile} ${clicolors.yellow}(${formats[outputFormat].description}) ${clicolors.black}
+    to: ${clicolors.green} ${outputFile} ${clicolors.yellow}(${supportedFormats[outputFormat].description}) ${clicolors.black}
   `)
 }
 
 // read input data
-const src = fs.readFileSync(inputFile, inputFile.match(/\.stl$/i) ? 'binary' : 'UTF8')
+let encoding = 'UTF8'
+if (inputFile.match(/\.stl$/i)) encoding = 'binary'
+if (inputFile.match(/\.3mf$/i)) encoding = null // force raw buffer
+
+const src = fs.readFileSync(inputFile, encoding)
 
 // -- convert from JSCAD script into the desired output format
 // -- and write it to disk

package/cli.parameters.test.js

@@ -1,9 +1,15 @@
-const test = require('ava')
-const JSZip = require('jszip')
+import fs from 'fs'
+import { dirname, resolve } from 'path'
+import { execSync } from 'child_process'
+import { cwd } from 'process'
+import { fileURLToPath } from 'url'
 
-const path = require('path')
-const { execSync } = require('child_process')
-const fs = require('fs')
+import JSZip from 'jszip'
+
+import test from 'ava'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
 
 test.afterEach.always((t) => {
   // remove files
@@ -29,7 +35,7 @@ test.afterEach.always((t) => {
 test.beforeEach((t) => {
   const cliName = './cli.js'
   t.context = {
-    cliPath: path.resolve(__dirname, cliName)
+    cliPath: resolve(cwd(), cliName)
   }
 })
 
@@ -41,31 +47,29 @@ test.beforeEach((t) => {
 // the script should produce ALL geometry types
 const createJscad = (id, multipart = false) => {
   const jscadScript = `// test script ${id}
-const { primitives } = require('@jscad/modeling')
+import { arc, ellipse, ellipsoid } from '@jscad/modeling'
 
-const getParameterDefinitions = () => {
+export const getParameterDefinitions = () => {
   return [
-    { name: 'segments', caption: 'Segements:', type: 'int', initial: 10, min: 5, max: 20, step: 1 }
+    { name: 'segments', caption: 'Segments:', type: 'int', initial: 10, min: 5, max: 20, step: 1 }
   ]
 }
 
-const main = (params) => {
+export const main = (params) => {
   // parameters
   let segments = params.segments || 16
 
   // shapes
-  let apath2 = primitives.arc()
-  let ageom2 = primitives.ellipse()
-  let ageom3 = primitives.ellipsoid()
+  let apath2 = arc()
+  let ageom2 = ellipse()
+  let ageom3 = ellipsoid()
 
   ${multipart ? 'return [ageom3, ageom3, ageom3]' : 'return [apath2, ageom2, ageom3]'}
 }
-
-module.exports = { main, getParameterDefinitions }
 `
 
-  const fileName = `./test${id}.jscad`
-  const filePath = path.resolve(__dirname, fileName)
+  const fileName = `./test${id}.js`
+  const filePath = resolve(cwd(), fileName)
   fs.writeFileSync(filePath, jscadScript)
   return filePath
 }
@@ -79,7 +83,7 @@ test('cli (single input file)', (t) => {
   t.context.inputPath = inputPath
 
   const outputName = `./test${testID}.stl`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(cwd(), outputName)
   t.false(fs.existsSync(outputPath))
 
   t.context.outputPath = outputPath
@@ -100,7 +104,7 @@ test('cli (single input file, output format)', (t) => {
   t.context.inputPath = inputPath
 
   const outputName = `./test${testID}.dxf`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(cwd(), outputName)
   t.false(fs.existsSync(outputPath))
 
   t.context.outputPath = outputPath
@@ -120,8 +124,8 @@ test('cli (single input file, output filename)', (t) => {
 
   t.context.inputPath = inputPath
 
-  const outputName = `./test${testID}.amf`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputName = `./test${testID}.obj`
+  const outputPath = resolve(cwd(), outputName)
   t.false(fs.existsSync(outputPath))
 
   t.context.outputPath = outputPath
@@ -141,7 +145,7 @@ test('cli (folder, output format)', (t) => {
 
   t.context.inputPath = inputPath
 
-  const folderPath = path.resolve(__dirname, './test-folder')
+  const folderPath = resolve(cwd(), './test-folder')
   t.false(fs.existsSync(folderPath))
 
   fs.mkdirSync(folderPath)
@@ -149,14 +153,14 @@ test('cli (folder, output format)', (t) => {
 
   t.context.folderPath = folderPath
 
-  const mainPath = path.resolve(__dirname, './test-folder/main.js')
+  const mainPath = resolve(cwd(), './test-folder/main.js')
   fs.renameSync(inputPath, mainPath)
   t.true(fs.existsSync(mainPath))
 
   t.context.inputPath = mainPath
 
   const outputName = './test-folder/main.dxf'
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(cwd(), outputName)
   t.false(fs.existsSync(outputPath))
 
   t.context.outputPath = outputPath
@@ -177,7 +181,7 @@ test('cli (single input file, parameters)', (t) => {
   t.context.inputPath = inputPath
 
   const outputName = `./test${testID}.stl`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(cwd(), outputName)
   t.false(fs.existsSync(outputPath))
 
   t.context.outputPath = outputPath
@@ -189,7 +193,7 @@ test('cli (single input file, parameters)', (t) => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (no parameters)', (t) => {
+test('cli (no parameters, out help)', (t) => {
   const cliPath = t.context.cliPath
 
   const cmd = `node ${cliPath}`
@@ -224,9 +228,9 @@ test('cli (single input file, multiple output files)', (t) => {
   t.context.inputPath = inputPath
 
   const outputName = (partNum) => `./test${testID}-part-${partNum}-of-3.stl`
-  const outputPath1 = path.resolve(__dirname, outputName(1))
-  const outputPath2 = path.resolve(__dirname, outputName(2))
-  const outputPath3 = path.resolve(__dirname, outputName(3))
+  const outputPath1 = resolve(__dirname, outputName(1))
+  const outputPath2 = resolve(__dirname, outputName(2))
+  const outputPath3 = resolve(__dirname, outputName(3))
   t.false(fs.existsSync(outputPath1))
   t.false(fs.existsSync(outputPath2))
   t.false(fs.existsSync(outputPath3))
@@ -253,7 +257,7 @@ test('cli (single multipart input file, zipped output file)', async (t) => {
   t.context.inputPath = inputPath
 
   const outputName = `./test${testID}.zip`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(__dirname, outputName)
 
   t.false(fs.existsSync(outputPath))
 
@@ -268,9 +272,9 @@ test('cli (single multipart input file, zipped output file)', async (t) => {
   // check contents of zip file
   const data = await fs.promises.readFile(outputPath)
   const content = await JSZip.loadAsync(data)
-  t.true(content.files[path.resolve(__dirname, `./test${testID}-part-1-of-3.stl`)] !== undefined)
-  t.true(content.files[path.resolve(__dirname, `./test${testID}-part-2-of-3.stl`)] !== undefined)
-  t.true(content.files[path.resolve(__dirname, `./test${testID}-part-3-of-3.stl`)] !== undefined)
+  t.true(content.files[resolve(__dirname, `./test${testID}-part-1-of-3.stl`)] !== undefined)
+  t.true(content.files[resolve(__dirname, `./test${testID}-part-2-of-3.stl`)] !== undefined)
+  t.true(content.files[resolve(__dirname, `./test${testID}-part-3-of-3.stl`)] !== undefined)
 })
 
 test('cli (single input file, zipped output file)', async (t) => {
@@ -282,7 +286,7 @@ test('cli (single input file, zipped output file)', async (t) => {
   t.context.inputPath = inputPath
 
   const outputName = `./test${testID}.zip`
-  const outputPath = path.resolve(__dirname, outputName)
+  const outputPath = resolve(__dirname, outputName)
 
   t.false(fs.existsSync(outputPath))
 
@@ -297,5 +301,5 @@ test('cli (single input file, zipped output file)', async (t) => {
   // check contents of zip file
   const data = await fs.promises.readFile(outputPath)
   const content = await JSZip.loadAsync(data)
-  t.true(content.files[path.resolve(__dirname, `./test${testID}.stl`)] !== undefined)
+  t.true(content.files[resolve(__dirname, `./test${testID}.stl`)] !== undefined)
 })

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@jscad/cli",
-  "version": "2.3.5",
+  "version": "3.0.1-alpha.0",
   "description": "Command Line Interface (CLI) for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
+  "type": "module",
   "bin": {
     "jscad": "./cli.js"
   },
   "scripts": {
-    "coverage": "nyc --all --reporter=html --reporter=text npm test",
+    "coverage": "c8 --all --reporter=html --reporter=text npm test",
     "test": "ava '*.test.js' --serial --verbose --timeout 2m",
     "postinstall": "node -e \"console.log('\\u001b[35m\\u001b[1mLove JSCAD? You can now donate to our open collective:\\u001b[22m\\u001b[39m\\n > \\u001b[34mhttps://opencollective.com/openjscad/donate\\u001b[0m')\""
   },
@@ -35,20 +36,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jscad/array-utils": "2.1.4",
-    "@jscad/core": "2.6.12",
-    "@jscad/io": "2.4.11",
-    "@jscad/modeling": "2.12.5",
+    "@jscad/array-utils": "3.0.1-alpha.0",
+    "@jscad/core": "3.0.1-alpha.0",
+    "@jscad/io": "3.0.1-alpha.0",
+    "@jscad/io-utils": "3.0.1-alpha.0",
+    "@jscad/modeling": "3.0.1-alpha.0",
     "jszip": "^3.10.1"
   },
   "devDependencies": {
-    "ava": "3.15.0",
-    "nyc": "15.1.0"
+    "ava": "^4.3.3",
+    "c8": "^8.0.0"
   },
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "d8010c4f1d70685404a510d604f8b6d5c362f93a"
+  "gitHead": "0660b5c1f1a5faf54d4cfae1cb85bb94182a8d32"
 }

package/src/determineOutputNameAndFormat.js

@@ -1,6 +1,6 @@
-const { supportedOutputExtensions, supportedOutputFormats } = require('@jscad/io/formats')
+import { supportedOutputExtensions, supportedOutputFormats } from '@jscad/io'
 
-const determineOutputNameAndFormat = (outputFormat, outputFile, inputFile) => {
+export const determineOutputNameAndFormat = (outputFormat, outputFile, inputFile) => {
   const extReg = new RegExp(`\\.(${supportedOutputExtensions().join('|')})$`)
   const forReg = new RegExp(`(${supportedOutputFormats().join('|')})`, 'i')
 
@@ -22,5 +22,3 @@ const determineOutputNameAndFormat = (outputFormat, outputFile, inputFile) => {
   }
   return { outputFormat, outputFile }
 }
-
-module.exports = determineOutputNameAndFormat

package/src/env.js

@@ -1,17 +1,14 @@
-const version = require('../package.json').version
+import os from 'os'
 
-const env = () => {
+const version = '[VI]{version}[/VI]' // version is injected by rollup
+
+export const env = () => {
   let env = 'JSCAD ' + version
   if (typeof document !== 'undefined') {
     const w = document.defaultView
     env = env + ' [' + w.navigator.userAgent + ']'
   } else {
-    if (typeof require === 'function') {
-      const os = require('os')
-      env = env + ' [' + os.type() + ':' + os.release() + ',' + os.platform() + ':' + os.arch() + ']'
-    }
+    env = env + ' [' + os.type() + ':' + os.release() + ',' + os.platform() + ':' + os.arch() + ']'
   }
   console.log(env)
 }
-
-module.exports = env