Skip to content

Commit

Permalink
Merge branch 'main' into fix/compress-deps-version
Browse files Browse the repository at this point in the history
  • Loading branch information
caohuilin authored Oct 17, 2024
2 parents a88b790 + 5dbff5f commit 65d2b6f
Show file tree
Hide file tree
Showing 48 changed files with 908 additions and 314 deletions.
7 changes: 7 additions & 0 deletions .changeset/mighty-taxis-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@modern-js/upgrade': patch
---

fix: upgrade tools prepare generator error

fix: 修复 upgrade 工具准备阶段生成器失败的问题
8 changes: 4 additions & 4 deletions packages/generator/generator-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"test": "jest --passWithNoTests"
},
"dependencies": {
"@modern-js/codesmith-formily": "2.6.4",
"@modern-js/codesmith-formily": "2.6.5",
"@modern-js/plugin-i18n": "workspace:*",
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/jest": "^29",
Expand Down
12 changes: 6 additions & 6 deletions packages/generator/generator-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"test": "jest"
},
"dependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-api-git": "2.6.4",
"@modern-js/codesmith-api-json": "2.6.4",
"@modern-js/codesmith-api-npm": "2.6.4",
"@modern-js/codesmith-formily": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-api-git": "2.6.5",
"@modern-js/codesmith-api-json": "2.6.5",
"@modern-js/codesmith-api-npm": "2.6.5",
"@modern-js/codesmith-formily": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/new-action": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/generator/generator-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"dependencies": {
"@modern-js/generator-common": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith-utils": "2.6.5",
"glob": "7.2.0",
"js-yaml": "4.1.0",
"json5": "2.2.3",
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/jest": "^29",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/base-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

6 changes: 3 additions & 3 deletions packages/generator/generators/base-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@scripts/build": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/bff-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

8 changes: 4 additions & 4 deletions packages/generator/generators/bff-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-api-json": "2.6.4",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-api-json": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/changeset-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/dependence-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-api-json": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-api-json": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/entry-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

8 changes: 4 additions & 4 deletions packages/generator/generators/entry-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-api-handlebars": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-api-handlebars": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/generator-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-api-json": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-api-json": "2.6.5",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/module-generator": "workspace:*",
Expand Down
31 changes: 31 additions & 0 deletions packages/generator/generators/module-doc-generator/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
.DS_Store

.pnp
.pnp.js
.env.local
.env.*.local
*.log*

node_modules/
*.tsbuildinfo
.eslintcache

coverage/
output/
output_resource/
tests/

.vscode/**/*
!.vscode/settings.json
!.vscode/extensions.json
.idea/

src/

modern.config.*
jest.config.js
.eslintrc.js
.eslintrc
tsconfig.json
CHANGELOG.md

Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"test": "jest --passWithNoTests"
},
"devDependencies": {
"@modern-js/codesmith": "2.6.4",
"@modern-js/codesmith-utils": "2.6.4",
"@modern-js/codesmith-api-app": "2.6.4",
"@modern-js/codesmith-api-json": "2.6.4",
"@modern-js/codesmith": "2.6.5",
"@modern-js/codesmith-utils": "2.6.5",
"@modern-js/codesmith-api-app": "2.6.5",
"@modern-js/codesmith-api-json": "2.6.5",
"@modern-js/dependence-generator": "workspace:*",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
Expand Down
Loading

0 comments on commit 65d2b6f

Please sign in to comment.