Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
52f6afb69a | |||
75c1e3d8f2 | |||
2a1ed874b2 | |||
58fb0bc3d5 | |||
b1fbd38dba | |||
fad5e046d3 | |||
eb1498c242 | |||
6b3d4d1ecf | |||
16ea9bb8bd | |||
7e7aa098f9 | |||
df4350d29d | |||
81eb713dee |
3
assets/overrides.json
Normal file
3
assets/overrides.json
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"peek-readable": "5.3.1"
|
||||||
|
}
|
@ -24,7 +24,7 @@ RUN rm -rf node_modules/ && pnpm install --prod
|
|||||||
|
|
||||||
|
|
||||||
## STAGE 3 // rebuild dependencies for alpine
|
## STAGE 3 // rebuild dependencies for alpine
|
||||||
FROM code.foss.global/host.today/ht-docker-node:alpinenpmci as node3
|
FROM code.foss.global/host.today/ht-docker-node:alpine_npmci as node3
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=node2 /app /app
|
COPY --from=node2 /app /app
|
||||||
ARG NPMCI_TOKEN_NPM2
|
ARG NPMCI_TOKEN_NPM2
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
fileName: {{module.name}}.classes.{{module.name}}db.ts
|
fileName: classes.{{module.name}}db.ts
|
||||||
---
|
---
|
||||||
import * as plugins from './{{module.name}}.plugins.js';
|
import * as plugins from './{{module.name}}.plugins.js';
|
||||||
import { {{module.name}} } from './{{module.name}}.classes.{{module.name}}.js';
|
import { {{module.name}} } from './classes.{{module.name}}.js';
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
|||||||
---
|
---
|
||||||
fileName: {{module.name}}.classes.{{module.name}}.ts
|
fileName: classes.{{module.name}}.ts
|
||||||
---
|
---
|
||||||
import * as plugins from './{{module.name}}.plugins.js';
|
import * as plugins from './{{module.name}}.plugins.js';
|
||||||
import * as paths from './{{module.name}}.paths.js';
|
import * as paths from './{{module.name}}.paths.js';
|
||||||
import { {{module.name}}Db } from './{{module.name}}.db.js'
|
import { {{module.name}}Db } from './classes.{{module.name}}db.js'
|
||||||
|
|
||||||
export class {{module.name}} {
|
export class {{module.name}} {
|
||||||
public projectinfo: plugins.projectinfo.ProjectInfo;
|
public projectinfo: plugins.projectinfo.ProjectInfo;
|
@ -15,8 +15,7 @@ export {
|
|||||||
loleServiceserver
|
loleServiceserver
|
||||||
}
|
}
|
||||||
|
|
||||||
// pushrocks scope
|
// @push.rocks scope
|
||||||
// pushrocks scope
|
|
||||||
import * as projectinfo from '@push.rocks/projectinfo';
|
import * as projectinfo from '@push.rocks/projectinfo';
|
||||||
import * as qenv from '@push.rocks/qenv';
|
import * as qenv from '@push.rocks/qenv';
|
||||||
import * as smartdata from '@push.rocks/smartdata';
|
import * as smartdata from '@push.rocks/smartdata';
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
|
"emitDecoratorMetadata": true,
|
||||||
"useDefineForClassFields": false,
|
"useDefineForClassFields": false,
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "NodeNext",
|
"module": "NodeNext",
|
||||||
|
35
changelog.md
35
changelog.md
@ -1,5 +1,40 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2025-01-29 - 1.12.2 - fix(format)
|
||||||
|
Add overrides for peek-readable in package.json formatting
|
||||||
|
|
||||||
|
- Added a URL correction in the packageJson repository information.
|
||||||
|
- Introduced support for pnpm overrides by including an `overrides.json` file.
|
||||||
|
|
||||||
|
## 2025-01-18 - 1.12.1 - fix(dependencies)
|
||||||
|
Update various package dependencies and Dockerfile base image
|
||||||
|
|
||||||
|
- Updated Dockerfile base image from 'alpinenpmci' to 'alpine_npmci'.
|
||||||
|
- Upgraded @git.zone/tsbuild, @git.zone/tsrun, @git.zone/tsdoc, and other dependencies to their latest versions.
|
||||||
|
|
||||||
|
## 2025-01-17 - 1.12.0 - feat(build)
|
||||||
|
Update TypeScript configuration to support emit decorator metadata
|
||||||
|
|
||||||
|
- Added emitDecoratorMetadata to the tsconfig.json template in assets/templates/tsconfig_update.
|
||||||
|
|
||||||
|
## 2025-01-08 - 1.11.0 - feat(cli)
|
||||||
|
Add Docker command for cleaning up Docker system and extend deprecation command for multiple registries
|
||||||
|
|
||||||
|
- Added a new command 'docker' to handle Docker system cleanup operations.
|
||||||
|
- Improved the 'deprecate' command to support deprecating packages across multiple npm registry URLs.
|
||||||
|
|
||||||
|
## 2025-01-01 - 1.10.10 - fix(templates)
|
||||||
|
Corrected typo in template file comment
|
||||||
|
|
||||||
|
- Fixed repeated comment in the template file for services under 'assets/templates/service/ts/some.plugins.ts'.
|
||||||
|
|
||||||
|
## 2025-01-01 - 1.10.9 - fix(templates)
|
||||||
|
Correct template file paths and organization for service projects
|
||||||
|
|
||||||
|
- Moved 'some.classes.some.ts' to 'classes.some.ts'
|
||||||
|
- Moved 'some.classes.some.db.ts' to 'classes.some.db.ts'
|
||||||
|
- Resolved incorrect import paths in service templates
|
||||||
|
|
||||||
## 2025-01-01 - 1.10.8 - fix(assets/templates)
|
## 2025-01-01 - 1.10.8 - fix(assets/templates)
|
||||||
Update CI template configurations to use module.githost
|
Update CI template configurations to use module.githost
|
||||||
|
|
||||||
|
24
package.json
24
package.json
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@git.zone/cli",
|
"name": "@git.zone/cli",
|
||||||
"private": false,
|
"private": false,
|
||||||
"version": "1.10.8",
|
"version": "1.12.2",
|
||||||
"description": "A CLI toolbelt to streamline local development cycles by using various gitzone utilities.",
|
"description": "A CLI toolbelt to streamline local development cycles by using various gitzone utilities.",
|
||||||
"main": "dist_ts/index.ts",
|
"main": "dist_ts/index.ts",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
@ -52,24 +52,24 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://pages.foss.global/git.zone/cli",
|
"homepage": "https://pages.foss.global/git.zone/cli",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@git.zone/tsbuild": "^2.1.84",
|
"@git.zone/tsbuild": "^2.2.0",
|
||||||
"@git.zone/tsrun": "^1.2.49",
|
"@git.zone/tsrun": "^1.3.3",
|
||||||
"@git.zone/tstest": "^1.0.90",
|
"@git.zone/tstest": "^1.0.90",
|
||||||
"@types/node": "^22.8.1"
|
"@types/node": "^22.10.7"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@git.zone/tsdoc": "^1.3.12",
|
"@git.zone/tsdoc": "^1.4.3",
|
||||||
"@git.zone/tspublish": "^1.4.0",
|
"@git.zone/tspublish": "^1.9.1",
|
||||||
"@push.rocks/commitinfo": "^1.0.12",
|
"@push.rocks/commitinfo": "^1.0.12",
|
||||||
"@push.rocks/early": "^4.0.4",
|
"@push.rocks/early": "^4.0.4",
|
||||||
"@push.rocks/gulp-function": "^3.0.7",
|
"@push.rocks/gulp-function": "^3.0.7",
|
||||||
"@push.rocks/lik": "^6.0.15",
|
"@push.rocks/lik": "^6.0.15",
|
||||||
"@push.rocks/npmextra": "^5.0.23",
|
"@push.rocks/npmextra": "^5.1.2",
|
||||||
"@push.rocks/projectinfo": "^5.0.2",
|
"@push.rocks/projectinfo": "^5.0.2",
|
||||||
"@push.rocks/smartchok": "^1.0.34",
|
"@push.rocks/smartchok": "^1.0.34",
|
||||||
"@push.rocks/smartcli": "^4.0.11",
|
"@push.rocks/smartcli": "^4.0.11",
|
||||||
"@push.rocks/smartdelay": "^3.0.5",
|
"@push.rocks/smartdelay": "^3.0.5",
|
||||||
"@push.rocks/smartfile": "^11.0.21",
|
"@push.rocks/smartfile": "^11.1.5",
|
||||||
"@push.rocks/smartgulp": "^3.0.4",
|
"@push.rocks/smartgulp": "^3.0.4",
|
||||||
"@push.rocks/smartinteract": "^2.0.15",
|
"@push.rocks/smartinteract": "^2.0.15",
|
||||||
"@push.rocks/smartjson": "^5.0.20",
|
"@push.rocks/smartjson": "^5.0.20",
|
||||||
@ -81,14 +81,14 @@
|
|||||||
"@push.rocks/smartobject": "^1.0.12",
|
"@push.rocks/smartobject": "^1.0.12",
|
||||||
"@push.rocks/smartopen": "^2.0.0",
|
"@push.rocks/smartopen": "^2.0.0",
|
||||||
"@push.rocks/smartpath": "^5.0.18",
|
"@push.rocks/smartpath": "^5.0.18",
|
||||||
"@push.rocks/smartpromise": "^4.0.4",
|
"@push.rocks/smartpromise": "^4.1.0",
|
||||||
"@push.rocks/smartscaf": "^4.0.15",
|
"@push.rocks/smartscaf": "^4.0.15",
|
||||||
"@push.rocks/smartshell": "^3.0.6",
|
"@push.rocks/smartshell": "^3.2.2",
|
||||||
"@push.rocks/smartstream": "^3.0.44",
|
"@push.rocks/smartstream": "^3.2.5",
|
||||||
"@push.rocks/smartunique": "^3.0.9",
|
"@push.rocks/smartunique": "^3.0.9",
|
||||||
"@push.rocks/smartupdate": "^2.0.6",
|
"@push.rocks/smartupdate": "^2.0.6",
|
||||||
"@types/through2": "^2.0.41",
|
"@types/through2": "^2.0.41",
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.4.2",
|
||||||
"through2": "^4.0.2"
|
"through2": "^4.0.2"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
|
8747
pnpm-lock.yaml
generated
8747
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@git.zone/cli',
|
name: '@git.zone/cli',
|
||||||
version: '1.10.8',
|
version: '1.12.2',
|
||||||
description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.'
|
description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.'
|
||||||
}
|
}
|
||||||
|
@ -48,6 +48,14 @@ export let run = async () => {
|
|||||||
await modDeprecate.run();
|
await modDeprecate.run();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* docker
|
||||||
|
*/
|
||||||
|
gitzoneSmartcli.addCommand('docker').subscribe(async (argvArg) => {
|
||||||
|
const modDocker = await import('./mod_docker/index.js');
|
||||||
|
await modDocker.run(argvArg);
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update all files that comply with the gitzone standard
|
* Update all files that comply with the gitzone standard
|
||||||
*/
|
*/
|
||||||
|
@ -4,6 +4,15 @@ import { logger } from '../gitzone.logging.js';
|
|||||||
|
|
||||||
export const run = async () => {
|
export const run = async () => {
|
||||||
const smartInteract = new plugins.smartinteract.SmartInteract([
|
const smartInteract = new plugins.smartinteract.SmartInteract([
|
||||||
|
{
|
||||||
|
name: `registryUrls`,
|
||||||
|
message: `What are the comma separated registry URLs?`,
|
||||||
|
type: `input`,
|
||||||
|
default: `https://registry.npmjs.org`,
|
||||||
|
validate: (stringInput) => {
|
||||||
|
return stringInput !== '' && !process.env.CI;
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: `oldPackageName`,
|
name: `oldPackageName`,
|
||||||
message: `Whats the name of the OLD package?`,
|
message: `Whats the name of the OLD package?`,
|
||||||
@ -24,14 +33,17 @@ export const run = async () => {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
const answerBucket = await smartInteract.runQueue();
|
const answerBucket = await smartInteract.runQueue();
|
||||||
|
const registryUrls = answerBucket.getAnswerFor(`registryUrls`).split(',');
|
||||||
const oldPackageName = answerBucket.getAnswerFor(`oldPackageName`);
|
const oldPackageName = answerBucket.getAnswerFor(`oldPackageName`);
|
||||||
const newPackageName = answerBucket.getAnswerFor(`newPackageName`);
|
const newPackageName = answerBucket.getAnswerFor(`newPackageName`);
|
||||||
logger.log('info', `Deprecating package ${oldPackageName} in favour of ${newPackageName}`);
|
logger.log('info', `Deprecating package ${oldPackageName} in favour of ${newPackageName}`);
|
||||||
const smartshellInstance = new plugins.smartshell.Smartshell({
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
||||||
executor: 'bash',
|
executor: 'bash',
|
||||||
});
|
});
|
||||||
await smartshellInstance.exec(
|
for (const registryUrl of registryUrls) {
|
||||||
`npm deprecate ${oldPackageName}@* ` +
|
await smartshellInstance.exec(
|
||||||
`"${oldPackageName} has been deprecated in favour of ${newPackageName} - please upgrade asap!!!"`
|
`npm deprecate ${oldPackageName}@* ` +
|
||||||
);
|
`"${oldPackageName} has been deprecated in favour of ${newPackageName} - please upgrade asap!!!" --registry ${registryUrl}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
12
ts/mod_docker/index.ts
Normal file
12
ts/mod_docker/index.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import * as plugins from './mod.plugins.js';
|
||||||
|
|
||||||
|
export const run = async (argvArg) => {
|
||||||
|
const smartshellInstance = new plugins.smartshell.Smartshell({
|
||||||
|
executor: 'bash',
|
||||||
|
});
|
||||||
|
switch (argvArg._[1]) {
|
||||||
|
case 'prune':
|
||||||
|
await smartshellInstance.exec(`docker system prune -a -f --volumes`);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
4
ts/mod_docker/mod.plugins.ts
Normal file
4
ts/mod_docker/mod.plugins.ts
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
export * from '../plugins.js';
|
||||||
|
|
||||||
|
import * as smartshell from '@push.rocks/smartshell';
|
||||||
|
export { smartshell };
|
@ -27,7 +27,7 @@ export const run = async (projectArg: Project) => {
|
|||||||
// metadata
|
// metadata
|
||||||
packageJson.repository = {
|
packageJson.repository = {
|
||||||
type: 'git',
|
type: 'git',
|
||||||
url: `git+https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}.git`,
|
url: `https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}.git`,
|
||||||
};
|
};
|
||||||
(packageJson.bugs = {
|
(packageJson.bugs = {
|
||||||
url: `https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}/issues`,
|
url: `https://${gitzoneData.module.githost}/${gitzoneData.module.gitscope}/${gitzoneData.module.gitrepo}/issues`,
|
||||||
@ -89,6 +89,13 @@ export const run = async (projectArg: Project) => {
|
|||||||
await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tstest');
|
await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tstest');
|
||||||
await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tsbuild');
|
await ensureDependency(packageJson, 'devDep', 'latest', '@git.zone/tsbuild');
|
||||||
|
|
||||||
|
// set overrides
|
||||||
|
const overrides = plugins.smartfile.fs.toObjectSync(
|
||||||
|
plugins.path.join(paths.assetsDir, 'overrides.json'),
|
||||||
|
)
|
||||||
|
packageJson.pnpm = packageJson.pnpm || {};
|
||||||
|
packageJson.pnpm.overrides = overrides;
|
||||||
|
|
||||||
// exclude
|
// exclude
|
||||||
// TODO
|
// TODO
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user