From 4da23e2f1ca9e6d19142138c6895a66079e740fa Mon Sep 17 00:00:00 2001 From: npmstudy Date: Wed, 28 Feb 2024 16:47:01 +0800 Subject: [PATCH 1/3] chore: merge --- example/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/example/CHANGELOG.md b/example/CHANGELOG.md index d7338f8..ce88e14 100644 --- a/example/CHANGELOG.md +++ b/example/CHANGELOG.md @@ -38,8 +38,6 @@ - Updated dependencies - minecat@0.1.0 -<<<<<<< HEAD - ## 1.0.8 ### Patch Changes From f42ea874da2991d64513c3ef70e1e326cf654880 Mon Sep 17 00:00:00 2001 From: npmstudy Date: Wed, 28 Feb 2024 16:56:00 +0800 Subject: [PATCH 2/3] chore: use minecat fold instead of core --- packages/{core => minecat}/CHANGELOG.md | 0 packages/{core => minecat}/README.md | 0 packages/{core => minecat}/package.json | 0 packages/{core => minecat}/postinstall.js | 0 packages/{core => minecat}/src/__tests__/index.test.ts | 0 packages/{core => minecat}/src/cmd/add.ts | 0 packages/{core => minecat}/src/cmd/config.ts | 0 packages/{core => minecat}/src/cmd/init.ts | 0 packages/{core => minecat}/src/cmd/install.ts | 0 packages/{core => minecat}/src/cmd/run.ts | 0 packages/{core => minecat}/src/cmd/tpl.ts | 0 packages/{core => minecat}/src/config.ts | 0 packages/{core => minecat}/src/index.ts | 0 packages/{core => minecat}/src/types/package-json.ts | 0 packages/{core => minecat}/src/util.ts | 0 packages/{core => minecat}/tsconfig.json | 0 packages/{core => minecat}/tsup.config.cjs | 0 packages/{core => minecat}/vitest.config.cjs | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename packages/{core => minecat}/CHANGELOG.md (100%) rename packages/{core => minecat}/README.md (100%) rename packages/{core => minecat}/package.json (100%) rename packages/{core => minecat}/postinstall.js (100%) rename packages/{core => minecat}/src/__tests__/index.test.ts (100%) rename packages/{core => minecat}/src/cmd/add.ts (100%) rename packages/{core => minecat}/src/cmd/config.ts (100%) rename packages/{core => minecat}/src/cmd/init.ts (100%) rename packages/{core => minecat}/src/cmd/install.ts (100%) rename packages/{core => minecat}/src/cmd/run.ts (100%) rename packages/{core => minecat}/src/cmd/tpl.ts (100%) rename packages/{core => minecat}/src/config.ts (100%) rename packages/{core => minecat}/src/index.ts (100%) rename packages/{core => minecat}/src/types/package-json.ts (100%) rename packages/{core => minecat}/src/util.ts (100%) rename packages/{core => minecat}/tsconfig.json (100%) rename packages/{core => minecat}/tsup.config.cjs (100%) rename packages/{core => minecat}/vitest.config.cjs (100%) diff --git a/packages/core/CHANGELOG.md b/packages/minecat/CHANGELOG.md similarity index 100% rename from packages/core/CHANGELOG.md rename to packages/minecat/CHANGELOG.md diff --git a/packages/core/README.md b/packages/minecat/README.md similarity index 100% rename from packages/core/README.md rename to packages/minecat/README.md diff --git a/packages/core/package.json b/packages/minecat/package.json similarity index 100% rename from packages/core/package.json rename to packages/minecat/package.json diff --git a/packages/core/postinstall.js b/packages/minecat/postinstall.js similarity index 100% rename from packages/core/postinstall.js rename to packages/minecat/postinstall.js diff --git a/packages/core/src/__tests__/index.test.ts b/packages/minecat/src/__tests__/index.test.ts similarity index 100% rename from packages/core/src/__tests__/index.test.ts rename to packages/minecat/src/__tests__/index.test.ts diff --git a/packages/core/src/cmd/add.ts b/packages/minecat/src/cmd/add.ts similarity index 100% rename from packages/core/src/cmd/add.ts rename to packages/minecat/src/cmd/add.ts diff --git a/packages/core/src/cmd/config.ts b/packages/minecat/src/cmd/config.ts similarity index 100% rename from packages/core/src/cmd/config.ts rename to packages/minecat/src/cmd/config.ts diff --git a/packages/core/src/cmd/init.ts b/packages/minecat/src/cmd/init.ts similarity index 100% rename from packages/core/src/cmd/init.ts rename to packages/minecat/src/cmd/init.ts diff --git a/packages/core/src/cmd/install.ts b/packages/minecat/src/cmd/install.ts similarity index 100% rename from packages/core/src/cmd/install.ts rename to packages/minecat/src/cmd/install.ts diff --git a/packages/core/src/cmd/run.ts b/packages/minecat/src/cmd/run.ts similarity index 100% rename from packages/core/src/cmd/run.ts rename to packages/minecat/src/cmd/run.ts diff --git a/packages/core/src/cmd/tpl.ts b/packages/minecat/src/cmd/tpl.ts similarity index 100% rename from packages/core/src/cmd/tpl.ts rename to packages/minecat/src/cmd/tpl.ts diff --git a/packages/core/src/config.ts b/packages/minecat/src/config.ts similarity index 100% rename from packages/core/src/config.ts rename to packages/minecat/src/config.ts diff --git a/packages/core/src/index.ts b/packages/minecat/src/index.ts similarity index 100% rename from packages/core/src/index.ts rename to packages/minecat/src/index.ts diff --git a/packages/core/src/types/package-json.ts b/packages/minecat/src/types/package-json.ts similarity index 100% rename from packages/core/src/types/package-json.ts rename to packages/minecat/src/types/package-json.ts diff --git a/packages/core/src/util.ts b/packages/minecat/src/util.ts similarity index 100% rename from packages/core/src/util.ts rename to packages/minecat/src/util.ts diff --git a/packages/core/tsconfig.json b/packages/minecat/tsconfig.json similarity index 100% rename from packages/core/tsconfig.json rename to packages/minecat/tsconfig.json diff --git a/packages/core/tsup.config.cjs b/packages/minecat/tsup.config.cjs similarity index 100% rename from packages/core/tsup.config.cjs rename to packages/minecat/tsup.config.cjs diff --git a/packages/core/vitest.config.cjs b/packages/minecat/vitest.config.cjs similarity index 100% rename from packages/core/vitest.config.cjs rename to packages/minecat/vitest.config.cjs From ed74b66bb7a2330afb91a35a907f15d5f65405d3 Mon Sep 17 00:00:00 2001 From: npmstudy Date: Wed, 28 Feb 2024 16:58:04 +0800 Subject: [PATCH 3/3] chore: use minecat fold instead of core --- pnpm-lock.yaml | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d1fb13..c19f75e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,7 +61,7 @@ importers: version: 13.3.0 minecat: specifier: workspace:^ - version: link:packages/core + version: link:packages/minecat nx: specifier: 16.3.2 version: 16.3.2 @@ -91,7 +91,7 @@ importers: dependencies: minecat: specifier: workspace:* - version: link:../packages/core + version: link:../packages/minecat devDependencies: '@types/koa': specifier: ^2.13.9 @@ -106,7 +106,29 @@ importers: specifier: ^4.9.5 version: 4.9.5 - packages/core: + packages/libargs: + dependencies: + debug: + specifier: ^4.3.4 + version: 4.3.4(supports-color@5.5.0) + kleur: + specifier: ^4.1.5 + version: 4.1.5 + yargs-parser: + specifier: ^21.1.1 + version: 21.1.1 + devDependencies: + '@vitest/coverage-v8': + specifier: ^1.0.1 + version: 1.1.3(vitest@1.2.1) + desm: + specifier: ^1.3.1 + version: 1.3.1 + happy-dom: + specifier: ^6.0.4 + version: 6.0.4 + + packages/minecat: dependencies: dclone: specifier: ^1.4.2 @@ -161,28 +183,6 @@ importers: specifier: ^4.10.3 version: 4.10.3 - packages/libargs: - dependencies: - debug: - specifier: ^4.3.4 - version: 4.3.4(supports-color@5.5.0) - kleur: - specifier: ^4.1.5 - version: 4.1.5 - yargs-parser: - specifier: ^21.1.1 - version: 21.1.1 - devDependencies: - '@vitest/coverage-v8': - specifier: ^1.0.1 - version: 1.1.3(vitest@1.2.1) - desm: - specifier: ^1.3.1 - version: 1.3.1 - happy-dom: - specifier: ^6.0.4 - version: 6.0.4 - packages: /@aashutoshrathi/word-wrap@1.2.6: