feat: 新增组件

Author: yang.zhang04

.eslintignore

@@ -17,3 +17,5 @@ packages/doc-web/.docusaurus
 *.md
 docs
 packages/touch-emulator/tests/*
+packages/doc-web/src/theme/SearchBar/
+packages/ffsend/*

.eslintrc

@@ -34,6 +34,7 @@
       }
     ],
     "jsx-a11y/no-autofocus": "off",
-    "rules/require-default-props":"off"
+    "rules/require-default-props":"off",
+    "@typescript-eslint/no-var-requires":"off"
   }
 }

.gitignore

@@ -71,9 +71,3 @@ dist
 # next.js
 .next/
 out/
-
-# eslint
-.eslintcache
-
-# stylelint
-.stylelintcache

.stylelintignore

@@ -11,4 +11,3 @@ packages/touch-emulator/tests/*
 packages/touch-emulator/touch-emulator.js
 coverage
 packages/h5/dist-custom-elements
-

.stylelintrc.js

@@ -22,11 +22,5 @@ module.exports = {
     'declaration-block-no-redundant-longhand-properties': null,
     'selector-class-pattern': null,
     'keyframes-name-pattern': null,
-    "selector-pseudo-class-no-unknown": [
-      true,
-      {
-        "ignorePseudoClasses": ["global"]
-      }
-    ]
   },
 };

package.json

@@ -15,12 +15,11 @@
     "postinstall": "npm run build:lint && npm run build:cli && npm run build:compiler && pnpm run build:h5 && pnpm run build:react && pnpm run build:vue",
     "pre-commit": "lint-staged -c .lintstagedrc.mjs",
     "prepare": "husky install",
-    "prettier": "prettier -c --write **/* --cache",
-    "lint": "eslint . --fix --quiet --cache",
-    "stylelint": "stylelint  **/*.{css,less} --cache",
-    "stylelint:fix": "pnpm stylelint --fix",
+    "prettier": "prettier -c --write **/*",
+    "lint": "eslint . --fix --quiet",
+    "stylelint": "stylelint  **/*.{css,less}",
+    "stylelint:fix": "stylelint  **/*.{css,less} --fix",
     "release": "titian-cli release",
-    "format": "pnpm lint && pnpm stylelint:fix && pnpm prettier",
     "start": "run-p start:h5 start:react start:eg:react",
     "start-vue": "run-p start:h5 start:vue start:eg:vue",
     "start:h5": "pnpm --filter @titian-design/h5 run start",

packages/cli/CHANGELOG.md

@@ -1,5 +0,0 @@
-# 0.1.0 (2023-01-06)
-
-### Features
-
-- **init:** first commit ([985a83b](https://github.com/weimob-tech/titian-h5/commit/985a83bb969fedb16b0343839692e2f2fe5b59a1))

packages/cli/package.json

@@ -25,8 +25,8 @@
   "scripts": {
     "prepublishOnly": "run-p build-*",
     "build": "run-p build-*",
-    "build-bundle": "rollup -c rollup.config.ts --configPlugin typescript",
-    "watch": "rollup -c rollup.config.ts --configPlugin typescript -w",
+    "build-bundle": "rollup -c rollup.config.ts --configPlugin typescript --bundleConfigAsCjs",
+    "watch": "rollup -c rollup.config.ts --configPlugin typescript -w --bundleConfigAsCjs",
     "build-types": "tsc -p src --emitDeclarationOnly"
   },
   "dependencies": {
@@ -60,7 +60,7 @@
     "@types/user-home": "^2.0.0",
     "@types/uuid": "^8.3.4",
     "npm-run-all": "^4.1.5",
-    "rollup": "^2.72.1",
+    "rollup": "^3.21.0",
     "tslib": "^2.4.0",
     "typescript": "^4.5.4"
   },

packages/cli/rollup.config.ts

@@ -7,14 +7,20 @@ const sharedConfig = {
     // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
     ...Object.keys(require('./package.json').dependencies),
   ],
-  plugins: [nodeResolve(), typescript()],
+  plugins: [
+    nodeResolve(),
+    typescript({
+      allowSyntheticDefaultImports: true,
+    }),
+  ],
 };
 
 const config: RollupOptions = {
   input: './src/index.ts',
   output: {
     file: `dist/index.js`,
     format: 'cjs',
+    exports: 'auto',
   },
   ...sharedConfig,
 };
@@ -24,6 +30,7 @@ const cliConfig: RollupOptions = {
   output: {
     file: 'dist/cli.js',
     format: 'cjs',
+    exports: 'auto',
   },
   ...sharedConfig,
 };

packages/cli/src/exec/index.ts

@@ -6,7 +6,7 @@ import { spawn } from '../utils/spawn';
 import { resolveConfig, InlineConfig } from './config';
 
 export async function exec(args$0: InlineConfig, options$0: InlineConfig | Command, command$0: Command): Promise<void> {
-  const command: Command = command$0 || options$0;
+  const command: any = command$0 || options$0;
   const options: InlineConfig = (command$0 ? options$0 : args$0) as InlineConfig;
   const commandName = command.name();
   const config = await resolveConfig(
@@ -43,6 +43,9 @@ export async function exec(args$0: InlineConfig, options$0: InlineConfig | Comma
       // @ts-ignore
       logger.info(`run time is ${chalk.yellowBright(`${(performance.now() - global.__start_time).toFixed(2)}ms`)}`);
     }
+    if (e !== 0) {
+      child.kill('SIGINT');
+    }
     process.exit(e ?? 1);
   });
 

packages/cli/src/models/Command.ts

@@ -1,19 +1,27 @@
 import type { Logger } from 'log4js';
 import * as readPkgUp from 'read-pkg-up';
 import { satisfies } from 'semver';
-import { SyncHook } from 'tapable';
+import { SyncHook, AsyncSeriesHook } from 'tapable';
 import { loadConfigFromFile, ResolvedConfig } from '../exec/config';
 import logger from '../utils/logger';
 
 export interface CommandHooks {
   beforeInit: SyncHook<never>;
+  beforeInitAsync: AsyncSeriesHook<never>;
   init: SyncHook<never>;
+  initAsync: AsyncSeriesHook<never>;
   afterInit: SyncHook<never>;
+  afterInitAsync: AsyncSeriesHook<never>;
   beforeRun: SyncHook<never>;
+  beforeRunAsync: AsyncSeriesHook<never>;
   run: SyncHook<never>;
+  runAsync: AsyncSeriesHook<never>;
   afterRun: SyncHook<never>;
+  afterRunAsync: AsyncSeriesHook<never>;
   watch: SyncHook<never>;
+  watchAsync: AsyncSeriesHook<never>;
   release: SyncHook<string | any>;
+  releaseAsync: AsyncSeriesHook<string | any>;
 }
 
 export type HookFun = (hook: CommandHooks) => void;
@@ -69,37 +77,52 @@ export default class Command {
       afterRun: new SyncHook(),
       watch: new SyncHook(),
       release: new SyncHook(['params']),
+
+      beforeInitAsync: new AsyncSeriesHook(),
+      initAsync: new AsyncSeriesHook(),
+      afterInitAsync: new AsyncSeriesHook(),
+      beforeRunAsync: new AsyncSeriesHook(),
+      runAsync: new AsyncSeriesHook(),
+      afterRunAsync: new AsyncSeriesHook(),
+      watchAsync: new AsyncSeriesHook(),
+      releaseAsync: new AsyncSeriesHook(['releaseInfo']),
     };
 
     this.logger = logger;
   }
 
   protected async beforeInit() {
     this.hooks.beforeInit.call();
+    await this.toPromise(this.hooks.beforeInitAsync);
   }
 
   protected async init() {
     this.hooks.init.call();
+    await this.toPromise(this.hooks.initAsync);
     this.logger.error(`init methods must be implement`);
     process.exit(1);
   }
 
   protected async afterInit() {
     this.hooks.afterInit.call();
+    await this.toPromise(this.hooks.afterInitAsync);
   }
 
   protected async beforeRun() {
     this.hooks.beforeRun.call();
+    await this.toPromise(this.hooks.beforeRunAsync);
   }
 
   protected async run() {
     this.hooks.run.call();
+    await this.toPromise(this.hooks.runAsync);
     this.logger.error(`run methods must be implement`);
     process.exit(1);
   }
 
   protected async afterRun() {
     this.hooks.afterRun.call();
+    await this.toPromise(this.hooks.afterRunAsync);
   }
 
   private async getConfig() {
@@ -137,4 +160,14 @@ export default class Command {
       }
     }
   }
+
+  toPromise(hook: AsyncSeriesHook<any>, arg?: any) {
+    return new Promise<void>(resolve => {
+      if (arg) {
+        hook.callAsync(arg, resolve);
+      } else {
+        hook.callAsync(resolve);
+      }
+    });
+  }
 }

packages/cli/src/models/package.ts

@@ -10,7 +10,7 @@ import { normalizePath } from '../utils';
 import logger from '../utils/logger';
 import { getPackageRegistry } from '../utils/npminfo';
 
-export interface PacakgeOptions {
+export interface PackageOptions {
   targetPath: string;
   storeDir?: string;
   version?: string;
@@ -45,7 +45,7 @@ export default class Package {
 
   registryUrl: string;
 
-  constructor(options: PacakgeOptions) {
+  constructor(options: PackageOptions) {
     this.targetPath = options.targetPath;
     this.storeDir = options.storeDir || `${this.targetPath}/node_modules`;
     this.name = options.name;

packages/cli/src/prepare.ts

@@ -1,8 +1,8 @@
 import { existsSync } from 'fs';
+import { homedir } from 'os';
 import chalk from 'chalk';
 import type { ParsedArgs } from 'minimist';
 import * as readPkgUp from 'read-pkg-up';
-import userHome from 'user-home';
 import logger from './utils/logger';
 import { getPackageRegistry } from './utils/npminfo';
 
@@ -22,6 +22,7 @@ const checkRoot = () => {
 };
 
 const checkUserHome = () => {
+  const userHome = homedir();
   logger.debug(`user home: ${userHome}`);
 
   if (!userHome || !existsSync(userHome)) {

packages/cli/src/tsconfig.json

@@ -6,9 +6,9 @@
     // node support table: https://node.green/#ES2020-features-optional-chaining-operator-----
     "target": "ES2019",
     "outDir": "../dist",
-    "module": "commonjs",
+    "module": "CommonJS",
     "lib": ["ESNext", "DOM"],
-    "sourceMap": true,
+    "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true
   }
 }

packages/cli/src/utils/spawn.ts

@@ -1,5 +1,5 @@
 import { spawn as spawn$0, SpawnOptions } from 'child_process';
-import execa, { CommonOptions } from 'execa';
+import type { CommonOptions } from 'execa';
 import logger from './logger';
 
 export const spawn = (command: string, args: string[], options: SpawnOptions) => {
@@ -13,5 +13,7 @@ export const spawn = (command: string, args: string[], options: SpawnOptions) =>
 };
 
 export function exec(bin: string, args: string[], opts: CommonOptions<'utf8'> = {}) {
+  // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
+  const execa = require('execa');
   return execa(bin, args, { stdio: 'inherit', ...opts });
 }

packages/compiler/CHANGELOG.md

@@ -1,5 +0,0 @@
-# 0.1.0 (2023-01-06)
-
-### Features
-
-- **init:** first commit ([985a83b](https://github.com/weimob-tech/titian-h5/commit/985a83bb969fedb16b0343839692e2f2fe5b59a1))

packages/compiler/package.json

@@ -13,9 +13,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "rollup -c rollup.config.ts --configPlugin typescript",
+    "build": "rollup -c rollup.config.ts --configPlugin typescript --bundleConfigAsCjs",
     "prepublishOnly": "npm run build",
-    "start": "rollup -c rollup.config.ts --configPlugin typescript -w"
+    "start": "rollup -c rollup.config.ts --configPlugin typescript -w --bundleConfigAsCjs"
   },
   "dependencies": {
     "@pnpm/find-workspace-packages": "^4.0.5",
@@ -41,7 +41,7 @@
     "@types/node": "17.0.29",
     "@types/prompts": "^2.0.14",
     "@types/semver": "^7.3.9",
-    "rollup": "^2.72.1",
+    "rollup": "^3.21.0",
     "tslib": "^2.4.0",
     "typescript": "^4.5.4"
   }

packages/compiler/src/release.ts

@@ -98,11 +98,11 @@ export default class Release extends Command {
   }
 
   async createMergeRequest() {
-    const { projectId } = this.config;
-    if (projectId) {
+    const { projectId, env } = this.config;
+    if (projectId && env.TITIAN_PRIVATE_TOKEN) {
       const config = {
         method: 'post',
-        url: ``,
+        url: '',
         headers: {
           'PRIVATE-TOKEN': '',
           'Content-Type': 'application/json',
@@ -311,7 +311,8 @@ export default class Release extends Command {
     if (fs.existsSync('pnpm-workspace.yaml')) {
       this.packageManager = 'pnpm';
       this.logger.info('Manage packages with pnpm');
-      const pkgs = await findPnpmWorkspacePkg(this.root);
+      // @ts-ignore
+      const pkgs = await findPnpmWorkspacePkg.default(this.root);
       pkgs.forEach(({ dir, manifest }) => {
         if (manifest.name) {
           packagesInfo[manifest.name] = {
@@ -621,7 +622,7 @@ export default class Release extends Command {
           if (pkg.publish) {
             await this.genChangelog(pkg);
             const { stdout } = await this.exec('git', ['diff'], { stdio: 'pipe' });
-            const tag = pkgName === '@titian-design/weapp' ? `v${pkg.nextVersion}` : `${pkgName}@${pkg.nextVersion}`;
+            const tag = pkgName === this.config.mainPackage ? `v${pkg.nextVersion}` : `${pkgName}@${pkg.nextVersion}`;
             if (this.allTags.includes(tag)) {
               this.logger.warn(`${tag} 已经存在了，将删除原先的 tag`);
               await this.exec('git', ['tag', '-d', tag], { stdio: 'pipe' });

packages/compiler/src/warehouse.ts

@@ -132,6 +132,10 @@ class Warehouse {
         release: true,
         data: { msgtype: 'markdown', markdown: { content: publishInfo } },
       });
+      await this.release.toPromise(this.release.hooks.releaseAsync, {
+        release: true,
+        data: { msgtype: 'markdown', markdown: { content: publishInfo } },
+      });
     } catch (e) {
       this.release.logger.error(e);
       try {