From 100f37b8578578e8d8d3ee9da129ec06ba67b126 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Tue, 24 Mar 2026 15:07:15 +0000 Subject: [PATCH] fix(config): switch configuration loading from npmextra to smartconfig --- changelog.md | 7 +++++++ package.json | 2 +- pnpm-lock.yaml | 26 +++++++++++++++++++++++--- ts/00_commitinfo_data.ts | 2 +- ts/tsdocker.cli.ts | 2 +- ts/tsdocker.config.ts | 2 +- ts/tsdocker.plugins.ts | 2 +- 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/changelog.md b/changelog.md index 20ea7b3..90a16d7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2026-03-24 - 2.2.1 - fix(config) +switch configuration loading from npmextra to smartconfig + +- replace the @push.rocks/npmextra dependency with @push.rocks/smartconfig +- update config initialization to use Smartconfig for the @git.zone/tsdocker settings +- refresh CLI help text to reference smartconfig.json instead of npmextra.json + ## 2026-03-19 - 2.2.0 - feat(cli/buildx) add pull control for builds and isolate buildx builders per project diff --git a/package.json b/package.json index 3919db9..21b86ea 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@push.rocks/lik": "^6.3.1", - "@push.rocks/npmextra": "^5.3.3", + "@push.rocks/smartconfig": "^6.0.0", "@push.rocks/projectinfo": "^5.0.2", "@push.rocks/smartcli": "^4.0.20", "@push.rocks/smartfs": "^1.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f3ee0e..97c3c05 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,15 +11,15 @@ importers: '@push.rocks/lik': specifier: ^6.3.1 version: 6.3.1 - '@push.rocks/npmextra': - specifier: ^5.3.3 - version: 5.3.3 '@push.rocks/projectinfo': specifier: ^5.0.2 version: 5.0.2 '@push.rocks/smartcli': specifier: ^4.0.20 version: 4.0.20 + '@push.rocks/smartconfig': + specifier: ^6.0.0 + version: 6.0.0 '@push.rocks/smartfs': specifier: ^1.5.0 version: 1.5.0 @@ -897,6 +897,9 @@ packages: '@push.rocks/smartclickhouse@2.2.0': resolution: {integrity: sha512-eTzKiREIPSzL1kPkVyD6vEbn+WV/DvQqDjP67VlhNlQGbRcemnJG/eLrUUR1ytmdIqnsZGEK6UYBgyj5nhzLNQ==} + '@push.rocks/smartconfig@6.0.0': + resolution: {integrity: sha512-ohXwJdbDXV2budErnZKWBOz01YkjP6gJsZ7QM9+6Wsh+r7O1CVT3JpV+mD8xJWy5tZRHI+3B9L8z0+WkIDtKzw==} + '@push.rocks/smartcrypto@2.0.4': resolution: {integrity: sha512-1+/5bsjyataf5uUkUNnnVXGRAt+gHVk1KDzozjTqgqJxHvQk1d9fVDohL6CxUhUucTPtu5VR5xNBiV8YCDuGyw==} @@ -4970,6 +4973,23 @@ snapshots: '@push.rocks/smarturl': 3.1.0 '@push.rocks/webrequest': 4.0.5 + '@push.rocks/smartconfig@6.0.0': + dependencies: + '@push.rocks/qenv': 6.1.3 + '@push.rocks/smartfile': 11.2.7 + '@push.rocks/smartjson': 5.2.0 + '@push.rocks/smartlog': 3.2.1 + '@push.rocks/smartpath': 6.0.0 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrx': 3.0.10 + '@push.rocks/taskbuffer': 3.5.0 + '@tsclass/tsclass': 9.3.0 + transitivePeerDependencies: + - '@nuxt/kit' + - react + - supports-color + - vue + '@push.rocks/smartcrypto@2.0.4': dependencies: '@push.rocks/smartpromise': 4.2.3 diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index e173095..cc1335e 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@git.zone/tsdocker', - version: '2.2.0', + version: '2.2.1', description: 'develop npm modules cross platform with docker' } diff --git a/ts/tsdocker.cli.ts b/ts/tsdocker.cli.ts index b47f300..abcfc6d 100644 --- a/ts/tsdocker.cli.ts +++ b/ts/tsdocker.cli.ts @@ -67,7 +67,7 @@ CONFIG SUBCOMMANDS show Show full global config CONFIGURATION - Configure via npmextra.json under the "@git.zone/tsdocker" key: + Configure via smartconfig.json under the "@git.zone/tsdocker" key: registries Array of registry URLs to push to registryRepoMap Map of registry URL to repo path overrides diff --git a/ts/tsdocker.config.ts b/ts/tsdocker.config.ts index 705c93b..f669a21 100644 --- a/ts/tsdocker.config.ts +++ b/ts/tsdocker.config.ts @@ -3,7 +3,7 @@ import * as paths from './tsdocker.paths.js'; import type { ITsDockerConfig } from './interfaces/index.js'; const buildConfig = async (): Promise => { - const npmextra = new plugins.npmextra.Npmextra(paths.cwd); + const npmextra = new plugins.npmextra.Smartconfig(paths.cwd); const config = npmextra.dataFor('@git.zone/tsdocker', { registries: [], registryRepoMap: {}, diff --git a/ts/tsdocker.plugins.ts b/ts/tsdocker.plugins.ts index bfef0fa..cd3b94a 100644 --- a/ts/tsdocker.plugins.ts +++ b/ts/tsdocker.plugins.ts @@ -1,6 +1,6 @@ // push.rocks scope import * as lik from '@push.rocks/lik'; -import * as npmextra from '@push.rocks/npmextra'; +import * as npmextra from '@push.rocks/smartconfig'; import * as path from 'path'; import * as projectinfo from '@push.rocks/projectinfo'; import * as smartcli from '@push.rocks/smartcli';