@seayoo-web/scripts 1.3.2 → 1.3.4

package/dist/{git-BbsLu9cn.js → git-C3gyPvsT.js}

@@ -5,7 +5,11 @@ import "colors";
 const TemplateDir = "template";
 const InternalDir = "internal";
 const WorkspaceFile = "pnpm-workspace.yaml";
-const root = function() {
+let _root = null;
+async function getMonorepoRoot(ignoreMissing) {
+  if (_root !== null) {
+    return _root;
+  }
   let currentDir = process.cwd();
   while (currentDir !== path.parse(currentDir).root) {
     if (fs.existsSync(path.join(currentDir, WorkspaceFile))) {
@@ -14,14 +18,19 @@ const root = function() {
     currentDir = path.dirname(currentDir);
   }
   if (fs.existsSync(path.join(currentDir, "pnpm-workspace.yaml"))) {
+    _root = currentDir;
     return currentDir;
   }
-  throw new Error("Could not find repository root with pnpm-workspace.yaml".bgRed);
-}();
+  if (ignoreMissing) {
+    return "";
+  }
+  throw new Error("当前项目不是 monorepo 项目！");
+}
 async function getTemplates() {
   return await getRepos(TemplateDir);
 }
 async function getRepos(project) {
+  const root = await getMonorepoRoot();
   const projectDir = path.join(root, project);
   const dirs = await fs.readdir(projectDir);
   const repos = dirs.filter((item) => fs.statSync(path.join(projectDir, item)).isDirectory());
@@ -29,6 +38,7 @@ async function getRepos(project) {
   return repos.map((dir, index) => ({ id: dir, desc: descs[index] })).filter((item) => item.desc !== null);
 }
 async function getRepoDesc(project, dir) {
+  const root = await getMonorepoRoot();
   const packageFile = path.join(root, project, dir, "package.json");
   if (!await fs.exists(packageFile)) {
     return null;
@@ -37,6 +47,7 @@ async function getRepoDesc(project, dir) {
   return (content.description || "") + "";
 }
 async function getProjects(returnAll) {
+  const root = await getMonorepoRoot();
   const rootPkgPath = path.join(root, WorkspaceFile);
   if (await fs.pathExists(rootPkgPath)) {
     const content = await fs.readFile(rootPkgPath, "utf8");
@@ -56,6 +67,7 @@ async function getProjectName(project) {
   return project;
 }
 async function copyTemplate(templateName, targetDir) {
+  const root = await getMonorepoRoot();
   const templateSourceDir = path.join(root, TemplateDir, templateName);
   await fs.copy(templateSourceDir, targetDir, {
     filter: (src) => {
@@ -64,6 +76,7 @@ async function copyTemplate(templateName, targetDir) {
   });
 }
 async function addProjectToWorkspace(project) {
+  const root = await getMonorepoRoot();
   const rootWorkspacePath = path.join(root, WorkspaceFile);
   if (await fs.pathExists(rootWorkspacePath)) {
     let content = await fs.readFile(rootWorkspacePath, "utf8");
@@ -75,6 +88,7 @@ async function addProjectToWorkspace(project) {
   }
 }
 async function removeProjectFromWorkspace(project) {
+  const root = await getMonorepoRoot();
   const rootWorkspacePath = path.join(root, WorkspaceFile);
   if (await fs.pathExists(rootWorkspacePath)) {
     const content = (await fs.readFile(rootWorkspacePath, "utf8")).replace(
@@ -97,8 +111,9 @@ function converToDeployTagName(deployTo) {
   return `${DeployTagPrefix}${deployTo.toLowerCase().replace(/(?:^https?:\/\/|\/*$)/gi, "")}`;
 }
 async function execCmd(cmd, ignoreWarning = false) {
+  const root = await getMonorepoRoot(true);
   return new Promise((resolve, reject) => {
-    exec(cmd, { cwd: root, env: { ...process.env } }, (error, stdout, stderr) => {
+    exec(cmd, { cwd: root || "./", env: { ...process.env } }, (error, stdout, stderr) => {
       if (error || stderr && !ignoreWarning) {
         console.error(cmd, error, stderr);
         reject(`执行命令时出错: ${(error == null ? void 0 : error.message) || stderr}`);
@@ -132,6 +147,7 @@ async function getCommitInfo(command, mode, page, deployTo) {
     console.error("正式环境部署需要先将代码同步到服务器！".red, `发现 ${unCommitChanges} 个 commit 差异`.red);
     process.exit(1);
   }
+  await execCmd("git pull", true);
   const [currentCommit, lastDeployTag] = await Promise.all([getCommitHash(), getLastDeployTag(deployTo)]);
   const commitLogs = await getCommitLogs(currentCommit, lastDeployTag, page || "./");
   return { hash: currentCommit, logs: commitLogs };
@@ -216,16 +232,16 @@ async function submitAllDeletionChanges(message) {
 }
 export {
   getCommitInfo as a,
-  addProjectToWorkspace as b,
+  getMonorepoRoot as b,
   createPageDeployTag as c,
-  copyTemplate as d,
-  getProjects as e,
-  getTemplates as f,
+  addProjectToWorkspace as d,
+  copyTemplate as e,
+  getProjects as f,
   getNowTime as g,
-  checkGitStatusBeforeDestory as h,
-  createBackupTag as i,
-  removeProjectFromWorkspace as j,
+  getTemplates as h,
+  checkGitStatusBeforeDestory as i,
+  createBackupTag as j,
   getRepos as k,
-  root as r,
+  removeProjectFromWorkspace as r,
   submitAllDeletionChanges as s
 };

package/dist/index.js

@@ -7,7 +7,7 @@ import vue from "@vitejs/plugin-vue";
 import vueDevTools from "vite-plugin-vue-devtools";
 import { existsSync, readFileSync } from "fs";
 import "colors";
-import { g as getNowTime, a as getCommitInfo, c as createPageDeployTag } from "./git-BbsLu9cn.js";
+import { g as getNowTime, a as getCommitInfo, c as createPageDeployTag } from "./git-C3gyPvsT.js";
 import skipFormatting from "@vue/eslint-config-prettier/skip-formatting";
 import { vueTsConfigs, defineConfigWithVueTs } from "@vue/eslint-config-typescript";
 import { flatConfigs } from "eslint-plugin-import";
@@ -143,8 +143,8 @@ function definePageBuildConfig(option) {
             "safari>=8",
             "iOS>=8"
           ],
-          // 提高现代版本的要求防止某些杂牌浏览器的问题
-          modernTargets: "edge>=131, firefox>=67, chrome>=72, safari>=12, chromeAndroid>=72, iOS>=12",
+          // 提高现代版本的要求以满足一些特性使用，比如 [Promise.allSettled](https://caniuse.com/?search=allSettled)
+          modernTargets: "edge>=131, firefox>=67, chrome>=76, chromeAndroid>=76, safari>=13, iOS>=13",
           // https://github.com/vitejs/vite/blob/main/packages/plugin-legacy/src/index.ts#L170
           // https://unpkg.com/browse/core-js@3.41.0/
           additionalLegacyPolyfills: [
@@ -153,7 +153,8 @@ function definePageBuildConfig(option) {
             "core-js/es/global-this",
             "core-js/es/promise",
             "core-js/es/symbol"
-          ]
+          ],
+          additionalModernPolyfills: ["core-js/es/symbol"]
         }),
         htmlInjectPlugin({
           BUILD_TIME: envs.stamp,
@@ -207,7 +208,7 @@ function definePageBuildConfig(option) {
   });
 }
 function defineAppBuildConfig(option) {
-  return defineConfig(async function() {
+  return defineConfig(function() {
     const { plugins = [], build = {}, resolve = {}, ...optionReset } = option || {};
     const { alias, ...resolveReset } = resolve || {};
     return {
@@ -261,10 +262,7 @@ const importOrderRuleConfig = {
     }
   ],
   distinctGroup: true,
-  sortTypesGroup: true,
   "newlines-between": "always",
-  "newlines-between-types": "never",
-  name: true,
   alphabetize: {
     order: "asc",
     caseInsensitive: true
@@ -274,7 +272,7 @@ const importEslintConfig = [
   flatConfigs.recommended,
   {
     rules: {
-      "import/no-deprecated": "on",
+      "import/no-deprecated": "error",
       "import/no-unresolved": "off",
       "import/named": "off",
       "import/namespace": "off",

package/dist/node.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 import fs from "fs-extra";
 import inquirer from "inquirer";
 import ora from "ora";
-import { r as root, b as addProjectToWorkspace, d as copyTemplate, e as getProjects, f as getTemplates, h as checkGitStatusBeforeDestory, i as createBackupTag, j as removeProjectFromWorkspace, s as submitAllDeletionChanges, k as getRepos } from "./git-BbsLu9cn.js";
+import { b as getMonorepoRoot, d as addProjectToWorkspace, e as copyTemplate, f as getProjects, h as getTemplates, i as checkGitStatusBeforeDestory, j as createBackupTag, r as removeProjectFromWorkspace, s as submitAllDeletionChanges, k as getRepos } from "./git-C3gyPvsT.js";
 const commitRE = /^(?:revert: )?(?:feat|fix|docs|style|refactor|test|build|chore|debug|tweak|improve)(?:\(.+\))?: .{1,100}/;
 function checkCommit() {
   const msgPath = process.argv[2];
@@ -130,6 +130,7 @@ async function startCreateJob$1(target) {
   }
 }
 async function createProject() {
+  const root = await getMonorepoRoot();
   const questions = await initProjectQuestions$1();
   const answers = await inquirer.prompt(questions);
   const spinner = ora("正在创建项目...").start();
@@ -140,6 +141,7 @@ async function createProject() {
   spinner.succeed("项目创建成功！".green);
 }
 async function createRepo() {
+  const root = await getMonorepoRoot();
   const questions = await initRepoQuestions$1();
   const answers = await inquirer.prompt(questions);
   const spinner = ora("正在创建仓库...").start();
@@ -199,6 +201,7 @@ async function initProjectQuestions() {
   ];
 }
 async function destroyProject() {
+  const root = await getMonorepoRoot();
   await checkGitStatusBeforeDestory();
   const questions = await initProjectQuestions();
   const answers = await inquirer.prompt(questions);
@@ -255,6 +258,7 @@ async function initRepoQuestions() {
   ];
 }
 async function destroyRepo() {
+  const root = await getMonorepoRoot();
   await checkGitStatusBeforeDestory();
   const questions = await initRepoQuestions();
   const answers = await inquirer.prompt(questions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/scripts",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "scripts for seayoo web monorepos",
   "type": "module",
   "source": "index.ts",
@@ -60,13 +60,15 @@
     "stylelint": "^16.15.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-standard": "^37.0.0",
+    "vite": "^6.2.1",
     "@seayoo-web/tsconfig": "^1.0.3"
   },
   "peerDependencies": {
     "eslint": "^9.19.0",
     "stylelint": "^16.14.1",
     "stylelint-config-recess-order": "^6.0.0",
-    "stylelint-config-standard": "^37.0.0"
+    "stylelint-config-standard": "^37.0.0",
+    "vite": "^6.2.1"
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",

package/types/src/eslint.d.ts

@@ -11,10 +11,7 @@ export declare const importOrderRuleConfig: {
         group: string;
     }[];
     distinctGroup: boolean;
-    sortTypesGroup: boolean;
     "newlines-between": string;
-    "newlines-between-types": string;
-    name: boolean;
     alphabetize: {
         order: string;
         caseInsensitive: boolean;

package/types/src/utils.d.ts

@@ -3,10 +3,7 @@ import "colors";
 export declare const TemplateDir = "template";
 /** 内部模块目录 */
 export declare const InternalDir = "internal";
-/**
- * monorepo 项目根目录
- */
-export declare const root: string;
+export declare function getMonorepoRoot(ignoreMissing?: boolean): Promise<string>;
 /**
  * 读取所有模板项目信息
  */

package/types/src/vite.app.d.ts

@@ -2,4 +2,4 @@ import { type UserConfig } from "vite";
 /**
  * 导出一个动态的配置工厂函数
  */
-export declare function defineAppBuildConfig(option?: UserConfig): import("vite").UserConfigFnPromise;
+export declare function defineAppBuildConfig(option?: UserConfig): import("vite").UserConfigFnObject;