- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generator-utils/modern.config.js b/packages/generator/generator-utils/modern.config.js deleted file mode 100644 index 1101786c10dd..000000000000 --- a/packages/generator/generator-utils/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { nodeBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: nodeBuildConfig, -}; diff --git a/packages/generator/generator-utils/package.json b/packages/generator/generator-utils/package.json deleted file mode 100644 index 3cb682c856e3..000000000000 --- a/packages/generator/generator-utils/package.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "name": "@modern-js/generator-utils", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generator-utils" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./dist/cjs/index.js", - "exports": { - ".": { - "node": { - "modern:source": "./src/index.ts", - "jsnext:source": "./src/index.ts", - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js" - }, - "default": "./dist/cjs/index.js" - } - }, - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "dependencies": { - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@swc/helpers": "^0.5.17", - "glob": "7.2.3", - "js-yaml": "4.1.1", - "json5": "2.2.3" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@scripts/build": "workspace:*", - "@scripts/rstest-config": "workspace:*", - "@types/glob": "7.2.0", - "@types/js-yaml": "4.0.9", - "@types/node": "^20", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "registry": "https://registry.npmjs.org/", - "access": "public", - "types": "./dist/types/index.d.ts" - } -} diff --git a/packages/generator/generator-utils/rstest.config.ts b/packages/generator/generator-utils/rstest.config.ts deleted file mode 100644 index f018b0d21c8f..000000000000 --- a/packages/generator/generator-utils/rstest.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { withTestPreset } from '@scripts/rstest-config'; - -export default withTestPreset({ - root: __dirname, - globals: true, -}); diff --git a/packages/generator/generator-utils/src/index.ts b/packages/generator/generator-utils/src/index.ts deleted file mode 100644 index 368a6d2eb519..000000000000 --- a/packages/generator/generator-utils/src/index.ts +++ /dev/null @@ -1,191 +0,0 @@ -import path from 'path'; -import type { GeneratorContext } from '@modern-js/codesmith'; -import { getNpmVersion, getPackageInfo } from '@modern-js/codesmith'; -import { fs } from '@modern-js/codesmith-utils/fs-extra'; -import { ora } from '@modern-js/codesmith-utils/ora'; -import { type Solution, SolutionToolsMap } from '@modern-js/generator-common'; -import { i18n, localeKeys } from './locale'; -import { fileExist } from './utils/fsExist'; -import { getMonorepoPackages } from './utils/monorepo'; -import { getAvailableVersion, isPackageExist } from './utils/package'; - -export * from './utils'; - -export { - canUseNpm, - canUsePnpm, - canUseYarn, -} from '@modern-js/codesmith-utils/npm'; -export { fs } from '@modern-js/codesmith-utils/fs-extra'; -export { ora } from '@modern-js/codesmith-utils/ora'; -export { semver } from '@modern-js/codesmith-utils/semver'; -export { execa } from '@modern-js/codesmith-utils/execa'; -export { chalk } from '@modern-js/codesmith-utils/chalk'; - -export { i18n } from './locale'; - -export async function getPackageVersion( - packageName: string, - registryUrl?: string, -): Promise- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/base-generator/modern.config.js b/packages/generator/generators/base-generator/modern.config.js deleted file mode 100644 index 8efa2a15d0b2..000000000000 --- a/packages/generator/generators/base-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildUmdConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildUmdConfig, -}; diff --git a/packages/generator/generators/base-generator/package.json b/packages/generator/generators/base-generator/package.json deleted file mode 100644 index d388fbce5fe9..000000000000 --- a/packages/generator/generators/base-generator/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "@modern-js/base-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/base-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - } -} diff --git a/packages/generator/generators/base-generator/src/index.ts b/packages/generator/generators/base-generator/src/index.ts deleted file mode 100644 index aec6ceb69b77..000000000000 --- a/packages/generator/generators/base-generator/src/index.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; - -const handleTemplateFile = async ( - context: GeneratorContext, - _generator: GeneratorCore, - appApi: AppAPI, -) => { - await appApi.forgeTemplate( - 'templates/base-template/**/*', - undefined, - resourceKey => - resourceKey - .replace('templates/base-template/', '') - .replace('.handlebars', ''), - ); - - await appApi.forgeTemplate( - 'templates/pnpm-template/**/*', - undefined, - resourceKey => - resourceKey - .replace('templates/pnpm-template/npmrc', '.npmrc') - .replace('.handlebars', ''), - ); -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - const { locale } = context.config; - appApi.i18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run Base Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - await handleTemplateFile(context, generator, appApi); - - generator.logger.debug(`🌟 [End Run Base Generator]`); -}; diff --git a/packages/generator/generators/base-generator/templates/base-template/.gitignore.handlebars b/packages/generator/generators/base-generator/templates/base-template/.gitignore.handlebars deleted file mode 100644 index cd3fdf89df01..000000000000 --- a/packages/generator/generators/base-generator/templates/base-template/.gitignore.handlebars +++ /dev/null @@ -1,30 +0,0 @@ -.DS_Store - -.pnp -.pnp.js -.env.local -.env.*.local -.history -*.log* - -node_modules/ -.yarn-integrity -.pnpm-store/ -*.tsbuildinfo -.changeset/pre.json - -dist/ -coverage/ -release/ -output/ -output_resource/ -log/ - -.vscode/**/* -!.vscode/settings.json -!.vscode/extensions.json -.idea/ - -**/*/typings/auto-generated - -modern.config.local.* diff --git a/packages/generator/generators/base-generator/templates/base-template/.nvmrc b/packages/generator/generators/base-generator/templates/base-template/.nvmrc deleted file mode 100644 index deed13c0169b..000000000000 --- a/packages/generator/generators/base-generator/templates/base-template/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -lts/jod diff --git a/packages/generator/generators/base-generator/templates/base-template/.vscode/extensions.json b/packages/generator/generators/base-generator/templates/base-template/.vscode/extensions.json deleted file mode 100644 index de9dced4ecd8..000000000000 --- a/packages/generator/generators/base-generator/templates/base-template/.vscode/extensions.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "recommendations": [ - "styled-components.vscode-styled-components", - "EditorConfig.editorconfig", - "streetsidesoftware.code-spell-checker", - "codezombiech.gitignore", - "aaron-bond.better-comments", - "jasonnutter.search-node-modules", - "jock.svg", - "mikestead.dotenv", - "vscode-icons-team.vscode-icons", - "biomejs.biome" - ] -} diff --git a/packages/generator/generators/base-generator/templates/base-template/.vscode/settings.json b/packages/generator/generators/base-generator/templates/base-template/.vscode/settings.json deleted file mode 100644 index 0c3c75096432..000000000000 --- a/packages/generator/generators/base-generator/templates/base-template/.vscode/settings.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "files.associations": { - ".code-workspace": "jsonc", - ".stylelintrc": "jsonc", - "stylelintrc": "jsonc", - "README": "markdown" - }, - "search.useIgnoreFiles": true, - "search.exclude": { - "**/dist": true, - "**/*.log": true, - "**/*.pid": true, - "**/.git": true, - "**/node_modules": true - }, - // - "editor.rulers": [80, 120], - "files.eol": "\n", - "files.trimTrailingWhitespace": true, - "files.insertFinalNewline": true, - // - "cSpell.diagnosticLevel": "Hint", - "javascript.validate.enable": false, - "typescript.validate.enable": true, - "css.validate": false, - "scss.validate": false, - "less.validate": false, - "[css]": { - "editor.formatOnType": true, - "editor.formatOnPaste": true, - "editor.formatOnSave": true - }, - "[scss]": { - "editor.formatOnType": true, - "editor.formatOnPaste": true, - "editor.formatOnSave": true - }, - "[less]": { - "editor.formatOnType": true, - "editor.formatOnPaste": true, - "editor.formatOnSave": true - }, - "editor.codeActionsOnSave": { - "quickfix.biome": "explicit" - }, - "editor.defaultFormatter": "biomejs.biome", - "editor.formatOnSave": true, - "[typescript]": { - "editor.defaultFormatter": "biomejs.biome", - "editor.codeActionsOnSave": { - "quickfix.biome": "explicit", - "source.organizeImports": "never", - "source.organizeImports.biome": "explicit" - }, - }, - "[typescriptreact]": { - "editor.defaultFormatter": "biomejs.biome", - "editor.codeActionsOnSave": { - "quickfix.biome": "explicit", - "source.organizeImports": "never", - "source.organizeImports.biome": "explicit" - }, - }, - "[json]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[jsonc]": { - "editor.defaultFormatter": "biomejs.biome" - }, - "[javascriptreact]": { - "editor.defaultFormatter": "biomejs.biome", - "editor.codeActionsOnSave": { - "quickfix.biome": "explicit", - "source.organizeImports": "never", - "source.organizeImports.biome": "explicit" - }, - }, - "[javascript]": { - "editor.defaultFormatter": "biomejs.biome", - "editor.codeActionsOnSave": { - "quickfix.biome": "explicit", - "source.organizeImports": "never", - "source.organizeImports.biome": "explicit" - }, - }, - "emmet.triggerExpansionOnTab": true, - "typescript.tsdk": "node_modules/typescript/lib" -} diff --git a/packages/generator/generators/base-generator/templates/base-template/biome.json b/packages/generator/generators/base-generator/templates/base-template/biome.json deleted file mode 100644 index a2ed5bc12ac7..000000000000 --- a/packages/generator/generators/base-generator/templates/base-template/biome.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json", - "vcs": { - "enabled": true, - "defaultBranch": "main", - "clientKind": "git", - "useIgnoreFile": true - }, - "formatter": { - "enabled": true, - "indentStyle": "space" - }, - "javascript": { - "formatter": { - "quoteStyle": "single", - "arrowParentheses": "asNeeded", - "jsxQuoteStyle": "double", - "lineWidth": 80 - } - }, - "linter": { - "enabled": true, - "rules": { - "recommended": true, - "suspicious": { - "noDuplicateFontNames": "off" - } - } - }, - "organizeImports": { - "enabled": true - }, - "files": { - "ignoreUnknown": true, - "ignore": [".vscode/**/*", "node_modules/**/*", "dist/**/*"] - } -} diff --git a/packages/generator/generators/base-generator/templates/pnpm-template/npmrc.handlebars b/packages/generator/generators/base-generator/templates/pnpm-template/npmrc.handlebars deleted file mode 100644 index 319e41e69dc9..000000000000 --- a/packages/generator/generators/base-generator/templates/pnpm-template/npmrc.handlebars +++ /dev/null @@ -1 +0,0 @@ -strict-peer-dependencies=false diff --git a/packages/generator/generators/base-generator/tsconfig.json b/packages/generator/generators/base-generator/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/generators/base-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/generator/generators/bff-generator/.npmignore b/packages/generator/generators/bff-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/bff-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.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 - diff --git a/packages/generator/generators/bff-generator/CHANGELOG.md b/packages/generator/generators/bff-generator/CHANGELOG.md deleted file mode 100644 index 23ce6961aabc..000000000000 --- a/packages/generator/generators/bff-generator/CHANGELOG.md +++ /dev/null @@ -1,1097 +0,0 @@ -# @modern-js/bff-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -### Patch Changes - -- 1a2e7bb: feat: migrate to Hono bff - feat: 迁移到 Hono bff - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - -## 3.6.2 - -### Patch Changes - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] - - @modern-js/utils@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/utils@2.60.1 - -## 3.6.0 - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Patch Changes - -- @modern-js/utils@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/utils@2.58.3 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [a1a9373] - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 - -## 3.4.14 - -### Patch Changes - -- @modern-js/utils@2.58.0 - -## 3.4.13 - -### Patch Changes - -- @modern-js/utils@2.57.1 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - -## 3.4.11 - -### Patch Changes - -- @modern-js/utils@2.56.2 - -## 3.4.10 - -### Patch Changes - -- @modern-js/utils@2.56.1 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 - -## 3.4.8 - -### Patch Changes - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - -## 3.4.7 - -### Patch Changes - -- @modern-js/utils@2.54.6 - -## 3.4.6 - -### Patch Changes - -- @modern-js/utils@2.54.5 - -## 3.4.5 - -### Patch Changes - -- @modern-js/utils@2.54.4 - -## 3.4.4 - -### Patch Changes - -- @modern-js/utils@2.54.3 - -## 3.4.3 - -### Patch Changes - -- @modern-js/utils@2.54.2 - -## 3.4.2 - -### Patch Changes - -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - -## 3.4.0 - -### Patch Changes - -- @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/utils@2.52.0 - -## 3.3.24 - -### Patch Changes - -- @modern-js/utils@2.51.0 - -## 3.3.23 - -### Patch Changes - -- @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/utils@2.49.3 - -## 3.3.20 - -### Patch Changes - -- @modern-js/utils@2.49.2 - -## 3.3.19 - -### Patch Changes - -- @modern-js/utils@2.49.1 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - -## 3.3.17 - -### Patch Changes - -- @modern-js/utils@2.48.6 - -## 3.3.16 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - -## 3.3.14 - -### Patch Changes - -- @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/utils@2.48.2 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] - - @modern-js/utils@2.48.1 - -## 3.3.11 - -### Patch Changes - -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - -## 3.3.10 - -### Patch Changes - -- @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -## 3.1.39 - -## 3.1.38 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -### Patch Changes - -- 2edd844: feat: add named exports for solution new command - - feat: 为 solution new 命令添加 named 导出 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -### Patch Changes - -- 034f36b: feat: set the default language of CLI to English - - feat: 将命令行的默认语言设置为英文 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 - -## 3.0.9 - -## 3.0.8 - -## 3.0.7 - -### Patch Changes - -- 577084d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.0.6 - -### Patch Changes - -- 1023fbb: feat: new command tooitip support code highlight - - feat: new 命令提示支持代码高亮 - -## 3.0.5 - -## 3.0.4 - -## 3.0.3 - -## 3.0.2 - -## 3.0.1 - -## 3.0.0 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.6 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.5 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.4 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.3 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.2 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.1 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.0 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180: fix: generator bundle - - fix: 生成器打包 - -## 2.4.7 - -## 2.4.6 - -## 2.4.5 - -### Patch Changes - -- cfd8557: feat: new command install not run prepare scripts - - feat: new 命令安装依赖时不执行 prepare 脚本 - -## 2.4.4 - -## 2.4.3 - -## 2.4.0 - -## 2.3.4 - -## 2.3.3 - -## 2.3.1 - -### Patch Changes - -- f3fab28: feat: new command use solution version - - feat: new 命令使用当前工程方案对应版本的插件 - -## 2.3.0 - -### Patch Changes - -- 9d9bbfd05: feat: update codesmith package - - feat: 升级 codesmith 包版本 - -## 2.2.1 - -## 1.4.0 - -### Minor Changes - -- 52374e3: chore(generator): use module-tools bundle function to bundle generator package - - chore(generator): 使用 module-tools 的 bundle 功能实现生成器打包 - -## 1.3.5 - -### Patch Changes - -- 74e74ee: feat: update codesmith json api version - - feat: 升级 `@modern-js/codesmith-api-json` 版本 - -## 1.3.4 - -### Patch Changes - -- 341bb42: feat: bump codesmith package version - -## 1.3.3 - -### Patch Changes - -- a1198d509: feat: bump babel 7.18.0 -- c7e38b4e6: feat: upgrade codesmith pkg version - -## 1.3.2 - -### Patch Changes - -- 6b0bb5e3b: feat: bump codesmith version - -## 1.3.1 - -### Patch Changes - -- 895fa0ff: chore: using "workspace:\*" in devDependencies - -## 1.3.0 - -### Minor Changes - -- 5f4eb1ec: fix: js generator problem -- 2b12032c: feat: upgrade csmith tools -- a4330c73: feat: adjust generator eslint and tsconig file - -### Patch Changes - -- 6cffe99d: chore: - remove react eslint rules for `modern-js` rule set. - add .eslintrc for each package to speed up linting - -## 1.2.4 - -### Patch Changes - -- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash - -## 1.2.3 - -### Patch Changes - -- 6668a1bf: feat: upgrade @modern-js/codesmith-api-app version - -## 1.2.2 - -### Patch Changes - -- e0e4fbba: fix: bff generator template -- 2ba581e4: fix: bff nest function template - -## 1.2.1 - -### Patch Changes - -- e06c7c25: change generator main path on development mode - -## 1.2.0 - -### Minor Changes - -- cfe11628: Make Modern.js self bootstraping - -### Patch Changes - -- 2c049918: feat: polyfill function support enable using new command - -## 1.1.6 - -### Patch Changes - -- ad107726: feat: new action support apppend type define -- f73fee4b: feat: upgrade codesmith version to add get npm package timeout's time - -## 1.1.5 - -### Patch Changes - -- 4819a3c7: feat: update generator version - -## 1.1.4 - -### Patch Changes - -- 4a5214db: fix: generator plugin error - -## 1.1.3 - -### Patch Changes - -- feat: bump csmith tools version - -## 1.1.2 - -### Patch Changes - -- e12b3d0b: feat: upgrade codesmith version - -## 1.1.1 - -### Patch Changes - -- 2c0750e1: fix generator export config - -## 1.1.0 - -### Minor Changes - -- 96119db2: Relese v1.1.0 - -## 1.0.3 - -### Patch Changes - -- feat: update generator template - -## 1.0.2 - -### Patch Changes - -- feat: update generator template - fix: fix monorepo-tools log info - -## 1.0.1 - -### Patch Changes - -- feat: update generator template version - -## 1.0.0 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.24 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.23 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.22 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.21 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.20 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.19 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.18 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- fix: #118 #104 - -## 1.0.0-rc.17 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.16 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.15 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.14 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.12 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.11 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.10 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.9 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.8 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.7 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.6 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.5 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.4 - -### Patch Changes - -- fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.3 - -### Patch Changes - -- feat: initial diff --git a/packages/generator/generators/bff-generator/LICENSE b/packages/generator/generators/bff-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/bff-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/bff-generator/README.md b/packages/generator/generators/bff-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/bff-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ - - -- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/bff-generator/jest.config.js b/packages/generator/generators/bff-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/bff-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/bff-generator/modern.config.js b/packages/generator/generators/bff-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/bff-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/bff-generator/package.json b/packages/generator/generators/bff-generator/package.json deleted file mode 100644 index 31a34a9de8d9..000000000000 --- a/packages/generator/generators/bff-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/bff-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/bff-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-json": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - } -} diff --git a/packages/generator/generators/bff-generator/src/index.ts b/packages/generator/generators/bff-generator/src/index.ts deleted file mode 100644 index e21c6db5583a..000000000000 --- a/packages/generator/generators/bff-generator/src/index.ts +++ /dev/null @@ -1,187 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { JsonAPI } from '@modern-js/codesmith-api-json'; -import { Solution, i18n as commonI18n } from '@modern-js/generator-common'; -import { - fs, - chalk, - getModernConfigFile, - getModernPluginVersion, - readTsConfigByFile, -} from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; - -function isEmptyApiDir(apiDir: string) { - const files = fs.readdirSync(apiDir); - if (files.length === 0) { - return true; - } - return files.every(file => { - if (fs.statSync(path.join(apiDir, file)).isDirectory()) { - const childFiles = fs.readdirSync(path.join(apiDir, file)); - return childFiles.length === 0; - } - return false; - }); -} - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const jsonAPI = new JsonAPI(generator); - - const appDir = context.materials.default.basePath; - const apiDir = path.join(appDir, 'api'); - - if (fs.existsSync(apiDir) && !isEmptyApiDir(apiDir)) { - const files = fs.readdirSync(apiDir); - if (files.length > 0) { - generator.logger.warn(`🟡 The 'api' directory already exists.`); - throw Error("The 'api' directory is already exist"); - } - } - - const getBffPluginVersion = (packageName: string) => { - return getModernPluginVersion(Solution.MWA, packageName, { - registry: context.config.registry, - distTag: context.config.distTag, - cwd: context.materials.default.basePath, - }); - }; - - await jsonAPI.update( - context.materials.default.get(path.join(appDir, 'package.json')), - { - query: {}, - update: { - $set: { - 'dependencies.@modern-js/plugin-bff': `${await getBffPluginVersion( - '@modern-js/plugin-bff', - )}`, - 'devDependencies.ts-node': '~10.8.1', - 'devDependencies.tsconfig-paths': '~3.14.1', - }, - }, - }, - true, - ); - - const tsconfigJSON = readTsConfigByFile(path.join(appDir, 'tsconfig.json')); - - if (!(tsconfigJSON.include || []).includes('api')) { - await jsonAPI.update( - context.materials.default.get(path.join(appDir, 'tsconfig.json')), - { - query: {}, - update: { - $set: { - include: [...(tsconfigJSON.include || []), 'api'], - }, - }, - }, - true, - ); - } - - await jsonAPI.update( - context.materials.default.get(path.join(appDir, 'tsconfig.json')), - { - query: {}, - update: { - $set: { - 'compilerOptions.paths.@api/*': ['./api/lambda/*'], - }, - }, - }, - true, - ); - - await appApi.forgeTemplate( - `templates/framework/lambda/*`, - undefined, - resourceKey => - resourceKey - .replace(`templates/framework/`, 'api/') - .replace('.handlebars', `.ts`), - ); -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - - const { locale } = context.config; - i18n.changeLanguage({ locale }); - appApi.i18n.changeLanguage({ locale }); - commonI18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run BFF Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - try { - await handleTemplateFile(context, generator, appApi); - } catch (e) { - process.exit(1); - } - - await appApi.runInstall(undefined, { ignoreScripts: true }); - - if (!context.config.isSubGenerator) { - await appApi.runInstall(undefined, { ignoreScripts: true }); - if (!context.config.pluginName) { - appApi.showSuccessInfo(); - } else { - const appDir = context.materials.default.basePath; - const configFile = await getModernConfigFile(appDir); - const isTS = configFile.endsWith('ts'); - const { pluginName, pluginDependence, shouldUsePluginNameExport } = - context.config; - - console.info( - chalk.green(`\n[INFO]`), - `${i18n.t(localeKeys.success)}`, - chalk.yellow.bold(`${configFile}`), - ':', - '\n', - ); - if (shouldUsePluginNameExport) { - console.info( - chalk.yellow.bold( - `import { ${pluginName} } from '${pluginDependence}';`, - ), - ); - } else { - console.info( - chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`), - ); - } - - if (isTS) { - console.info(` -export default defineConfig({ - ..., - plugins: [..., ${chalk.yellow.bold(`${pluginName}()`)}], -}); -`); - } else { - console.info(` -module.exports = { - ..., - plugins: [..., ${chalk.yellow.bold(`${pluginName}()`)}], -}; -`); - } - } - } - - generator.logger.debug(`🌟 [End Run BFF Generator]`); -}; diff --git a/packages/generator/generators/bff-generator/src/locale/en.ts b/packages/generator/generators/bff-generator/src/locale/en.ts deleted file mode 100644 index e48ded5d925a..000000000000 --- a/packages/generator/generators/bff-generator/src/locale/en.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const EN_LOCALE = { - success: `Plugin dependency installed successfully! Please add the following code to`, -}; diff --git a/packages/generator/generators/bff-generator/src/locale/index.ts b/packages/generator/generators/bff-generator/src/locale/index.ts deleted file mode 100644 index c2369bb377be..000000000000 --- a/packages/generator/generators/bff-generator/src/locale/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { I18n } from '@modern-js/i18n-utils'; -import { EN_LOCALE } from './en'; -import { ZH_LOCALE } from './zh'; - -const i18n = new I18n(); - -const localeKeys = i18n.init('en', { zh: ZH_LOCALE, en: EN_LOCALE }); - -export { i18n, localeKeys }; diff --git a/packages/generator/generators/bff-generator/src/locale/zh.ts b/packages/generator/generators/bff-generator/src/locale/zh.ts deleted file mode 100644 index 7a25355c8545..000000000000 --- a/packages/generator/generators/bff-generator/src/locale/zh.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const ZH_LOCALE = { - success: `安装插件依赖成功!请添加如下代码至`, -}; diff --git a/packages/generator/generators/bff-generator/templates/framework/lambda/hello.handlebars b/packages/generator/generators/bff-generator/templates/framework/lambda/hello.handlebars deleted file mode 100644 index 391e306768c7..000000000000 --- a/packages/generator/generators/bff-generator/templates/framework/lambda/hello.handlebars +++ /dev/null @@ -1,7 +0,0 @@ -export default async () => ({ - message: 'Hello Modern.js', -}); - -export const post = async () => ({ - message: 'Hello Modern.js', -}); diff --git a/packages/generator/generators/bff-generator/tsconfig.json b/packages/generator/generators/bff-generator/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/generators/bff-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/generator/generators/dependence-generator/.npmignore b/packages/generator/generators/dependence-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/dependence-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.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 - diff --git a/packages/generator/generators/dependence-generator/CHANGELOG.md b/packages/generator/generators/dependence-generator/CHANGELOG.md deleted file mode 100644 index 2a79f0167259..000000000000 --- a/packages/generator/generators/dependence-generator/CHANGELOG.md +++ /dev/null @@ -1,1096 +0,0 @@ -# @modern-js/dependence-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - -## 3.6.2 - -### Patch Changes - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] - - @modern-js/utils@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/utils@2.60.1 - -## 3.6.0 - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Patch Changes - -- @modern-js/utils@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/utils@2.58.3 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [a1a9373] - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 - -## 3.4.14 - -### Patch Changes - -- @modern-js/utils@2.58.0 - -## 3.4.13 - -### Patch Changes - -- @modern-js/utils@2.57.1 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - -## 3.4.11 - -### Patch Changes - -- @modern-js/utils@2.56.2 - -## 3.4.10 - -### Patch Changes - -- @modern-js/utils@2.56.1 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 - -## 3.4.8 - -### Patch Changes - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - -## 3.4.7 - -### Patch Changes - -- @modern-js/utils@2.54.6 - -## 3.4.6 - -### Patch Changes - -- @modern-js/utils@2.54.5 - -## 3.4.5 - -### Patch Changes - -- @modern-js/utils@2.54.4 - -## 3.4.4 - -### Patch Changes - -- @modern-js/utils@2.54.3 - -## 3.4.3 - -### Patch Changes - -- @modern-js/utils@2.54.2 - -## 3.4.2 - -### Patch Changes - -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - -## 3.4.0 - -### Patch Changes - -- @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/utils@2.52.0 - -## 3.3.24 - -### Patch Changes - -- @modern-js/utils@2.51.0 - -## 3.3.23 - -### Patch Changes - -- @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/utils@2.49.3 - -## 3.3.20 - -### Patch Changes - -- @modern-js/utils@2.49.2 - -## 3.3.19 - -### Patch Changes - -- @modern-js/utils@2.49.1 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - -## 3.3.17 - -### Patch Changes - -- @modern-js/utils@2.48.6 - -## 3.3.16 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - -## 3.3.14 - -### Patch Changes - -- @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/utils@2.48.2 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] - - @modern-js/utils@2.48.1 - -## 3.3.11 - -### Patch Changes - -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - -## 3.3.10 - -### Patch Changes - -- @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -## 3.1.39 - -## 3.1.38 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -### Patch Changes - -- 2edd844: feat: add named exports for solution new command - - feat: 为 solution new 命令添加 named 导出 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -### Patch Changes - -- 034f36b: feat: set the default language of CLI to English - - feat: 将命令行的默认语言设置为英文 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 - -## 3.0.9 - -## 3.0.8 - -## 3.0.7 - -### Patch Changes - -- 577084d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.0.6 - -### Patch Changes - -- 1023fbb: feat: new command tooitip support code highlight - - feat: new 命令提示支持代码高亮 - -## 3.0.5 - -## 3.0.4 - -## 3.0.3 - -## 3.0.2 - -## 3.0.1 - -## 3.0.0 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.6 - -### Major Changes - -- dda38c9c3e: chore: v2 - -## 3.0.0-beta.5 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.4 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.3 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.2 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.1 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.0 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180: fix: generator bundle - - fix: 生成器打包 - -## 2.4.7 - -## 2.4.6 - -## 2.4.5 - -### Patch Changes - -- cfd8557: feat: new command install not run prepare scripts - - feat: new 命令安装依赖时不执行 prepare 脚本 - -## 2.4.4 - -## 2.4.3 - -## 2.4.0 - -## 2.3.4 - -## 2.3.3 - -## 2.3.1 - -## 2.3.0 - -### Patch Changes - -- 9d9bbfd05: feat: update codesmith package - - feat: 升级 codesmith 包版本 - -## 2.2.1 - -## 1.4.0 - -### Minor Changes - -- 52374e3: chore(generator): use module-tools bundle function to bundle generator package - - chore(generator): 使用 module-tools 的 bundle 功能实现生成器打包 - -## 1.3.5 - -### Patch Changes - -- 74e74ee: feat: update codesmith json api version - - feat: 升级 `@modern-js/codesmith-api-json` 版本 - -## 1.3.4 - -### Patch Changes - -- 341bb42: feat: bump codesmith package version - -## 1.3.3 - -### Patch Changes - -- a1198d509: feat: bump babel 7.18.0 -- c7e38b4e6: feat: upgrade codesmith pkg version - -## 1.3.2 - -### Patch Changes - -- 6b0bb5e3b: feat: bump codesmith version - -## 1.3.1 - -### Patch Changes - -- 895fa0ff: chore: using "workspace:\*" in devDependencies - -## 1.3.0 - -### Minor Changes - -- 5f4eb1ec: fix: js generator problem -- 2b12032c: feat: upgrade csmith tools - -### Patch Changes - -- 6cffe99d: chore: - remove react eslint rules for `modern-js` rule set. - add .eslintrc for each package to speed up linting - -## 1.2.6 - -### Patch Changes - -- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash - -## 1.2.5 - -### Patch Changes - -- 8491b6dd: fix: optimise "types" exports from plugin - -## 1.2.4 - -### Patch Changes - -- c29451a5: fix: fix append type error when enable plugin - -## 1.2.3 - -### Patch Changes - -- 6668a1bf: feat: upgrade @modern-js/codesmith-api-app version - -## 1.2.2 - -### Patch Changes - -- 2ba581e4: fix: mwa and module sub project dependence error - -## 1.2.1 - -### Patch Changes - -- e06c7c25: change generator main path on development mode - -## 1.2.0 - -### Minor Changes - -- cfe11628: Make Modern.js self bootstraping - -### Patch Changes - -- 2c049918: feat: polyfill function support enable using new command - -## 1.1.6 - -### Patch Changes - -- ad107726: feat: new action support apppend type define -- f73fee4b: feat: upgrade codesmith version to add get npm package timeout's time - -## 1.1.5 - -### Patch Changes - -- 4819a3c7: feat: update generator version - -## 1.1.4 - -### Patch Changes - -- 4a5214db: fix: generator plugin error - -## 1.1.3 - -### Patch Changes - -- feat: bump csmith tools version - -## 1.1.2 - -### Patch Changes - -- e12b3d0b: feat: upgrade codesmith version - -## 1.1.1 - -### Patch Changes - -- 2c0750e1: fix generator export config - -## 1.1.0 - -### Minor Changes - -- 96119db2: Relese v1.1.0 - -## 1.0.3 - -### Patch Changes - -- feat: update generator template - -## 1.0.2 - -### Patch Changes - -- feat: update generator template - fix: fix monorepo-tools log info - -## 1.0.1 - -### Patch Changes - -- feat: update generator template version - -## 1.0.0 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.23 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.22 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.21 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.20 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.19 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.18 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.17 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- fix: #118 #104 - -## 1.0.0-rc.16 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.15 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.14 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.13 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.12 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.11 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.10 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.9 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.8 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.7 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.6 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.5 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.4 - -### Patch Changes - -- fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.3 - -### Patch Changes - -- feat: initial diff --git a/packages/generator/generators/dependence-generator/LICENSE b/packages/generator/generators/dependence-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/dependence-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/dependence-generator/README.md b/packages/generator/generators/dependence-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/dependence-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ - - -- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/dependence-generator/jest.config.js b/packages/generator/generators/dependence-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/dependence-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/dependence-generator/modern.config.js b/packages/generator/generators/dependence-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/dependence-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/dependence-generator/package.json b/packages/generator/generators/dependence-generator/package.json deleted file mode 100644 index b1f288369401..000000000000 --- a/packages/generator/generators/dependence-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/dependence-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/dependence-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-json": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/dependence-generator/src/index.ts b/packages/generator/generators/dependence-generator/src/index.ts deleted file mode 100644 index 713ad4721908..000000000000 --- a/packages/generator/generators/dependence-generator/src/index.ts +++ /dev/null @@ -1,140 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { JsonAPI } from '@modern-js/codesmith-api-json'; -import { i18n as commonI18n } from '@modern-js/generator-common'; -import { fs, chalk, getModernConfigFile } from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, -) => { - const jsonAPI = new JsonAPI(generator); - const { - devDependencies, - dependencies, - peerDependencies, - appendTypeContent, - sourceTypeFile, - projectPath, - } = context.config; - - const setJSON: Record- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/entry-generator/jest.config.js b/packages/generator/generators/entry-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/entry-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/entry-generator/modern.config.js b/packages/generator/generators/entry-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/entry-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/entry-generator/package.json b/packages/generator/generators/entry-generator/package.json deleted file mode 100644 index 360d734f3f1b..000000000000 --- a/packages/generator/generators/entry-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/entry-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/entry-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-handlebars": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/entry-generator/src/index.ts b/packages/generator/generators/entry-generator/src/index.ts deleted file mode 100644 index b56eded58e76..000000000000 --- a/packages/generator/generators/entry-generator/src/index.ts +++ /dev/null @@ -1,141 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { merge } from '@modern-js/codesmith-utils/lodash'; -import { - i18n as commonI18n, - getEntrySchema, -} from '@modern-js/generator-common'; -import { fs, getPackageObj, isTsProject } from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; -import { isEmptySource, isSingleEntry } from './utils'; - -const handleInput = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const appDir = context.materials.default.basePath; - - const { entriesDir } = context.config; - - await fs.ensureDir(path.join(appDir, entriesDir)); - - const analysisInfo = { - isEmptySrc: isEmptySource(appDir, entriesDir), - isSingleEntry: isSingleEntry(appDir, entriesDir), - isTsProject: isTsProject(appDir), - }; - - generator.logger.debug( - `💡 [Entry Analysis Info]: ${JSON.stringify(analysisInfo)}`, - ); - - const config = { ...context.config, ...analysisInfo }; - const ans = await appApi.getInputBySchemaFunc(getEntrySchema, config); - - return ans; -}; - -const refactorSingleEntry = async ( - context: GeneratorContext, - generator: GeneratorCore, -) => { - const pkgObj = await getPackageObj(context); - const pkgName = pkgObj.name; - - const { entriesDir } = context.config; - - const oldFilePath = path.join(context.materials.default.basePath, entriesDir); - const oldFiles = fs - .readdirSync(oldFilePath) - .filter(filePath => { - if (fs.statSync(path.join(oldFilePath, filePath)).isDirectory()) { - const files = fs.readdirSync(path.join(oldFilePath, filePath)); - return files.length; - } - return ( - filePath !== '.eslintrc.json' && - filePath !== '.eslintrc.js' && - filePath !== 'modern-app-env.d.ts' && - filePath !== 'modern.runtime.ts' && - filePath !== 'modern.runtime.js' - ); - }) - .map(file => - path.join(context.materials.default.basePath, entriesDir, file), - ); - - // create new dir in entriesDir and move code to that dir - fs.mkdirpSync( - path.join(context.materials.default.basePath, entriesDir, pkgName), - ); - oldFiles.forEach(file => { - generator.logger.debug( - `💡 [Rename Entry Info]: from ${file} to ${file.replace( - entriesDir, - path.join(entriesDir, pkgName), - )}`, - ); - fs.renameSync( - file, - file.replace(entriesDir, path.join(entriesDir, pkgName)), - ); - }); -}; - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const ans = await handleInput(context, generator, appApi); - - if (ans.isSingleEntry) { - generator.logger.debug( - `💡 [Current Entry Info]: Current Entry is Single Entry`, - ); - await refactorSingleEntry(context, generator); - } - - const entryName = (ans.name as string) || ''; - const fileExtra = ans.isTsProject ? 'tsx' : 'jsx'; - const targetPath = path.join(context.config.entriesDir, entryName); - - await appApi.forgeTemplate(`templates/**/*`, undefined, resourceKey => - resourceKey - .replace('templates', targetPath) - .replace('.handlebars', `.${fileExtra}`), - ); -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - - const { locale } = context.config; - commonI18n.changeLanguage({ locale }); - appApi.i18n.changeLanguage({ locale }); - i18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run Entry Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - merge(context.config, { entriesDir: context.config.entriesDir || 'src' }); - - await handleTemplateFile(context, generator, appApi); - - if (!context.config.isEmptySrc) { - appApi.showSuccessInfo( - i18n.t(localeKeys.success, { name: context.config.name }), - ); - } - - generator.logger.debug(`🌟 [End Run Entry Generator]`); -}; diff --git a/packages/generator/generators/entry-generator/src/locale/en.ts b/packages/generator/generators/entry-generator/src/locale/en.ts deleted file mode 100644 index 96a142562672..000000000000 --- a/packages/generator/generators/entry-generator/src/locale/en.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const EN_LOCALE = { - package_not_exist: 'project not exist "package.json"', - success: 'create entry success!', -}; diff --git a/packages/generator/generators/entry-generator/src/locale/index.ts b/packages/generator/generators/entry-generator/src/locale/index.ts deleted file mode 100644 index c2369bb377be..000000000000 --- a/packages/generator/generators/entry-generator/src/locale/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { I18n } from '@modern-js/i18n-utils'; -import { EN_LOCALE } from './en'; -import { ZH_LOCALE } from './zh'; - -const i18n = new I18n(); - -const localeKeys = i18n.init('en', { zh: ZH_LOCALE, en: EN_LOCALE }); - -export { i18n, localeKeys }; diff --git a/packages/generator/generators/entry-generator/src/locale/zh.ts b/packages/generator/generators/entry-generator/src/locale/zh.ts deleted file mode 100644 index a66f6b868cfa..000000000000 --- a/packages/generator/generators/entry-generator/src/locale/zh.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const ZH_LOCALE = { - package_not_exist: '当前项目不存在 "package.json"', - success: '创建入口成功!', -}; diff --git a/packages/generator/generators/entry-generator/src/utils/index.ts b/packages/generator/generators/entry-generator/src/utils/index.ts deleted file mode 100644 index af47f602c75b..000000000000 --- a/packages/generator/generators/entry-generator/src/utils/index.ts +++ /dev/null @@ -1,50 +0,0 @@ -import path from 'path'; -import { fs } from '@modern-js/generator-utils'; - -export function isEmptySource(appDir: string, entriesDir: string) { - let files; - try { - files = fs.readdirSync(path.join(appDir, entriesDir)); - } catch (error) { - // read error, meaning that file may not exist. - return true; - } - - const existValidFile = files - .filter( - file => - !/^\.[\w]+/.test(file) && - !/\.[\w]+(\.js|\.jsx|\.ts|\.tsx|\.json|\.d.ts)$/.test(file), - ) - .some(file => { - const stat = fs.statSync(path.join(appDir, entriesDir, file)); - if (stat.isDirectory()) { - return true; - } - if (/(\.js|\.jsx|\.ts|\.tsx)$/.test(file)) { - return true; - } - return false; - }); - return !existValidFile; -} - -export function isSingleEntry(appDir: string, entriesDir: string) { - const hasMainEntryFile = [ - 'index.jsx', - 'index.tsx', - 'App.jsx', - 'App.tsx', - ].some(f => fs.existsSync(path.join(appDir, entriesDir, f))); - if (!hasMainEntryFile) { - const dirs = fs.readdirSync(path.join(appDir, entriesDir)); - if (dirs.includes('pages')) { - return true; - } - if (dirs.includes('routes')) { - return true; - } - return false; - } - return hasMainEntryFile; -} diff --git a/packages/generator/generators/entry-generator/tsconfig.json b/packages/generator/generators/entry-generator/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/generators/entry-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/generator/generators/mwa-generator/.npmignore b/packages/generator/generators/mwa-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/mwa-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.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 - diff --git a/packages/generator/generators/mwa-generator/CHANGELOG.md b/packages/generator/generators/mwa-generator/CHANGELOG.md deleted file mode 100644 index d50e67e8c576..000000000000 --- a/packages/generator/generators/mwa-generator/CHANGELOG.md +++ /dev/null @@ -1,1332 +0,0 @@ -# @modern-js/mwa-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -### Patch Changes - -- f315896: feat: upgarde the basic dependency version in the template - - feat: 升级模板中基础依赖版本 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -### Patch Changes - -- 6203806: fix: new and upgrade command run error - - fix: 修复 new 命令和 upgrade 命令执行报错 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -### Patch Changes - -- c686e60: feat: update @types/node version for template - - feat: 更新生成器模板 @types/node 版本 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - -## 3.6.2 - -### Patch Changes - -- 85b4535: feat: add timing log for mwa and module generator to get solution version - - feat: 增加 mwa 和 module 生成器获取工程方案版本的耗时日志 - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] - - @modern-js/utils@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/utils@2.60.1 - -## 3.6.0 - -### Minor Changes - -- 91ce673: feat: generator template use biome for code lint - - feat: 生成器模板使用 biome 进行代码 lint - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - -- 28f0101: feat: generator replace husky to simple git hook - - feat: 生成器模板替换 husky 为 simple-git-hook - - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Minor Changes - -- 2f6d4e9: feat: enable Rspack by default in new project - -### Patch Changes - -- @modern-js/utils@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/utils@2.58.3 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [a1a9373] - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 - -## 3.4.14 - -### Patch Changes - -- @modern-js/utils@2.58.0 - -## 3.4.13 - -### Patch Changes - -- @modern-js/utils@2.57.1 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - -## 3.4.11 - -### Patch Changes - -- @modern-js/utils@2.56.2 - -## 3.4.10 - -### Patch Changes - -- @modern-js/utils@2.56.1 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 - -## 3.4.8 - -### Patch Changes - -- a38bb04: feat: generator support runtime config file - - feat: 生成器支持 modern.runtime 配置文件 - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - -## 3.4.7 - -### Patch Changes - -- @modern-js/utils@2.54.6 - -## 3.4.6 - -### Patch Changes - -- @modern-js/utils@2.54.5 - -## 3.4.5 - -### Patch Changes - -- @modern-js/utils@2.54.4 - -## 3.4.4 - -### Patch Changes - -- @modern-js/utils@2.54.3 - -## 3.4.3 - -### Patch Changes - -- @modern-js/utils@2.54.2 - -## 3.4.2 - -### Patch Changes - -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - -## 3.4.0 - -### Patch Changes - -- @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/utils@2.52.0 - -## 3.3.24 - -### Patch Changes - -- @modern-js/utils@2.51.0 - -## 3.3.23 - -### Patch Changes - -- @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/utils@2.49.3 - -## 3.3.20 - -### Patch Changes - -- @modern-js/utils@2.49.2 - -## 3.3.19 - -### Patch Changes - -- @modern-js/utils@2.49.1 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - -## 3.3.17 - -### Patch Changes - -- @modern-js/utils@2.48.6 - -## 3.3.16 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - -## 3.3.14 - -### Patch Changes - -- @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/utils@2.48.2 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] - - @modern-js/utils@2.48.1 - -## 3.3.11 - -### Patch Changes - -- c246812: chore(generator): extract getGeneratorPath function to generator-utils - fechoreat(generator): 提取 getGeneratorPath 方法到 generator-utils 公共包 -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - -## 3.3.10 - -### Patch Changes - -- @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- 987d33e: feat(generator): remove rspack generator, you can enable it by one line configration - feat(generator): 移除 rspack 生成器, 现在只需要一行配置即可开启 -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- 9161795: fix: generator `package.json` template - - fix: 修复生成器 `package.json` 模板 - - - @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -### Minor Changes - -- f0c6df5: feat: adjust ts template, handle dependencies through handlebars - - feat: 调整生成器 ts 模板,使用 handlebars 处理依赖 - -### Patch Changes - -- acb82ef: chore(generator): simplify the default lint-staged config - - chore(generator): 简化默认的 lint-staged 配置 - -## 3.1.39 - -## 3.1.38 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -### Patch Changes - -- c9a6cce: feat(generator): exclude node_modules by default in tsconfig.json - - feat(generator): 默认在 tsconfig.json 中排除 node_modules - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -### Patch Changes - -- 9aa2c25: feat: add named exports for all solutions - - feat: 为各个 solutions 添加 named 导出 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- c2f9ac1: feat(generator): using typescript v5 for new projects - - feat(generator): 新项目默认使用 typescript v5 - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 -- 906bd94: feat(mwa-generator): add a default browserslist config for new projects - - feat(mwa-generator): 为新项目增加默认的 browserslist 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -### Patch Changes - -- afea00f: fix(generator): README should be written in English - - fix(generator): README 应该使用英文编写 - -- 432ac8b: chore(cli): improve commands descriptions - - chore(cli): 优化命令的描述文案 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -### Patch Changes - -- 3f4e0bb: fix: generator plugin default config not work - - fix: 修复生成器插件默认配置未生效问题 - -- 034f36b: feat: set the default language of CLI to English - - feat: 将命令行的默认语言设置为英文 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 - -### Patch Changes - -- 6d3144b95f: fix: fix web app template - - fix: 修复 web app 模板 - -- cde9e8df93: fix(generators): update api document link - - fix(generators): 更新 api 文档链接 - -## 3.0.9 - -## 3.0.8 - -### Patch Changes - -- b2ea17b: feat: create web app support select build tools (webpack or rspack) - - feat: 创建 Web App 支持选择构建工具 (webpack 或 rspack) - -## 3.0.7 - -### Patch Changes - -- 577084d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.0.6 - -## 3.0.5 - -## 3.0.4 - -### Patch Changes - -- e2f102f: feat: generator template upgrade node version to 16 - - feat: 生成器模板升级 node 版本到 16 - -## 3.0.3 - -### Patch Changes - -- 6562578: chore: optimize the capitalization of plugin names - - chore: 规范引用插件时的命名格式,统一使用 camelCase 代替 PascalCase - -## 3.0.2 - -## 3.0.1 - -## 3.0.0 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a456659b: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 56ef2dc: feat: mwa generator template remove runtime.state config - - feat: mwa 生成器模板默认关闭 runtime.state 配置 - -## 3.0.0-beta.6 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a456659b: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -## 3.0.0-beta.5 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a456659b: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.4 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a456659b: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.3 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a456659b: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.2 - -### Major Changes - -- dda38c9c3e: chore: v2 - -### Patch Changes - -- d4a4566: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.1 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- d4a4566: chore: rename plugin-jarvis to plugin-lint - - chore: 重命名 plugin-jarvis 为 plugin-lint - -- 6b6f180279: fix: generator bundle - - fix: 生成器打包 - -## 3.0.0-beta.0 - -### Major Changes - -- dda38c9: chore: v2 - -### Patch Changes - -- 6b6f180: fix: generator bundle - - fix: 生成器打包 - -## 2.4.7 - -### Patch Changes - -- 7c89bd6: feat: @modern-js/create support --packages params to set special packages version - - feat: @modern-js/create 支持 --packages 参数用于指定特殊的包版本 - -## 2.4.6 - -## 2.4.5 - -### Patch Changes - -- cfd8557: feat: new command install not run prepare scripts - - feat: new 命令安装依赖时不执行 prepare 脚本 - -## 2.4.4 - -## 2.4.3 - -## 2.4.0 - -### Minor Changes - -- d2fbefc: feat: upgrade husky version - - feat: 升级生成器模板 husky 版本 - -## 2.3.4 - -## 2.3.3 - -### Patch Changes - -- 4f77eb4: feat: remove generator create project enable less and sass function - - feat: 移除生成器创建项目支持开启 Less 和 Sass 能力 - -## 2.3.1 - -### Patch Changes - -- f3fab28: feat: new command use solution version - - feat: new 命令使用当前工程方案对应版本的插件 - -## 2.3.0 - -### Minor Changes - -- beecff68d: feat: create new project use modern current latest version - - feat: @modern-js/create 创建项目使用 Modern.js 最新依赖版本 - -### Patch Changes - -- 9d9bbfd05: feat: update codesmith package - - feat: 升级 codesmith 包版本 - -## 2.2.1 - -### Patch Changes - -- f64f47a: fix doc path - -## 2.1.1 - -### Patch Changes - -- e0cd14a: feat: mwa template add runtime types - - feat: mwa 生成器模板增加导出 runtime 类型 - -## 2.1.0 - -### Minor Changes - -- 52374e3: chore(generator): use module-tools bundle function to bundle generator package - - chore(generator): 使用 module-tools 的 bundle 功能实现生成器打包 - -## 2.0.5 - -### Patch Changes - -- 74e74ee: feat: update codesmith json api version - - feat: 升级 `@modern-js/codesmith-api-json` 版本 - -## 2.0.4 - -### Patch Changes - -- eeedc80: feat: add plugin-jarvis to dependencies of solutions -- 341bb42: feat: bump codesmith package version - -## 2.0.3 - -### Patch Changes - -- bcd95a00b: feat: support custom solution generator success info - -## 2.0.2 - -### Patch Changes - -- a1198d509: feat: bump babel 7.18.0 -- c7e38b4e6: feat: upgrade codesmith pkg version - -## 2.0.1 - -### Patch Changes - -- 9ddd004b8: feat: generator template add husky package - -## 2.0.0 - -### Major Changes - -- 320067e9a: perf: replace del-cli with rimraf - -### Patch Changes - -- b38c6f267: fix: eslint template -- 6b0bb5e3b: feat: bump codesmith version - -## 1.4.1 - -### Patch Changes - -- 895fa0ff: chore: using "workspace:\*" in devDependencies - -## 1.4.0 - -### Minor Changes - -- d1480a35: feat: remove generator's .npmrc file -- 2b12032c: feat: upgrade csmith tools -- a4330c73: feat: adjust generator eslint and tsconig file - -### Patch Changes - -- 6cffe99d: chore: - remove react eslint rules for `modern-js` rule set. - add .eslintrc for each package to speed up linting - -## 1.3.7 - -### Patch Changes - -- 6c651ee7: fix: lint-staged warning - -## 1.3.6 - -### Patch Changes - -- edc3bd3d: fix: @modern-js/core package not found - -## 1.3.5 - -### Patch Changes - -- 6668a1bf: feat: upgrade @modern-js/codesmith-api-app version -- 9e0aed14: feat: add modern config file when create project -- fab92861: fix: @modern-js/core phantom dep - -## 1.3.4 - -### Patch Changes - -- 389e8bca: fix: fix eslint error with "modern.config.ts" - -## 1.3.3 - -### Patch Changes - -- 2ba581e4: fix: mwa and module sub project dependence error - -## 1.3.2 - -### Patch Changes - -- e06c7c25: change generator main path on development mode - -## 1.3.1 - -### Patch Changes - -- 3c5621f0: fix tsconfig template - -## 1.3.0 - -### Minor Changes - -- cfe11628: Make Modern.js self bootstraping - -### Patch Changes - -- 2c049918: feat: polyfill function support enable using new command - -## 1.2.4 - -### Patch Changes - -- ad107726: feat: new action support apppend type define -- f73fee4b: feat: upgrade codesmith version to add get npm package timeout's time - -## 1.2.3 - -### Patch Changes - -- 4819a3c7: feat: update generator version - -## 1.2.2 - -### Patch Changes - -- 4a5214db: fix: generator plugin error - -## 1.2.1 - -### Patch Changes - -- feat: bump csmith tools version - -## 1.2.0 - -### Minor Changes - -- e12b3d0b: feat: support generator plugin - -### Patch Changes - -- e12b3d0b: feat: upgrade codesmith version - -## 1.1.4 - -### Patch Changes - -- f6125701: fix: mwa sub-project in pnpm monorepo not exist tsconfig dependence - -## 1.1.3 - -### Patch Changes - -- d33c7b24: fix: electron generator - -## 1.1.2 - -### Patch Changes - -- 2c0750e1: fix generator export config - -## 1.1.1 - -### Patch Changes - -- 429aab90: feat: base generator support input - -## 1.1.0 - -### Minor Changes - -- 96119db2: Relese v1.1.0 - -## 1.0.3 - -### Patch Changes - -- feat: update generator template - -## 1.0.2 - -### Patch Changes - -- feat: update generator template - fix: fix monorepo-tools log info - -## 1.0.1 - -### Patch Changes - -- feat: update generator template version - -## 1.0.0 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.23 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.22 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.21 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 0fd196e: feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.20 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- feat: fix bugs -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.19 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.18 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- 63be0a5: fix: #118 #104 - -## 1.0.0-rc.17 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial -- fix: #118 #104 - -## 1.0.0-rc.16 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.15 - -### Patch Changes - -- 224f7fe: fix server route match -- 30ac27c: feat: add generator package description -- 204c626: feat: initial - -## 1.0.0-rc.14 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.13 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.12 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.11 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.10 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.9 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.8 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.7 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.6 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.5 - -### Patch Changes - -- 224f7fe: fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.4 - -### Patch Changes - -- fix server route match -- 204c626: feat: initial - -## 1.0.0-rc.3 - -### Patch Changes - -- feat: initial diff --git a/packages/generator/generators/mwa-generator/LICENSE b/packages/generator/generators/mwa-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/mwa-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/mwa-generator/README.md b/packages/generator/generators/mwa-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/mwa-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ - - -- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/mwa-generator/jest.config.js b/packages/generator/generators/mwa-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/mwa-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/mwa-generator/modern.config.js b/packages/generator/generators/mwa-generator/modern.config.js deleted file mode 100644 index 8efa2a15d0b2..000000000000 --- a/packages/generator/generators/mwa-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildUmdConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildUmdConfig, -}; diff --git a/packages/generator/generators/mwa-generator/package.json b/packages/generator/generators/mwa-generator/package.json deleted file mode 100644 index c232502ed712..000000000000 --- a/packages/generator/generators/mwa-generator/package.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "@modern-js/mwa-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/mwa-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/base-generator": "workspace:*", - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/dependence-generator": "workspace:*", - "@modern-js/entry-generator": "workspace:*", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/mwa-generator/src/index.ts b/packages/generator/generators/mwa-generator/src/index.ts deleted file mode 100644 index 39f2b0cd77f3..000000000000 --- a/packages/generator/generators/mwa-generator/src/index.ts +++ /dev/null @@ -1,194 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { merge } from '@modern-js/codesmith-utils/lodash'; -import { - BaseGenerator, - EntryGenerator, - MWADefaultConfig, - Solution, - i18n as commonI18n, - getMWASchema, -} from '@modern-js/generator-common'; -import { - getAllPackages, - getGeneratorPath, - getMWAProjectPath, - getModernVersion, - i18n as utilsI18n, - validatePackageName, - validatePackagePath, -} from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; - -const mergeDefaultConfig = (context: GeneratorContext) => { - const { defaultSolution } = context.config; - - if (defaultSolution) { - merge(context.config, MWADefaultConfig); - } -}; - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - generator.logger?.timing(`🕐 Get Modern.js app-tools version`); - const modernVersion = await getModernVersion( - Solution.MWA, - context.config.registry, - context.config.distTag, - ); - generator.logger?.timing(`🕐 Get Modern.js app-tools version`, true); - - const { isMonorepoSubProject, projectDir = '' } = context.config; - - const { outputPath } = generator; - - let packages: string[] = []; - - if (isMonorepoSubProject) { - try { - packages = getAllPackages(outputPath); - } catch (e) { - generator.logger.debug(`❗️ [Get All Packages Error]: ${e}`); - generator.logger.warn(`🟡 ${i18n.t(localeKeys.get_packages_error)}`); - } - } - - context.config = { - ...context.config, - isMwa: true, - isEmptySrc: true, - }; - - let ans: Record- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/server-generator/jest.config.js b/packages/generator/generators/server-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/server-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/server-generator/modern.config.js b/packages/generator/generators/server-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/server-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/server-generator/package.json b/packages/generator/generators/server-generator/package.json deleted file mode 100644 index f13cb6a16238..000000000000 --- a/packages/generator/generators/server-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/server-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/server-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-json": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/dependence-generator": "workspace:*", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - } -} diff --git a/packages/generator/generators/server-generator/src/index.ts b/packages/generator/generators/server-generator/src/index.ts deleted file mode 100644 index 1107ecbc120c..000000000000 --- a/packages/generator/generators/server-generator/src/index.ts +++ /dev/null @@ -1,142 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { JsonAPI } from '@modern-js/codesmith-api-json'; -import { - DependenceGenerator, - Solution, - i18n, -} from '@modern-js/generator-common'; -import { - fs, - getGeneratorPath, - getModernPluginVersion, - isTsProject, - readTsConfigByFile, - semver, -} from '@modern-js/generator-utils'; - -function isEmptyServerDir(serverDir: string) { - const files = fs.readdirSync(serverDir); - if (files.length === 0) { - return true; - } - return files.every(file => { - if (fs.statSync(path.join(serverDir, file)).isDirectory()) { - const childFiles = fs.readdirSync(path.join(serverDir, file)); - return childFiles.length === 0; - } - return false; - }); -} - -const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const jsonAPI = new JsonAPI(generator); - - const appDir = context.materials.default.basePath; - const serverDir = path.join(appDir, 'server'); - - if (fs.existsSync(serverDir) && !isEmptyServerDir(serverDir)) { - const files = fs.readdirSync('server'); - if (files.length > 0) { - generator.logger.warn(`🟡 The 'server' directory already exists.`); - throw Error("The 'server' directory is already exist"); - } - } - - const serverPlugin = '@modern-js/server-runtime'; - await appApi.runSubGenerator( - getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]), - undefined, - { - ...context.config, - devDependencies: { - ...(context.config.devDependencies || {}), - [serverPlugin]: await getModernPluginVersion( - Solution.MWA, - serverPlugin, - { - registry: context.config.registry, - distTag: context.config.distTag, - cwd: context.materials.default.basePath, - }, - ), - 'ts-node': '~10.8.1', - 'tsconfig-paths': '~3.14.1', - }, - }, - ); - - await appApi.forgeTemplate( - `templates/base-template/ts/**/*`, - undefined, - resourceKey => - resourceKey - .replace(`templates/base-template/ts/`, '') - .replace('.handlebars', ''), - ); - - const tsconfigJSON = readTsConfigByFile(path.join(appDir, 'tsconfig.json')); - - if (!(tsconfigJSON.include || []).includes('server')) { - await jsonAPI.update( - context.materials.default.get(path.join(appDir, 'tsconfig.json')), - { - query: {}, - update: { - $set: { - include: [...(tsconfigJSON.include || []), 'server'], - }, - }, - }, - true, - ); - } -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - - const { locale } = context.config; - i18n.changeLanguage({ locale }); - appApi.i18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - const modernVersion = await getModernPluginVersion( - Solution.MWA, - '@modern-js/app-tools', - { registry: context.config.registry, distTag: context.config.distTag }, - ); - - if ( - semver.valid(modernVersion) && - !semver.prerelease(modernVersion) && - semver.lt(modernVersion, '2.67.5') - ) { - generator.logger.warn( - `🟡 The current Modern.js version ${modernVersion} does not support Custom Web Server. Please upgrade to at least version 2.67.5.`, - ); - throw Error( - 'The current Modern.js version does not support Custom Web Server. Please upgrade to at least version 1.67.5', - ); - // eslint-disable-next-line no-process-exit - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run Server Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - await handleTemplateFile(context, generator, appApi); - - generator.logger.debug(`🌟 [End Run Server Generator]`); -}; diff --git a/packages/generator/generators/server-generator/templates/base-template/ts/server/modern.server.ts.handlebars b/packages/generator/generators/server-generator/templates/base-template/ts/server/modern.server.ts.handlebars deleted file mode 100644 index d016eb823f53..000000000000 --- a/packages/generator/generators/server-generator/templates/base-template/ts/server/modern.server.ts.handlebars +++ /dev/null @@ -1,36 +0,0 @@ -import { - type MiddlewareHandler, - defineServerConfig -} from '@modern-js/server-runtime'; - -const renderTiming: MiddlewareHandler = async (c, next) => { - const start = Date.now(); - - await next(); - - console.log('render-timing', Date.now() - start); -}; - -const requestTiming: MiddlewareHandler = async (c, next) => { - const start = Date.now(); - - await next(); - - console.log('request-timing', Date.now() - start); -}; - -export default defineServerConfig({ - middlewares: [ - { - name: 'request-timing', - handler: requestTiming, - }, - ], - renderMiddlewares: [ - { - name: 'render-timing', - handler: renderTiming, - }, - ], - plugins: [], -}); diff --git a/packages/generator/generators/server-generator/tsconfig.json b/packages/generator/generators/server-generator/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/generators/server-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/generator/generators/ssg-generator/.npmignore b/packages/generator/generators/ssg-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/ssg-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.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 - diff --git a/packages/generator/generators/ssg-generator/CHANGELOG.md b/packages/generator/generators/ssg-generator/CHANGELOG.md deleted file mode 100644 index 4e0c4a83a5c2..000000000000 --- a/packages/generator/generators/ssg-generator/CHANGELOG.md +++ /dev/null @@ -1,612 +0,0 @@ -# @modern-js/ssg-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - -## 3.6.2 - -### Patch Changes - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] - - @modern-js/utils@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/utils@2.60.1 - -## 3.6.0 - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Patch Changes - -- @modern-js/utils@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/utils@2.58.3 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [a1a9373] - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 - -## 3.4.14 - -### Patch Changes - -- @modern-js/utils@2.58.0 - -## 3.4.13 - -### Patch Changes - -- @modern-js/utils@2.57.1 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - -## 3.4.11 - -### Patch Changes - -- @modern-js/utils@2.56.2 - -## 3.4.10 - -### Patch Changes - -- @modern-js/utils@2.56.1 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 - -## 3.4.8 - -### Patch Changes - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - -## 3.4.7 - -### Patch Changes - -- @modern-js/utils@2.54.6 - -## 3.4.6 - -### Patch Changes - -- @modern-js/utils@2.54.5 - -## 3.4.5 - -### Patch Changes - -- @modern-js/utils@2.54.4 - -## 3.4.4 - -### Patch Changes - -- @modern-js/utils@2.54.3 - -## 3.4.3 - -### Patch Changes - -- @modern-js/utils@2.54.2 - -## 3.4.2 - -### Patch Changes - -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - -## 3.4.0 - -### Patch Changes - -- @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/utils@2.52.0 - -## 3.3.24 - -### Patch Changes - -- @modern-js/utils@2.51.0 - -## 3.3.23 - -### Patch Changes - -- @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/utils@2.49.3 - -## 3.3.20 - -### Patch Changes - -- @modern-js/utils@2.49.2 - -## 3.3.19 - -### Patch Changes - -- @modern-js/utils@2.49.1 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - -## 3.3.17 - -### Patch Changes - -- @modern-js/utils@2.48.6 - -## 3.3.16 - -### Patch Changes - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - -## 3.3.14 - -### Patch Changes - -- @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/utils@2.48.2 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] - - @modern-js/utils@2.48.1 - -## 3.3.11 - -### Patch Changes - -- c246812: chore(generator): extract getGeneratorPath function to generator-utils - fechoreat(generator): 提取 getGeneratorPath 方法到 generator-utils 公共包 -- Updated dependencies [c323a23] - - @modern-js/utils@2.48.0 - -## 3.3.10 - -### Patch Changes - -- @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -## 3.1.39 - -## 3.1.38 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -### Patch Changes - -- 2edd844: feat: add named exports for solution new command - - feat: 为 solution new 命令添加 named 导出 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -### Patch Changes - -- 034f36b: feat: set the default language of CLI to English - - feat: 将命令行的默认语言设置为英文 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 diff --git a/packages/generator/generators/ssg-generator/LICENSE b/packages/generator/generators/ssg-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/ssg-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/ssg-generator/README.md b/packages/generator/generators/ssg-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/ssg-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ - - -- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/ssg-generator/jest.config.js b/packages/generator/generators/ssg-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/ssg-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/ssg-generator/modern.config.js b/packages/generator/generators/ssg-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/ssg-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/ssg-generator/package.json b/packages/generator/generators/ssg-generator/package.json deleted file mode 100644 index d8008f5b4d35..000000000000 --- a/packages/generator/generators/ssg-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/ssg-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/ssg-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/dependence-generator": "workspace:*", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/ssg-generator/src/index.ts b/packages/generator/generators/ssg-generator/src/index.ts deleted file mode 100644 index 3ded1f8d7540..000000000000 --- a/packages/generator/generators/ssg-generator/src/index.ts +++ /dev/null @@ -1,102 +0,0 @@ -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { - DependenceGenerator, - i18n as commonI18n, -} from '@modern-js/generator-common'; -import { - chalk, - getGeneratorPath, - getModernConfigFile, -} from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; - -const handleTemplateFile = async ( - context: GeneratorContext, - _generator: GeneratorCore, - appApi: AppAPI, -) => { - await appApi.runSubGenerator( - getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]), - undefined, - { - ...context.config, - isSubGenerator: true, - }, - ); -}; - -export default async (context: GeneratorContext, generator: GeneratorCore) => { - const appApi = new AppAPI(context, generator); - - const { locale } = context.config; - commonI18n.changeLanguage({ locale }); - appApi.i18n.changeLanguage({ locale }); - - if (!(await appApi.checkEnvironment())) { - process.exit(1); - } - - generator.logger.debug(`🚀 [Start Run SSG Generator]`); - generator.logger.debug( - '💡 [Current Config]:', - JSON.stringify(context.config), - ); - - await handleTemplateFile(context, generator, appApi); - - if (!context.config.isSubGenerator) { - await appApi.runInstall(undefined, { ignoreScripts: true }); - if (!context.config.pluginName) { - appApi.showSuccessInfo(); - } else { - const appDir = context.materials.default.basePath; - const configFile = await getModernConfigFile(appDir); - const isTS = configFile.endsWith('ts'); - const { pluginName, pluginDependence, shouldUsePluginNameExport } = - context.config; - console.info( - chalk.green(`\n[INFO]`), - `${i18n.t(localeKeys.success)}`, - chalk.yellow.bold(`${configFile}`), - ':', - '\n', - ); - if (shouldUsePluginNameExport) { - console.info( - chalk.yellow.bold( - `import { ${pluginName} } from '${pluginDependence}';`, - ), - ); - } else { - console.info( - chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`), - ); - } - if (isTS) { - console.info(` -export default defineConfig({ - ..., - output: { - ..., - ${chalk.yellow.bold(`ssg: true`)}, - }, - plugins: [..., ${chalk.yellow.bold(`${pluginName}()`)}], -}); -`); - } else { - console.info(` -module.exports = { - ..., - output: { - ..., - ${chalk.yellow.bold(`ssg: true`)}, - }, - plugins: [..., ${chalk.yellow.bold(`${pluginName}()`)}], -}; -`); - } - } - } - generator.logger.debug(`🌟 [End Run SSG Generator]`); -}; diff --git a/packages/generator/generators/ssg-generator/src/locale/en.ts b/packages/generator/generators/ssg-generator/src/locale/en.ts deleted file mode 100644 index e48ded5d925a..000000000000 --- a/packages/generator/generators/ssg-generator/src/locale/en.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const EN_LOCALE = { - success: `Plugin dependency installed successfully! Please add the following code to`, -}; diff --git a/packages/generator/generators/ssg-generator/src/locale/index.ts b/packages/generator/generators/ssg-generator/src/locale/index.ts deleted file mode 100644 index c2369bb377be..000000000000 --- a/packages/generator/generators/ssg-generator/src/locale/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { I18n } from '@modern-js/i18n-utils'; -import { EN_LOCALE } from './en'; -import { ZH_LOCALE } from './zh'; - -const i18n = new I18n(); - -const localeKeys = i18n.init('en', { zh: ZH_LOCALE, en: EN_LOCALE }); - -export { i18n, localeKeys }; diff --git a/packages/generator/generators/ssg-generator/src/locale/zh.ts b/packages/generator/generators/ssg-generator/src/locale/zh.ts deleted file mode 100644 index 7a25355c8545..000000000000 --- a/packages/generator/generators/ssg-generator/src/locale/zh.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const ZH_LOCALE = { - success: `安装插件依赖成功!请添加如下代码至`, -}; diff --git a/packages/generator/generators/ssg-generator/tsconfig.json b/packages/generator/generators/ssg-generator/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/generators/ssg-generator/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/generator/generators/upgrade-generator/.npmignore b/packages/generator/generators/upgrade-generator/.npmignore deleted file mode 100644 index 353fddf17262..000000000000 --- a/packages/generator/generators/upgrade-generator/.npmignore +++ /dev/null @@ -1,31 +0,0 @@ -.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 - diff --git a/packages/generator/generators/upgrade-generator/CHANGELOG.md b/packages/generator/generators/upgrade-generator/CHANGELOG.md deleted file mode 100644 index 7957a8fab001..000000000000 --- a/packages/generator/generators/upgrade-generator/CHANGELOG.md +++ /dev/null @@ -1,768 +0,0 @@ -# @modern-js/upgrade-generator - -## 3.7.38 - -## 3.7.37 - -## 3.7.36 - -## 3.7.35 - -## 3.7.34 - -## 3.7.33 - -## 3.7.32 - -## 3.7.31 - -## 3.7.30 - -## 3.7.29 - -## 3.7.28 - -## 3.7.27 - -## 3.7.26 - -## 3.7.25 - -## 3.7.24 - -## 3.7.23 - -## 3.7.22 - -## 3.7.21 - -## 3.7.20 - -## 3.7.19 - -## 3.7.18 - -## 3.7.17 - -## 3.7.16 - -## 3.7.15 - -## 3.7.14 - -## 3.7.13 - -## 3.7.12 - -## 3.7.11 - -## 3.7.10 - -## 3.7.9 - -## 3.7.8 - -## 3.7.7 - -## 3.7.6 - -## 3.7.5 - -### Patch Changes - -- 6203806: fix: new and upgrade command run error - - fix: 修复 new 命令和 upgrade 命令执行报错 - -## 3.7.4 - -## 3.7.3 - -## 3.7.2 - -## 3.7.1 - -### Patch Changes - -- ded1185: fix: upgrade command get modern version error - - fix: 修复 upgrade 命令获取 modern 版本失败的问题 - -## 3.7.0 - -### Minor Changes - -- d6986c5: feat: optimize generator download - - feat: 优化生成器下载 - -## 3.6.3 - -### Patch Changes - -- Updated dependencies [303331c] - - @modern-js/utils@2.60.3 - - @modern-js/plugin-i18n@2.60.3 - - @modern-js/generator-common@3.6.3 - - @modern-js/generator-utils@3.6.3 - -## 3.6.2 - -### Patch Changes - -- 0b6d335: feat: Optimize generator log information - - feat: 优化生成器日志信息 - -- Updated dependencies [8a709bc] -- Updated dependencies [0b6d335] - - @modern-js/utils@2.60.2 - - @modern-js/generator-common@3.6.2 - - @modern-js/generator-utils@3.6.2 - - @modern-js/plugin-i18n@2.60.2 - -## 3.6.1 - -### Patch Changes - -- @modern-js/plugin-i18n@2.60.1 -- @modern-js/utils@2.60.1 -- @modern-js/generator-common@3.6.1 -- @modern-js/generator-utils@3.6.1 - -## 3.6.0 - -### Patch Changes - -- 65b2922: feat: generator update json add endWithNewLine params - - feat: 生成器更新 json 文件增加 endWithNewLine 参数 - -- d5345b0: feat: remove eslint config package - - feat: 移除 eslint 配置包 - -- 28f0101: feat: generator replace husky to simple git hook - - feat: 生成器模板替换 husky 为 simple-git-hook - -- Updated dependencies [65b2922] -- Updated dependencies [d5345b0] - - @modern-js/generator-common@3.6.0 - - @modern-js/generator-utils@3.6.0 - - @modern-js/plugin-i18n@2.60.0 - - @modern-js/utils@2.60.0 - -## 3.5.0 - -### Patch Changes - -- Updated dependencies [2f6d4e9] - - @modern-js/generator-common@3.5.0 - - @modern-js/utils@2.59.0 - - @modern-js/generator-utils@3.5.0 - - @modern-js/plugin-i18n@2.59.0 - -## 3.4.17 - -### Patch Changes - -- @modern-js/plugin-i18n@2.58.3 -- @modern-js/utils@2.58.3 -- @modern-js/generator-common@3.4.17 -- @modern-js/generator-utils@3.4.17 - -## 3.4.16 - -### Patch Changes - -- 7715b6d: feat: update codesmith version - - feat: 更新 codesmith 版本 - -- Updated dependencies [7715b6d] -- Updated dependencies [44c1bc4] -- Updated dependencies [a1a9373] - - @modern-js/generator-common@3.4.16 - - @modern-js/generator-utils@3.4.16 - - @modern-js/plugin-i18n@2.58.2 - - @modern-js/utils@2.58.2 - -## 3.4.15 - -### Patch Changes - -- @modern-js/utils@2.58.1 -- @modern-js/plugin-i18n@2.58.1 -- @modern-js/generator-common@3.4.15 -- @modern-js/generator-utils@3.4.15 - -## 3.4.14 - -### Patch Changes - -- @modern-js/plugin-i18n@2.58.0 -- @modern-js/utils@2.58.0 -- @modern-js/generator-common@3.4.14 -- @modern-js/generator-utils@3.4.14 - -## 3.4.13 - -### Patch Changes - -- @modern-js/plugin-i18n@2.57.1 -- @modern-js/utils@2.57.1 -- @modern-js/generator-common@3.4.13 -- @modern-js/generator-utils@3.4.13 - -## 3.4.12 - -### Patch Changes - -- Updated dependencies [2515b00] - - @modern-js/utils@2.57.0 - - @modern-js/plugin-i18n@2.57.0 - - @modern-js/generator-common@3.4.12 - - @modern-js/generator-utils@3.4.12 - -## 3.4.11 - -### Patch Changes - -- @modern-js/plugin-i18n@2.56.2 -- @modern-js/utils@2.56.2 -- @modern-js/generator-common@3.4.11 -- @modern-js/generator-utils@3.4.11 - -## 3.4.10 - -### Patch Changes - -- @modern-js/plugin-i18n@2.56.1 -- @modern-js/utils@2.56.1 -- @modern-js/generator-common@3.4.10 -- @modern-js/generator-utils@3.4.10 - -## 3.4.9 - -### Patch Changes - -- @modern-js/utils@2.56.0 -- @modern-js/plugin-i18n@2.56.0 -- @modern-js/generator-common@3.4.9 -- @modern-js/generator-utils@3.4.9 - -## 3.4.8 - -### Patch Changes - -- Updated dependencies [bbcf55a] - - @modern-js/utils@2.55.0 - - @modern-js/plugin-i18n@2.55.0 - - @modern-js/generator-common@3.4.8 - - @modern-js/generator-utils@3.4.8 - -## 3.4.7 - -### Patch Changes - -- @modern-js/plugin-i18n@2.54.6 -- @modern-js/utils@2.54.6 -- @modern-js/generator-common@3.4.7 -- @modern-js/generator-utils@3.4.7 - -## 3.4.6 - -### Patch Changes - -- @modern-js/plugin-i18n@2.54.5 -- @modern-js/utils@2.54.5 -- @modern-js/generator-common@3.4.6 -- @modern-js/generator-utils@3.4.6 - -## 3.4.5 - -### Patch Changes - -- @modern-js/plugin-i18n@2.54.4 -- @modern-js/utils@2.54.4 -- @modern-js/generator-common@3.4.5 -- @modern-js/generator-utils@3.4.5 - -## 3.4.4 - -### Patch Changes - -- @modern-js/plugin-i18n@2.54.3 -- @modern-js/utils@2.54.3 -- @modern-js/generator-common@3.4.4 -- @modern-js/generator-utils@3.4.4 - -## 3.4.3 - -### Patch Changes - -- @modern-js/plugin-i18n@2.54.2 -- @modern-js/utils@2.54.2 -- @modern-js/generator-common@3.4.3 -- @modern-js/generator-utils@3.4.3 - -## 3.4.2 - -### Patch Changes - -- @modern-js/generator-common@3.4.2 -- @modern-js/generator-utils@3.4.2 -- @modern-js/plugin-i18n@2.54.1 -- @modern-js/utils@2.54.1 - -## 3.4.1 - -### Patch Changes - -- Updated dependencies [15a090c] -- Updated dependencies [a8d8f0c] -- Updated dependencies [09798ac] - - @modern-js/utils@2.54.0 - - @modern-js/plugin-i18n@2.54.0 - - @modern-js/generator-common@3.4.1 - - @modern-js/generator-utils@3.4.1 - -## 3.4.0 - -### Minor Changes - -- f0aa3d3: feat: @modern-js/create not support create Monorepo Project - - feat: @modern-js/create 移除创建 Monorepo 项目 - -### Patch Changes - -- Updated dependencies [f0aa3d3] -- Updated dependencies [5e442c1] -- Updated dependencies [f0aa3d3] - - @modern-js/generator-common@3.4.0 - - @modern-js/generator-utils@3.4.0 - - @modern-js/plugin-i18n@2.53.0 - - @modern-js/utils@2.53.0 - -## 3.3.25 - -### Patch Changes - -- @modern-js/plugin-i18n@2.52.0 -- @modern-js/utils@2.52.0 -- @modern-js/generator-common@3.3.25 -- @modern-js/generator-utils@3.3.25 - -## 3.3.24 - -### Patch Changes - -- @modern-js/plugin-i18n@2.51.0 -- @modern-js/utils@2.51.0 -- @modern-js/generator-common@3.3.24 -- @modern-js/generator-utils@3.3.24 - -## 3.3.23 - -### Patch Changes - -- Updated dependencies [e759876] - - @modern-js/generator-common@3.3.23 - - @modern-js/generator-utils@3.3.23 - - @modern-js/plugin-i18n@2.50.0 - - @modern-js/utils@2.50.0 - -## 3.3.22 - -### Patch Changes - -- @modern-js/generator-common@3.3.22 -- @modern-js/generator-utils@3.3.22 -- @modern-js/plugin-i18n@2.49.4 -- @modern-js/utils@2.49.4 - -## 3.3.21 - -### Patch Changes - -- @modern-js/plugin-i18n@2.49.3 -- @modern-js/utils@2.49.3 -- @modern-js/generator-common@3.3.21 -- @modern-js/generator-utils@3.3.21 - -## 3.3.20 - -### Patch Changes - -- @modern-js/plugin-i18n@2.49.2 -- @modern-js/utils@2.49.2 -- @modern-js/generator-common@3.3.20 -- @modern-js/generator-utils@3.3.20 - -## 3.3.19 - -### Patch Changes - -- @modern-js/plugin-i18n@2.49.1 -- @modern-js/utils@2.49.1 -- @modern-js/generator-common@3.3.19 -- @modern-js/generator-utils@3.3.19 - -## 3.3.18 - -### Patch Changes - -- Updated dependencies [e8c8c5d] - - @modern-js/utils@2.49.0 - - @modern-js/plugin-i18n@2.49.0 - - @modern-js/generator-common@3.3.18 - - @modern-js/generator-utils@3.3.18 - -## 3.3.17 - -### Patch Changes - -- @modern-js/plugin-i18n@2.48.6 -- @modern-js/utils@2.48.6 -- @modern-js/generator-common@3.3.17 -- @modern-js/generator-utils@3.3.17 - -## 3.3.16 - -### Patch Changes - -- 8465a9e: chore(deps): should not bump builder deps when use upgrade command - - chore(deps): 使用 upgrade 命令时不升级 builder 依赖并添加 builder 插件废弃提示 - -- Updated dependencies [4ca9f4c] - - @modern-js/utils@2.48.5 - - @modern-js/plugin-i18n@2.48.5 - - @modern-js/generator-common@3.3.16 - - @modern-js/generator-utils@3.3.16 - -## 3.3.15 - -### Patch Changes - -- Updated dependencies [7d2d433] - - @modern-js/utils@2.48.4 - - @modern-js/plugin-i18n@2.48.4 - - @modern-js/generator-common@3.3.15 - - @modern-js/generator-utils@3.3.15 - -## 3.3.14 - -### Patch Changes - -- @modern-js/generator-common@3.3.14 -- @modern-js/generator-utils@3.3.14 -- @modern-js/plugin-i18n@2.48.3 -- @modern-js/utils@2.48.3 - -## 3.3.13 - -### Patch Changes - -- @modern-js/plugin-i18n@2.48.2 -- @modern-js/utils@2.48.2 -- @modern-js/generator-common@3.3.13 -- @modern-js/generator-utils@3.3.13 - -## 3.3.12 - -### Patch Changes - -- Updated dependencies [8942b90] -- Updated dependencies [ce426f7] -- Updated dependencies [a873989] - - @modern-js/utils@2.48.1 - - @modern-js/generator-common@3.3.12 - - @modern-js/plugin-i18n@2.48.1 - - @modern-js/generator-utils@3.3.12 - -## 3.3.11 - -### Patch Changes - -- c323a23: feat: separate new & upgrade action from solutions - feat: 从工程方案中分离 new & upgrade 命令 -- Updated dependencies [c246812] -- Updated dependencies [c323a23] - - @modern-js/generator-utils@3.3.11 - - @modern-js/utils@2.48.0 - - @modern-js/plugin-i18n@2.48.0 - - @modern-js/generator-common@3.3.11 - -## 3.3.10 - -### Patch Changes - -- e4d9cac: fix(@modern-js/upgrade-generator): ignore @modern-js/builder-rspack-provider version change - fix(@modern-js/upgrade-generator): 忽略 @modern-js/builder-rspack-provider 版本升级 - - @modern-js/utils@2.47.1 - -## 3.3.9 - -### Patch Changes - -- Updated dependencies [a5386ab] - - @modern-js/utils@2.47.0 - -## 3.3.8 - -### Patch Changes - -- @modern-js/utils@2.46.1 - -## 3.3.7 - -### Patch Changes - -- @modern-js/utils@2.46.0 - -## 3.3.6 - -### Patch Changes - -- @modern-js/utils@2.45.0 - -## 3.3.5 - -### Patch Changes - -- @modern-js/utils@2.44.0 - -## 3.3.4 - -### Patch Changes - -- @modern-js/utils@2.43.0 - -## 3.3.3 - -### Patch Changes - -- fa731a7: chore: bump codesmith to 2.3.2 - chore: 升级 codesmith 版本到 2.3.2 - - @modern-js/utils@2.42.2 - -## 3.3.2 - -### Patch Changes - -- @modern-js/utils@2.42.1 - -## 3.3.1 - -### Patch Changes - -- b182eb2: chore: bump codesmith v2.3.1 to show timing - chore: 升级 codesmith 到 v2.3.1, 用于展示执行时间 - - @modern-js/utils@2.42.0 - -## 3.3.0 - -### Patch Changes - -- Updated dependencies [c4d396a] - - @modern-js/utils@2.41.0 - -## 3.2.11 - -### Patch Changes - -- Updated dependencies [95f15d2] - - @modern-js/utils@2.40.0 - -## 3.2.10 - -### Patch Changes - -- @modern-js/utils@2.39.2 - -## 3.2.9 - -### Patch Changes - -- @modern-js/utils@2.39.1 - -## 3.2.8 - -### Patch Changes - -- @modern-js/utils@2.39.0 - -## 3.2.7 - -### Patch Changes - -- 8f43163: feat: optimize generator bundle - - feat: 优化生成器打包 - -- c90a91a: feat: upgrade generator support handle special package - - feat: upgrade 生成器支持处理特殊的插件包版本 - - - @modern-js/utils@2.38.0 - -## 3.2.6 - -## 3.2.5 - -## 3.2.4 - -## 3.2.3 - -## 3.2.2 - -## 3.2.1 - -## 3.2.0 - -## 3.1.39 - -## 3.1.38 - -## 3.1.37 - -## 3.1.36 - -### Patch Changes - -- f1de744: chore(generators): adjust build target to es2019 - - chore(generators): 调整构建的 target 为 es2019 - -## 3.1.35 - -## 3.1.34 - -## 3.1.33 - -## 3.1.32 - -## 3.1.31 - -## 3.1.30 - -## 3.1.29 - -## 3.1.28 - -## 3.1.27 - -## 3.1.26 - -## 3.1.25 - -## 3.1.24 - -## 3.1.23 - -## 3.1.22 - -### Patch Changes - -- 7e6fb5f: chore: publishConfig add provenance config - - chore: publishConfig 增加 provenance 配置 - -## 3.1.21 - -## 3.1.20 - -### Patch Changes - -- b647c68: chore(generator): update codesmith version - - chore(generator): 更新 codesmith 版本 - -## 3.1.19 - -## 3.1.18 - -### Patch Changes - -- 26dcf3a: chore: bump typescript to v5 in devDependencies - - chore: 升级 devDependencies 中的 typescript 版本到 v5 - -- de8f73f: feat: update codesmith version - - feat: 更新 codesmith 版本 - -## 3.1.17 - -### Patch Changes - -- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config. - chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置 - -## 3.1.16 - -## 3.1.15 - -## 3.1.14 - -### Patch Changes - -- 21c87bf: feat: bump codesmith packages version - - feat: 升级 codesmith 包版本 - -- bc61dab: feat: bump codesmith version - - feat: 升级 codesmith 版本 - -## 3.1.13 - -## 3.1.12 - -## 3.1.11 - -## 3.1.10 - -### Patch Changes - -- 4e876ab: chore: package.json include the monorepo-relative directory - - chore: 在 package.json 中声明 monorepo 的子路径 - -## 3.1.9 - -## 3.1.8 - -## 3.1.7 - -## 3.1.6 - -## 3.1.5 - -## 3.1.4 - -## 3.1.3 - -### Patch Changes - -- 034f36b: feat: set the default language of CLI to English - - feat: 将命令行的默认语言设置为英文 - -## 3.1.2 - -## 3.1.1 - -## 3.1.0 - -### Patch Changes - -- 0da32d0: chore: upgrade jest and puppeteer - chore: 升级 jest 和 puppeteer 到 latest - -## 3.0.11 - -## 3.0.10 diff --git a/packages/generator/generators/upgrade-generator/LICENSE b/packages/generator/generators/upgrade-generator/LICENSE deleted file mode 100644 index 39e3c5971226..000000000000 --- a/packages/generator/generators/upgrade-generator/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Modern.js - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/generator/generators/upgrade-generator/README.md b/packages/generator/generators/upgrade-generator/README.md deleted file mode 100644 index f3d407c43230..000000000000 --- a/packages/generator/generators/upgrade-generator/README.md +++ /dev/null @@ -1,26 +0,0 @@ - - -- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/generators/upgrade-generator/jest.config.js b/packages/generator/generators/upgrade-generator/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/generators/upgrade-generator/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/generators/upgrade-generator/modern.config.js b/packages/generator/generators/upgrade-generator/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/generator/generators/upgrade-generator/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/generator/generators/upgrade-generator/package.json b/packages/generator/generators/upgrade-generator/package.json deleted file mode 100644 index 169300cd9f54..000000000000 --- a/packages/generator/generators/upgrade-generator/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@modern-js/upgrade-generator", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/generators/upgrade-generator" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "3.7.38", - "jsnext:source": "./src/index.ts", - "main": "./src/index.ts", - "files": [ - "/templates", - "/dist/index.js" - ], - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-api-app": "2.6.8", - "@modern-js/codesmith-api-json": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@modern-js/i18n-utils": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "jest": "^29.7.0", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public" - }, - "types": "./src/index.ts" -} diff --git a/packages/generator/generators/upgrade-generator/src/index.ts b/packages/generator/generators/upgrade-generator/src/index.ts deleted file mode 100644 index 4d37fcafd1bc..000000000000 --- a/packages/generator/generators/upgrade-generator/src/index.ts +++ /dev/null @@ -1,192 +0,0 @@ -import path from 'path'; -import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith'; -import { AppAPI } from '@modern-js/codesmith-api-app'; -import { JsonAPI } from '@modern-js/codesmith-api-json'; -import { type Solution, SolutionToolsMap } from '@modern-js/generator-common'; -import { - fs, - getAvailableVersion, - getModernVersion, - getPackageManager, - getPackageObj, - getPackageVersion, - isPackageExist, - ora, - semver, -} from '@modern-js/generator-utils'; -import { i18n, localeKeys } from './locale'; - -// Special modern.js dependencies, the plugin version maybe not same with other modern.js plugin -const SpecialModernDeps = [ - '@modern-js/builder-rspack-provider', // need be removed after 2.46.1 - '@modern-js/eslint-config', - '@modern-js-app/eslint-config', -]; - -const DeprecatedModernBuilderDeps = [ - '@modern-js/builder-plugin-image-compress', - '@modern-js/builder-plugin-swc', - '@modern-js/builder-plugin-node-polyfill', - '@modern-js/builder-plugin-stylus', -]; - -const handleSpecialModernDeps = async (dep: string, modernVersion: string) => { - const version = await getAvailableVersion(dep, modernVersion); - if (!(await isPackageExist(`${dep}@${version}`))) { - return getPackageVersion(dep); - } - return version; -}; - -export const handleTemplateFile = async ( - context: GeneratorContext, - generator: GeneratorCore, - appApi: AppAPI, -) => { - const jsonAPI = new JsonAPI(generator); - // get project solution type - const pkgInfo = await getPackageObj(context); - const deps = { - ...pkgInfo.devDependencies, - ...pkgInfo.dependencies, - }; - const solutions = Object.keys(SolutionToolsMap).filter( - solution => deps[SolutionToolsMap[solution as Solution]], - ); - if (solutions.length === 0) { - throw Error(i18n.t(localeKeys.tooltip.no_solution)); - } - if (solutions.length >= 2) { - throw Error(i18n.t(localeKeys.tooltip.more_solution)); - } - - // get modern latest version - const modernVersion = await getModernVersion( - solutions[0] as Solution, - context.config.registry, - context.config.distTag || 'latest', - ); - - generator.logger.info( - `[${i18n.t(localeKeys.modernVersion)}]: ${modernVersion}`, - ); - - // adjust Modern.js packages' version is latest? - if ( - Object.keys(deps) - .filter( - dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'), - ) - .filter(dep => !dep.includes('electron')) - .filter(dep => !dep.includes('codesmith') && !dep.includes('easy-form')) - .filter(dep => !dep.includes('eslint-config')) - .every(dep => deps[dep] === modernVersion) - ) { - generator.logger.info( - `[${i18n.t(localeKeys.alreadyLatest)}]: ${modernVersion}`, - ); - return; - } - - const appDir = context.materials.default.basePath; - - const packageManager = await getPackageManager(appDir); - context.config.packageManager = packageManager; - - const npmrcPath = path.join(generator.outputPath, '.npmrc'); - if (fs.existsSync(npmrcPath)) { - const content = fs.readFileSync(npmrcPath, 'utf-8'); - if (!content.includes('strict-peer-dependencies=false')) { - fs.appendFileSync(npmrcPath, '\nstrict-peer-dependencies=false\n'); - } - } else { - fs.ensureFileSync(npmrcPath); - fs.writeFileSync(npmrcPath, 'strict-peer-dependencies=false'); - } - - const modernDeps = Object.keys(pkgInfo.dependencies || {}).filter( - dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'), - ); - const modernDevDeps = Object.keys(pkgInfo.devDependencies || {}).filter( - dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'), - ); - const updateInfo: Record- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/new-action/modern.config.js b/packages/generator/new-action/modern.config.js deleted file mode 100644 index 1101786c10dd..000000000000 --- a/packages/generator/new-action/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { nodeBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: nodeBuildConfig, -}; diff --git a/packages/generator/new-action/package.json b/packages/generator/new-action/package.json deleted file mode 100644 index 26d92474fa7e..000000000000 --- a/packages/generator/new-action/package.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "@modern-js/new-action", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/generator/new-action" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "2.68.1", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./dist/cjs/index.js", - "bin": { - "run": "./dist/cjs/run.js" - }, - "exports": { - ".": { - "node": { - "jsnext:source": "./src/index.ts", - "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js" - }, - "default": "./dist/cjs/index.js" - } - }, - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "rstest --passWithNoTests" - }, - "dependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-formily": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/generator-common": "workspace:*", - "@modern-js/generator-utils": "workspace:*", - "@swc/helpers": "^0.5.17", - "commander": "10.0.1", - "json5": "2.2.3" - }, - "devDependencies": { - "@scripts/build": "workspace:*", - "@scripts/rstest-config": "workspace:*", - "@types/node": "^20", - "ts-node": "^10.9.2", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "registry": "https://registry.npmjs.org/", - "access": "public", - "types": "./dist/types/index.d.ts" - } -} diff --git a/packages/generator/new-action/rstest.config.ts b/packages/generator/new-action/rstest.config.ts deleted file mode 100644 index 660a9ce57f40..000000000000 --- a/packages/generator/new-action/rstest.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { withTestPreset } from '@scripts/rstest-config'; - -export default withTestPreset({ - root: __dirname, - testEnvironment: 'node', - globals: true, -}); diff --git a/packages/generator/new-action/src/constants.ts b/packages/generator/new-action/src/constants.ts deleted file mode 100644 index 17e7f1bae8e3..000000000000 --- a/packages/generator/new-action/src/constants.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const enableAlreadyText: Record- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/generator/sandpack-react/jest.config.js b/packages/generator/sandpack-react/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/generator/sandpack-react/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/generator/sandpack-react/tsconfig.json b/packages/generator/sandpack-react/tsconfig.json deleted file mode 100644 index 32a7aee84b06..000000000000 --- a/packages/generator/sandpack-react/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": {} - }, - "include": ["src"] -} diff --git a/packages/runtime/plugin-i18n/package.json b/packages/runtime/plugin-i18n/package.json index 147e2ede1b2c..9debdaf9e782 100644 --- a/packages/runtime/plugin-i18n/package.json +++ b/packages/runtime/plugin-i18n/package.json @@ -80,7 +80,6 @@ "scripts": { "dev": "rslib build --watch", "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "build": "rslib build", "test": "jest" }, diff --git a/packages/runtime/plugin-runtime/package.json b/packages/runtime/plugin-runtime/package.json index 9e3ff60ac89b..180f0db72866 100644 --- a/packages/runtime/plugin-runtime/package.json +++ b/packages/runtime/plugin-runtime/package.json @@ -227,7 +227,6 @@ "scripts": { "dev": "rslib build --watch", "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "build": "rslib build && pnpm run gen-static", "gen-static": "ts-node ./scripts/gen-static.ts", "test": "jest" diff --git a/packages/runtime/render/package.json b/packages/runtime/render/package.json index 6b527b498fab..8d44f3cd21b8 100644 --- a/packages/runtime/render/package.json +++ b/packages/runtime/render/package.json @@ -22,7 +22,6 @@ ], "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "modern-lib build --watch", "build": "modern-lib build", "test": "jest --passWithNoTests" diff --git a/packages/server/babel-plugin-module-resolver/package.json b/packages/server/babel-plugin-module-resolver/package.json index 92cd3124feaf..71c39c91b110 100644 --- a/packages/server/babel-plugin-module-resolver/package.json +++ b/packages/server/babel-plugin-module-resolver/package.json @@ -32,7 +32,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "modern-lib build --watch", "build": "modern-lib build", "test": "jest --passWithNoTests" diff --git a/packages/server/bff-core/package.json b/packages/server/bff-core/package.json index 14a86aa38c32..abaf4a2e1ae0 100644 --- a/packages/server/bff-core/package.json +++ b/packages/server/bff-core/package.json @@ -29,7 +29,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/server/bff-runtime/package.json b/packages/server/bff-runtime/package.json index 970b527e4684..6131a9d4365b 100644 --- a/packages/server/bff-runtime/package.json +++ b/packages/server/bff-runtime/package.json @@ -32,7 +32,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/server/core/package.json b/packages/server/core/package.json index a928aafcc9cc..5e28f8af27c6 100644 --- a/packages/server/core/package.json +++ b/packages/server/core/package.json @@ -53,7 +53,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/server/core/tests/helpers.ts b/packages/server/core/tests/helpers.ts index d0bc3197f0fb..7d0822dfa3c2 100644 --- a/packages/server/core/tests/helpers.ts +++ b/packages/server/core/tests/helpers.ts @@ -7,7 +7,6 @@ export function getDefaultConfig() { source: {}, tools: {}, server: {}, - runtime: {}, bff: {}, dev: {}, security: {}, diff --git a/packages/server/create-request/package.json b/packages/server/create-request/package.json index 5e3d818c572f..9d095134a0f3 100644 --- a/packages/server/create-request/package.json +++ b/packages/server/create-request/package.json @@ -97,7 +97,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/server/plugin-polyfill/package.json b/packages/server/plugin-polyfill/package.json index 90105d14b48e..916a39981841 100644 --- a/packages/server/plugin-polyfill/package.json +++ b/packages/server/plugin-polyfill/package.json @@ -64,7 +64,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "build": "rslib build", "dev": "rslib build --watch", "test": "jest --passWithNoTests" diff --git a/packages/server/prod-server/package.json b/packages/server/prod-server/package.json index d048f9c495e4..ed8d9e47a513 100644 --- a/packages/server/prod-server/package.json +++ b/packages/server/prod-server/package.json @@ -22,7 +22,6 @@ "module": "./dist/esm-node/index.mjs", "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "build": "rslib build", "dev": "rslib build --watch", "test": "jest" diff --git a/packages/server/server-runtime/package.json b/packages/server/server-runtime/package.json index ff728bd61261..e4114f4b6d70 100644 --- a/packages/server/server-runtime/package.json +++ b/packages/server/server-runtime/package.json @@ -52,7 +52,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/server/server/package.json b/packages/server/server/package.json index 3a25a4e3aa07..c8b91f1d1592 100644 --- a/packages/server/server/package.json +++ b/packages/server/server/package.json @@ -51,7 +51,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "build": "rslib build", "dev": "rslib build --watch", "test": "jest" diff --git a/packages/server/server/tests/mock.test.ts b/packages/server/server/tests/mock.test.ts index 9fb1ba9688f0..5c392a324174 100644 --- a/packages/server/server/tests/mock.test.ts +++ b/packages/server/server/tests/mock.test.ts @@ -13,7 +13,6 @@ function getDefaultConfig() { source: {}, tools: {}, server: {}, - runtime: {}, bff: {}, dev: {}, security: {}, diff --git a/packages/server/utils/package.json b/packages/server/utils/package.json index 41ecb9a456d7..6987f5265b46 100644 --- a/packages/server/utils/package.json +++ b/packages/server/utils/package.json @@ -40,7 +40,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/solutions/app-tools/package.json b/packages/solutions/app-tools/package.json index 7025423ff331..9cbc660c9c04 100644 --- a/packages/solutions/app-tools/package.json +++ b/packages/solutions/app-tools/package.json @@ -103,7 +103,6 @@ }, "scripts": { "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", "dev": "rslib build --watch", "build": "rslib build", "test": "jest --passWithNoTests" diff --git a/packages/solutions/app-tools/src/commands/index.ts b/packages/solutions/app-tools/src/commands/index.ts index bedcc21c8fa4..46e9ffd14da5 100644 --- a/packages/solutions/app-tools/src/commands/index.ts +++ b/packages/solutions/app-tools/src/commands/index.ts @@ -1,6 +1,5 @@ -import { castArray } from '@modern-js/builder'; import type { CLIPluginAPI } from '@modern-js/plugin'; -import { type Command, newAction, upgradeAction } from '@modern-js/utils'; +import type { Command } from '@modern-js/utils'; import { i18n, localeKeys } from '../locale'; import type { AppTools } from '../types'; import type { @@ -85,35 +84,6 @@ export const deployCommand = ( }); }; -export const newCommand = (program: Command, locale: string) => { - program - .command('new') - .usage('[options]') - .description(i18n.t(localeKeys.command.new.describe)) - .option( - '--config-file- A Progressive React Framework for modern web development. -
- -## Getting Started - -Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js. - -## Documentation - -- [English Documentation](https://modernjs.dev/en/) -- [中文文档](https://modernjs.dev) - -## Contributing - -Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md). - -## License - -Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE). diff --git a/packages/toolkit/upgrade/bin/run.js b/packages/toolkit/upgrade/bin/run.js deleted file mode 100755 index 4a99813f5225..000000000000 --- a/packages/toolkit/upgrade/bin/run.js +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env node - -const fs = require('fs'); -const path = require('path'); - -const pkgInfo = require(path.join(__dirname, '../package.json')); -const srcPath = pkgInfo['jsnext:source']; -const distPath = pkgInfo.main; -const project = path.join(__dirname, '../tsconfig.json'); -let env = 'production'; -if (fs.existsSync(project)) { - env = 'development'; -} -if (process.env.CODESMITH_ENV) { - env = process.env.CODESMITH_ENV; -} - -if (env === 'development') { - require('ts-node').register({ project }); -} - -try { - require(`../${env === 'development' ? srcPath : distPath}`).default(); -} catch (e) { - console.error(e); -} diff --git a/packages/toolkit/upgrade/jest.config.js b/packages/toolkit/upgrade/jest.config.js deleted file mode 100644 index 5fcd3e5b28bd..000000000000 --- a/packages/toolkit/upgrade/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -const sharedConfig = require('@scripts/jest-config'); - -/** @type {import('@jest/types').Config.InitialOptions} */ -module.exports = { - ...sharedConfig, - rootDir: __dirname, -}; diff --git a/packages/toolkit/upgrade/modern.config.js b/packages/toolkit/upgrade/modern.config.js deleted file mode 100644 index 57303a8d8dfa..000000000000 --- a/packages/toolkit/upgrade/modern.config.js +++ /dev/null @@ -1,5 +0,0 @@ -const { generatorBuildConfig } = require('@scripts/build'); - -module.exports = { - buildConfig: generatorBuildConfig, -}; diff --git a/packages/toolkit/upgrade/package.json b/packages/toolkit/upgrade/package.json deleted file mode 100644 index ca2c4b534911..000000000000 --- a/packages/toolkit/upgrade/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "@modern-js/upgrade", - "description": "A Progressive React Framework for modern web development.", - "homepage": "https://modernjs.dev", - "bugs": "https://github.com/web-infra-dev/modern.js/issues", - "repository": { - "type": "git", - "url": "https://github.com/web-infra-dev/modern.js", - "directory": "packages/toolkit/upgrade" - }, - "license": "MIT", - "keywords": [ - "react", - "framework", - "modern", - "modern.js" - ], - "version": "2.68.1", - "jsnext:source": "./src/index.ts", - "types": "./src/index.ts", - "main": "./dist/index.js", - "bin": { - "run": "./bin/run.js" - }, - "files": [ - "bin", - "dist" - ], - "exports": { - ".": { - "node": { - "jsnext:source": "./src/index.ts", - "import": "./dist/index.js", - "require": "./dist/index.js" - }, - "default": "./dist/index.js" - } - }, - "scripts": { - "prepublishOnly": "only-allow-pnpm", - "new": "modern-lib new", - "build": "modern-lib build", - "test": "jest --passWithNoTests" - }, - "devDependencies": { - "@modern-js/codesmith": "2.6.8", - "@modern-js/codesmith-utils": "2.6.8", - "@modern-js/i18n-utils": "workspace:*", - "@modern-js/upgrade-generator": "workspace:*", - "@scripts/build": "workspace:*", - "@scripts/jest-config": "workspace:*", - "@types/jest": "^29.5.14", - "@types/node": "^20", - "commander": "10.0.1", - "jest": "^29.7.0", - "ts-node": "^10.9.2", - "typescript": "^5" - }, - "sideEffects": false, - "publishConfig": { - "main": "./dist/index.js", - "registry": "https://registry.npmjs.org/", - "access": "public", - "types": "./dist/index.d.ts" - } -} diff --git a/packages/toolkit/upgrade/src/index.ts b/packages/toolkit/upgrade/src/index.ts deleted file mode 100644 index 4e0c1771b8b3..000000000000 --- a/packages/toolkit/upgrade/src/index.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { getLocaleLanguage } from '@modern-js/i18n-utils/language-detector'; -import { Command } from 'commander'; -import { i18n, localeKeys } from './locale'; -import type { Options } from './upgrade'; - -export type { Options }; - -export function defineCommand(program: Command) { - const locale = getLocaleLanguage(); - i18n.changeLanguage({ locale }); - program - .alias('upgrade') - .description(i18n.t(localeKeys.command.describe)) - .usage('npx @modern-js/upgrade [options]') - .option('-c --config