diff --git a/bin/cloudcmd.mjs b/bin/cloudcmd.mjs index 4ad45662..5bd94582 100755 --- a/bin/cloudcmd.mjs +++ b/bin/cloudcmd.mjs @@ -8,7 +8,7 @@ import {createSimport} from 'simport'; import parse from 'yargs-parser'; import exit from '../server/exit.js'; import {createConfig, configPath} from '../server/config.js'; -import env from '../server/env.js'; +import * as env from '../server/env.mjs'; import prefixer from '../server/prefixer.js'; import * as validate from '../server/validate.mjs'; diff --git a/server/distribute/import.mjs b/server/distribute/import.mjs index 5c17b4cb..4f503425 100644 --- a/server/distribute/import.mjs +++ b/server/distribute/import.mjs @@ -5,7 +5,7 @@ import {fullstore} from 'fullstore'; import io from 'socket.io-client'; import _forEachKey from 'for-each-key'; import log from './log.mjs'; -import env from '../env.js'; +import * as env from '../env.mjs'; const noop = () => {}; const forEachKey = currify(_forEachKey); diff --git a/server/env.js b/server/env.mjs similarity index 68% rename from server/env.js rename to server/env.mjs index 4d53bd49..00858b74 100644 --- a/server/env.js +++ b/server/env.mjs @@ -1,12 +1,9 @@ -'use strict'; - -const {env} = require('node:process'); -const snake = require('just-snake-case'); +import {env} from 'node:process'; +import snake from 'just-snake-case'; const up = (a) => a.toUpperCase(); -module.exports.parse = parse; -module.exports.bool = (name) => { +export const bool = (name) => { const value = parse(name); if (value === 'true') @@ -22,7 +19,7 @@ module.exports.bool = (name) => { return false; }; -function parse(name) { +export const parse = (name) => { const small = `cloudcmd_${snake(name)}`; const big = up(small); diff --git a/server/env.spec.js b/server/env.spec.js index 36843cb2..d8f3faf6 100644 --- a/server/env.spec.js +++ b/server/env.spec.js @@ -2,7 +2,7 @@ const process = require('node:process'); const test = require('supertape'); -const env = require('./env'); +const env = require('./env.mjs'); test('cloudcmd: server: env: bool: upper case first', (t) => { const { diff --git a/test/server/env.js b/test/server/env.js index e5d9450c..52f54b45 100644 --- a/test/server/env.js +++ b/test/server/env.js @@ -2,7 +2,7 @@ const process = require('node:process'); const test = require('supertape'); -const env = require('../../server/env'); +const env = require('../../server/env.mjs'); test('env: small', (t) => { process.env.cloudcmd_hello = 'world';