From c94a4fb1df495093160636ac4230904ff3be8f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= Date: Mon, 20 Dec 2021 17:07:38 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9Ble?= =?UTF-8?q?rna=20=E9=A1=B9=E7=9B=AE=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/code-generator/.editorconfig | 13 --- packages/code-generator/.eslintignore | 16 ---- packages/code-generator/.eslintrc.js | 8 -- packages/code-generator/abc.json | 13 --- packages/code-generator/commitlint.config.js | 3 - packages/code-generator/jest.config.js | 9 --- .../code-generator/scripts/fixDefVersion.js | 80 ------------------- .../scripts/move-files-to-build-dest.js | 24 ------ packages/code-generator/tsconfig.json | 34 +------- 9 files changed, 2 insertions(+), 198 deletions(-) delete mode 100644 packages/code-generator/.editorconfig delete mode 100644 packages/code-generator/.eslintignore delete mode 100644 packages/code-generator/.eslintrc.js delete mode 100644 packages/code-generator/abc.json delete mode 100644 packages/code-generator/commitlint.config.js delete mode 100644 packages/code-generator/jest.config.js delete mode 100644 packages/code-generator/scripts/fixDefVersion.js delete mode 100644 packages/code-generator/scripts/move-files-to-build-dest.js diff --git a/packages/code-generator/.editorconfig b/packages/code-generator/.editorconfig deleted file mode 100644 index 319299684..000000000 --- a/packages/code-generator/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true -quote_type = single - -[*.md] -trim_trailing_whitespace = false diff --git a/packages/code-generator/.eslintignore b/packages/code-generator/.eslintignore deleted file mode 100644 index b6fe41870..000000000 --- a/packages/code-generator/.eslintignore +++ /dev/null @@ -1,16 +0,0 @@ -# 忽略目录 -node_modules/ -build/ -dist/ -test-cases/ -test/ -tests/ -output/ -es/ -lib/ -coverage/ - -# 忽略文件 -**/*.min.js -**/*-min.js -**/*.bundle.js diff --git a/packages/code-generator/.eslintrc.js b/packages/code-generator/.eslintrc.js deleted file mode 100644 index 8def4f39d..000000000 --- a/packages/code-generator/.eslintrc.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - extends: 'eslint-config-ali/typescript/react', - rules: { - 'max-len': ['error', { code: 200 }], - 'function-paren-newline': 'off', - '@typescript-eslint/indent': 'off', - }, -}; diff --git a/packages/code-generator/abc.json b/packages/code-generator/abc.json deleted file mode 100644 index 99e68e6b9..000000000 --- a/packages/code-generator/abc.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "assets": { - "type": "command", - "command": { - "cmd": [ - "tnpm install", - "node scripts/fixDefVersion ./package.json", - "tnpm run build", - "node scripts/move-files-to-build-dest" - ] - } - } -} diff --git a/packages/code-generator/commitlint.config.js b/packages/code-generator/commitlint.config.js deleted file mode 100644 index 52f3b754b..000000000 --- a/packages/code-generator/commitlint.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: ['ali'], -}; diff --git a/packages/code-generator/jest.config.js b/packages/code-generator/jest.config.js deleted file mode 100644 index 0b213cd36..000000000 --- a/packages/code-generator/jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - transformIgnorePatterns: ['/node_modules/(?!core-js)/'], - moduleFileExtensions: ['ts', 'tsx', 'js', 'json'], - collectCoverage: false, - collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/node_modules/**', '!**/vendor/**'], - testMatch: ['/tests/**/*.test.ts'], -}; diff --git a/packages/code-generator/scripts/fixDefVersion.js b/packages/code-generator/scripts/fixDefVersion.js deleted file mode 100644 index b9b6d8319..000000000 --- a/packages/code-generator/scripts/fixDefVersion.js +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env node -/* eslint-disable no-console */ -/* eslint-disable @typescript-eslint/no-require-imports */ -// @ts-check - check the types to avoid silly mistakes -// This is a script to fix the version in package.json during DEF publishing. -// Test this file: -// -// $ BUILD_GIT_BRANCH=release/1.1.3 BUILD_ARGV_STR=--def_publish_env=daily node scripts/fixDefVersion ./package.json -// --> should fix the package.json version to 1.1.3-beta.xxxx -// -// $ BUILD_GIT_BRANCH=release/1.1.3 BUILD_ARGV_STR=--def_publish_env=prod node scripts/fixDefVersion ./package.json -// --> should fix the package.json version to 1.1.3 - -const fs = require('fs'); -const moment = require('moment'); -const program = require('commander'); -const parseArgs = require('yargs-parser'); - -program - .description('Fix version for def publishing TNPM packages') - .option('--no-beta', 'no beta version', false) - .arguments('package.json file path (only one is needed)') - .parse(process.argv); - -try { - const packageJsonFilePath = program.args[0]; - if (!packageJsonFilePath) { - program.help(); - process.exit(2); - } - - const destVersion = fixVersion({ - packageJsonFilePath, - env: process.env, - beta: program.opts().beta, - }); - - console.log(`Fixed version to: ${destVersion}`); -} catch (err) { - console.error('Got error: ', err); - process.exit(1); -} - -function fixVersion({ packageJsonFilePath, env = process.env, beta = true }) { - if (!env.BUILD_GIT_BRANCH) { - throw new Error('env.BUILD_GIT_BRANCH is required'); - } - - if (!env.BUILD_ARGV_STR) { - throw new Error('env.BUILD_ARGV_STR is required'); - } - - const gitBranchVersion = parseBuildBranchVersion(env.BUILD_GIT_BRANCH); - const buildArgs = parseArgs(env.BUILD_ARGV_STR); - const buildEnv = buildArgs.def_publish_env; // daily | prod - - const destVersion = - buildEnv === 'prod' || !beta - ? gitBranchVersion - : `${gitBranchVersion}-beta.${moment().format('MMDDHHmm').replace(/^0+/, '')}`; - - const packageJson = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf-8')); - - packageJson.version = destVersion; - - if (env.BUILD_GIT_COMMITID) { - packageJson.gitHead = env.BUILD_GIT_COMMITID; - } - - fs.writeFileSync(packageJsonFilePath, `${JSON.stringify(packageJson, null, 2)}\n`, { - encoding: 'utf8', - }); - - return destVersion; -} - -function parseBuildBranchVersion(branchName) { - const m = `${branchName}`.match(/\d+\.\d+\.\d+/); - return (m && m[0]) || ''; -} diff --git a/packages/code-generator/scripts/move-files-to-build-dest.js b/packages/code-generator/scripts/move-files-to-build-dest.js deleted file mode 100644 index 736df9968..000000000 --- a/packages/code-generator/scripts/move-files-to-build-dest.js +++ /dev/null @@ -1,24 +0,0 @@ -/* eslint-disable @typescript-eslint/no-require-imports */ -const fs = require('fs'); -const { spawnSync } = require('child_process'); - -const BUILD_DEST = process.env.BUILD_DEST || '.package'; - -fs.mkdirSync(BUILD_DEST, { recursive: true }); - -const distFiles = [...require('../package.json').files, 'package.json']; - -distFiles.forEach((file) => { - console.log('mv %s', file); - if (file === BUILD_DEST) { - fs.mkdirSync(`${BUILD_DEST}/${file}`, { recursive: true }); - spawnSync('mv', [`${file}/*`, `${BUILD_DEST}/${file}/`], { shell: true, stdio: 'inherit' }); - } -}); - -distFiles.forEach((file) => { - console.log('mv %s', file); - if (file !== BUILD_DEST) { - spawnSync('mv', [file, `${BUILD_DEST}/${file}`], { shell: true, stdio: 'inherit' }); - } -}); diff --git a/packages/code-generator/tsconfig.json b/packages/code-generator/tsconfig.json index 2d70c1347..8edf132a3 100644 --- a/packages/code-generator/tsconfig.json +++ b/packages/code-generator/tsconfig.json @@ -1,37 +1,7 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "declaration": true, - "lib": ["ES6", "ES2016", "ES2017", "ES2018", "ES2019", "ES2020"], - // Target latest version of ECMAScript. - "target": "es5", - // Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. - "module": "commonjs", - // Search under node_modules for non-relative imports. - "moduleResolution": "node", - // Enable strictest settings like strictNullChecks & noImplicitAny. - "strict": true, - "strictPropertyInitialization": false, - // Allow default imports from modules with no default export. This does not affect code emit, just typechecking. - "allowSyntheticDefaultImports": true, - // Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. - "esModuleInterop": true, - // Import emit helpers (e.g. __extends, __rest, etc..) from tslib - "importHelpers": true, - // Enables experimental support for ES7 decorators. - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - // Generates corresponding .map file. - "sourceMap": true, - // Disallow inconsistently-cased references to the same file. - "forceConsistentCasingInFileNames": true, - // Allow json import - "resolveJsonModule": true, - // skip type checking of declaration files - "skipLibCheck": true, - "types": ["jest", "node"], - "baseUrl": "." /* Base directory to resolve non-absolute module names. */, "outDir": "lib" }, - "include": ["src/**/*"], - "exclude": ["**/test", "**/lib", "**/es", "node_modules"] + "include": ["./src/"] }