@cabloy/cli 3.0.98 → 3.0.100

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -1,24 +1,25 @@
1
1
  import { glob } from '@cabloy/module-glob';
2
- import { createRequire } from 'node:module';
3
2
  import boxen from 'boxen';
4
3
  import chalk from 'chalk';
4
+ import { createRequire } from 'node:module';
5
5
  import semver from 'semver';
6
6
  import urllib from 'urllib';
7
7
  import NPMConfig from '@npmcli/config';
8
8
  import npmDefinitions from '@npmcli/config/lib/definitions/index.js';
9
- import path from 'node:path';
9
+ import DeepEqual from 'deep-equal';
10
10
  import fse from 'fs-extra';
11
11
  import { globby } from 'globby';
12
- import { pathToFileURL } from 'node:url';
12
+ import path from 'node:path';
13
13
  import * as ModuleInfo from '@cabloy/module-info';
14
14
  import { ProcessHelper } from '@cabloy/process-helper';
15
15
  import { combineResourceName, catchError, evaluate } from '@cabloy/utils';
16
16
  import TableClass from 'cli-table3';
17
17
  import gogocode from 'gogocode';
18
+ import { pathToFileURL } from 'node:url';
18
19
  import tmp from 'tmp';
19
- import fs from 'node:fs';
20
20
  import ejs from '@zhennann/ejs';
21
21
  import isTextOrBinary from 'istextorbinary';
22
+ import fs from 'node:fs';
22
23
  import BaseCommand from '@zhennann/common-bin';
23
24
  import enquirer from 'enquirer';
24
25
  import is from 'is-type-of';
@@ -247,10 +248,12 @@ class LocalCommon {
247
248
  // zovaRest
248
249
  await this._generatePackageJson_pkgFromZovaRest(projectPath, pkgOriginal.dependencies);
249
250
  // save
250
- const strPkgOriginal = `${JSON.stringify(pkgOriginal, null, 2)}\n`;
251
- const strPkg = pkg ? `${JSON.stringify(pkg, null, 2)}\n` : '';
252
- if (strPkgOriginal !== strPkg) {
251
+ if (!DeepEqual(pkg?.scripts, pkgOriginal.scripts) || !DeepEqual(pkg?.dependencies, pkgOriginal.dependencies) || !DeepEqual(pkg?.devDependencies, pkgOriginal.devDependencies)) {
252
+ const strPkgOriginal = `${JSON.stringify(pkgOriginal, null, 2)}\n`;
253
253
  await fse.writeFile(pkgFile, strPkgOriginal);
254
+ await this.cli.helper.formatFile({
255
+ fileName: pkgFile
256
+ });
254
257
  await this.cli.helper.pnpmInstall();
255
258
  return true;
256
259
  }
@@ -1,5 +1,5 @@
1
- import type { CmdOptions } from '../types/argv.ts';
2
1
  import { glob } from '@cabloy/module-glob';
2
+ import type { CmdOptions } from '../types/argv.ts';
3
3
  import { LocalCommon } from './local.common.ts';
4
4
  import { LocalConsole } from './local.console.ts';
5
5
  import { LocalHelper } from './local.helper.ts';
@@ -1,12 +1,12 @@
1
1
  import type { IProcessHelperSpawnOptions } from '@cabloy/process-helper';
2
2
  import type { TableConstructorOptions } from 'cli-table3';
3
- import type { NameMeta } from '../types/helper.ts';
4
- import type { BeanCliBase } from './bean.cli.base.ts';
5
3
  import * as ModuleInfo from '@cabloy/module-info';
6
4
  import { ProcessHelper } from '@cabloy/process-helper';
7
5
  import Chalk from 'chalk';
8
6
  import TableClass from 'cli-table3';
9
7
  import gogocode from 'gogocode';
8
+ import type { NameMeta } from '../types/helper.ts';
9
+ import type { BeanCliBase } from './bean.cli.base.ts';
10
10
  export interface ITempFileOptions {
11
11
  tmpdir?: string;
12
12
  prefix?: string;
@@ -84,7 +84,10 @@ export declare class LocalHelper {
84
84
  findSuite(suiteName: any): ModuleInfo.ISuite;
85
85
  ensureDir(dir: any): Promise<any>;
86
86
  pnpmInstall(): Promise<void>;
87
- formatFile({ fileName, logPrefix }: any): Promise<void>;
87
+ formatFile({ fileName, logPrefix }: {
88
+ fileName: string;
89
+ logPrefix?: string;
90
+ }): Promise<void>;
88
91
  spawnBin({ cmd, args, options }: {
89
92
  cmd: string;
90
93
  args?: string[];
package/package.json CHANGED
@@ -1,17 +1,18 @@
1
1
  {
2
2
  "name": "@cabloy/cli",
3
- "type": "module",
4
- "version": "3.0.98",
3
+ "version": "3.0.100",
4
+ "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
5
5
  "description": "@cabloy/cli",
6
- "publishConfig": {
7
- "access": "public"
8
- },
9
- "author": "zhennann",
10
- "license": "MIT",
11
6
  "keywords": [
12
- "framework",
13
- "cabloy-cli"
7
+ "cabloy-cli",
8
+ "framework"
9
+ ],
10
+ "license": "MIT",
11
+ "author": "zhennann",
12
+ "files": [
13
+ "dist"
14
14
  ],
15
+ "type": "module",
15
16
  "exports": {
16
17
  ".": {
17
18
  "types": [
@@ -22,14 +23,14 @@
22
23
  },
23
24
  "./package.json": "./package.json"
24
25
  },
25
- "files": [
26
- "dist"
27
- ],
26
+ "publishConfig": {
27
+ "access": "public"
28
+ },
28
29
  "dependencies": {
29
30
  "@babel/parser": "^7.26.5",
30
31
  "@cabloy/module-glob": "^5.2.56",
31
- "@cabloy/module-info": "^1.3.41",
32
- "@cabloy/process-helper": "^2.0.25",
32
+ "@cabloy/module-info": "^2.0.0",
33
+ "@cabloy/process-helper": "^3.0.0",
33
34
  "@cabloy/utils": "^2.0.24",
34
35
  "@cabloy/word-utils": "^2.0.2",
35
36
  "@npmcli/config": "^10.4.2",
@@ -38,6 +39,7 @@
38
39
  "boxen": "^4.2.0",
39
40
  "chalk": "^3.0.0",
40
41
  "cli-table3": "^0.6.5",
42
+ "deep-equal": "^2.2.3",
41
43
  "enquirer": "^2.3.6",
42
44
  "fs-extra": "^11.2.0",
43
45
  "globby": "^16.0.0",
@@ -48,7 +50,6 @@
48
50
  "tmp": "^0.2.3",
49
51
  "urllib": "^3.24.0"
50
52
  },
51
- "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
52
53
  "scripts": {
53
54
  "clean": "rimraf dist tsconfig.tsbuildinfo",
54
55
  "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"