Port ESM files to js extension by SarthakDudhe · Pull Request #1862 · nodeSolidServer/node-solid-server · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 54 additions & 54 deletions bin/lib/cli-utils.mjs → bin/lib/cli-utils.js
88 changes: 44 additions & 44 deletions bin/lib/cli.mjs → bin/lib/cli.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
import { Command } from 'commander'
import loadInit from './init.mjs'
import loadStart from './start.mjs'
import loadInvalidUsernames from './invalidUsernames.mjs'
import loadMigrateLegacyResources from './migrateLegacyResources.mjs'
import loadUpdateIndex from './updateIndex.mjs'
import { spawnSync } from 'child_process'
import path from 'path'
import fs from 'fs'
import { fileURLToPath } from 'url'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
export default function startCli (server) {
const program = new Command()
program.version(getVersion())
loadInit(program)
loadStart(program, server)
loadInvalidUsernames(program)
loadMigrateLegacyResources(program)
loadUpdateIndex(program)
program.parse(process.argv)
if (program.args.length === 0) program.help()
}
function getVersion () {
try {
const options = { cwd: __dirname, encoding: 'utf8' }
const { stdout } = spawnSync('git', ['describe', '--tags'], options)
const { stdout: gitStatusStdout } = spawnSync('git', ['status'], options)
const version = stdout.trim()
if (version === '' || gitStatusStdout.match('Not currently on any branch')) {
throw new Error('No git version here')
}
return version
} catch (e) {
const pkgPath = path.join(__dirname, '../../package.json')
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
return pkg.version
}
}
import { Command } from 'commander'
import loadInit from './init.js'
import loadStart from './start.js'
import loadInvalidUsernames from './invalidUsernames.js'
import loadMigrateLegacyResources from './migrateLegacyResources.js'
import loadUpdateIndex from './updateIndex.js'
import { spawnSync } from 'child_process'
import path from 'path'
import fs from 'fs'
import { fileURLToPath } from 'url'

const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)

export default function startCli (server) {
const program = new Command()
program.version(getVersion())

loadInit(program)
loadStart(program, server)
loadInvalidUsernames(program)
loadMigrateLegacyResources(program)
loadUpdateIndex(program)

program.parse(process.argv)
if (program.args.length === 0) program.help()
}

function getVersion () {
try {
const options = { cwd: __dirname, encoding: 'utf8' }
const { stdout } = spawnSync('git', ['describe', '--tags'], options)
const { stdout: gitStatusStdout } = spawnSync('git', ['status'], options)
const version = stdout.trim()
if (version === '' || gitStatusStdout.match('Not currently on any branch')) {
throw new Error('No git version here')
}
return version
} catch (e) {
const pkgPath = path.join(__dirname, '../../package.json')
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
return pkg.version
}
}
186 changes: 93 additions & 93 deletions bin/lib/init.mjs → bin/lib/init.js
Loading