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
22 changes: 10 additions & 12 deletions bin.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ import tree from 'pretty-tree'
import { inspect } from 'util'
import { createServer } from '@domstack/sync'
import { packageDirectory } from 'package-directory'
import { readPackage } from 'read-pkg'
import { addPackageDependencies } from 'write-package'

import { copyFile } from './lib/helpers/copy-file.js'
import { addPackageDependencies } from './lib/helpers/add-package-dependencies.js'
import { DomStack } from './index.js'
import { DomStackAggregateError } from './lib/helpers/domstack-aggregate-error.js'
import { generateTreeData } from './lib/helpers/generate-tree-data.js'
Expand All @@ -30,9 +29,10 @@ import { createDomStackLogger } from './lib/logger.js'

const __dirname = import.meta.dirname

async function getPkg () {
const pkgPath = resolve(__dirname, './package.json')
const pkg = JSON.parse(await readFile(pkgPath, 'utf8'))
/** @param {string} [pkgPath] */
async function getPkg (pkgPath = resolve(__dirname, './package.json')) {
const source = await readFile(pkgPath, 'utf8')
const pkg = JSON.parse(source.replace(/^\uFEFF/, ''))
return pkg
}

Expand Down Expand Up @@ -152,7 +152,7 @@ async function run () {
}

const localPkgJson = join(localPkg, 'package.json')
const localPkgJsonContents = await readPackage({ cwd: localPkg })
const localPkgJsonContents = await getPkg(localPkgJson)
const targetIsModule = localPkgJsonContents.type === 'module'

const relativeSrc = relative(process.cwd(), src)
Expand All @@ -162,7 +162,7 @@ async function run () {
const targetGlobalStylePath = 'globals/global.css'
const targetGlobalClientPath = `globals/global.client.${targetIsModule ? 'js' : 'mjs'}`

const tbPkgContents = await readPackage({ cwd: __dirname })
const tbPkgContents = await getPkg()
const mineVersion = tbPkgContents?.['dependencies']?.['mine.css']
const fragtmlVersion = tbPkgContents?.['dependencies']?.['fragtml']
const highlightVersion = tbPkgContents?.['dependencies']?.['highlight.js']
Expand Down Expand Up @@ -200,11 +200,9 @@ domstack eject actions:
await addPackageDependencies(
localPkgJson,
{
dependencies: {
'mine.css': mineVersion,
fragtml: fragtmlVersion,
'highlight.js': highlightVersion,
},
'mine.css': mineVersion,
fragtml: fragtmlVersion,
'highlight.js': highlightVersion,
})

console.log('Done ejecting files!')
Expand Down
24 changes: 24 additions & 0 deletions lib/helpers/add-package-dependencies.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { readFile, writeFile } from 'node:fs/promises'

/**
* Add production dependencies without normalizing unrelated package metadata.
*
* @param {string} packagePath
* @param {Record<string, string>} dependencies
*/
export async function addPackageDependencies (packagePath, dependencies) {
Comment thread
bcomnes marked this conversation as resolved.
const source = await readFile(packagePath, 'utf8')
const packageData = JSON.parse(source.replace(/^\uFEFF/, ''))
const indentation = source.match(/^[\t ]+(?=")/m)?.[0] ?? ' '
const trailingNewline = source.endsWith('\n') ? '\n' : ''

packageData.dependencies = {
...packageData.dependencies,
...dependencies,
}

await writeFile(
packagePath,
JSON.stringify(packageData, null, indentation) + trailingNewline
)
}
38 changes: 38 additions & 0 deletions lib/helpers/add-package-dependencies.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import assert from 'node:assert/strict'
import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import path from 'node:path'
import { test } from 'node:test'
import { addPackageDependencies } from './add-package-dependencies.js'

test('adds dependencies while preserving unrelated package metadata', async (t) => {
const directory = await mkdtemp(path.join(tmpdir(), 'domstack-package-'))
const packagePath = path.join(directory, 'package.json')
t.after(() => rm(directory, { recursive: true, force: true }))

await writeFile(packagePath, '\uFEFF' + JSON.stringify({
name: 'example',
private: true,
scripts: { test: 'node --test' },
dependencies: { existing: '^1.0.0', replace: '^1.0.0' },
}, null, '\t') + '\n')

await addPackageDependencies(packagePath, {
added: '^2.0.0',
replace: '^2.0.0',
})

const source = await readFile(packagePath, 'utf8')
assert.ok(source.endsWith('\n'))
assert.match(source, /^\{\n\t"name"/)
assert.deepEqual(JSON.parse(source), {
name: 'example',
private: true,
scripts: { test: 'node --test' },
dependencies: {
existing: '^1.0.0',
replace: '^2.0.0',
added: '^2.0.0',
},
})
})
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@
"pino": "^10.3.1",
"pino-pretty": "^13.1.3",
"pretty": "^2.0.0",
"pretty-tree": "^1.0.0",
"read-pkg": "^10.0.0",
"write-package": "^7.0.1"
"pretty-tree": "^1.0.0"
},
"devDependencies": {
"@playwright/test": "^1.61.1",
Expand Down