@farris/cli 2.3.2 → 2.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/add-app.js +1 -1
- package/lib/commands/add-app.js.map +1 -1
- package/lib/commands/add-lib.js +1 -1
- package/lib/commands/add-lib.js.map +1 -1
- package/lib/commands/add-project.js +2 -2
- package/lib/commands/add-project.js.map +1 -1
- package/lib/commands/build-components.js +4 -1
- package/lib/commands/build-components.js.map +1 -1
- package/lib/commands/create.js +8 -9
- package/lib/commands/create.js.map +1 -1
- package/lib/commands/dev-serve.js +1 -1
- package/lib/commands/dev-serve.js.map +1 -1
- package/lib/common/get-vite-config.js +64 -2
- package/lib/common/get-vite-config.js.map +1 -1
- package/lib/common/project-layout.js +53 -12
- package/lib/common/project-layout.js.map +1 -1
- package/lib/common/safety.js +4 -4
- package/lib/common/safety.js.map +1 -1
- package/lib/common/verifier.js +21 -14
- package/lib/common/verifier.js.map +1 -1
- package/lib/common/workspace-contract.js +28 -3
- package/lib/common/workspace-contract.js.map +1 -1
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/plugins/mock.js +293 -0
- package/lib/plugins/mock.js.map +1 -0
- package/package.json +1 -1
- package/templates/create/AGENTS.md +28 -4
- package/templates/create/README.md +2 -0
- package/templates/lib/components/index.ts +3 -10
- package/templates/lib/src/App.vue +2 -4
- package/templates/lib/test/index.spec.ts +9 -0
- package/templates/lib/test/index.spec.tsx +9 -0
- package/templates/mobile/farris.config.mjs +7 -1
- package/templates/mobile/mock/README.md +34 -0
- package/templates/mobile/src/App.tsx +21 -0
- package/templates/mobile/src/components/TheButton.tsx +9 -0
- package/templates/mobile/src/main.ts +1 -1
- package/templates/mobile/src/router/index.ts +2 -2
- package/templates/mobile/src/views/AboutView.tsx +12 -0
- package/templates/mobile/src/views/HomeView.tsx +13 -0
- package/templates/mobile/test/src/components/TheButton.spec.ts +2 -2
- package/templates/mobile/test/src/components/TheButton.spec.tsx +2 -2
- package/templates/web/farris.config.mjs +7 -1
- package/templates/web/mock/README.md +34 -0
- package/templates/web/src/App.tsx +25 -0
- package/templates/web/src/components/TheButton.tsx +9 -0
- package/templates/web/src/main.ts +1 -1
- package/templates/web/src/router/index.ts +2 -2
- package/templates/web/src/views/AboutView.tsx +12 -0
- package/templates/web/src/views/HomeView.tsx +13 -0
- package/templates/web/test/src/components/TheButton.spec.ts +2 -2
- package/templates/web/test/src/components/TheButton.spec.tsx +2 -2
- package/templates/lib/components/button/index.ts +0 -7
- package/templates/lib/components/button/src/button.scss +0 -10
- package/templates/lib/components/button/src/button.vue +0 -12
- package/templates/lib/test/components/button/button.spec.ts +0 -11
- package/templates/lib/test/components/button/button.spec.tsx +0 -11
- package/templates/mobile/src/App.vue +0 -80
- package/templates/mobile/src/components/TheButton.vue +0 -3
- package/templates/mobile/src/views/AboutView.vue +0 -15
- package/templates/mobile/src/views/HomeView.vue +0 -9
- package/templates/web/src/App.vue +0 -84
- package/templates/web/src/components/TheButton.vue +0 -3
- package/templates/web/src/views/AboutView.vue +0 -15
- package/templates/web/src/views/HomeView.vue +0 -9
package/lib/commands/add-app.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../src/commands/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE
|
|
1
|
+
{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../src/commands/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,8CAA8C;AAC9C,MAAM,UAAU,MAAM,CAAC,IAAa,EAAE,UAA6B,EAAE;IACnE,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
package/lib/commands/add-lib.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-lib.js","sourceRoot":"","sources":["../../src/commands/add-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,
|
|
1
|
+
{"version":3,"file":"add-lib.js","sourceRoot":"","sources":["../../src/commands/add-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AAItE,2CAA2C;AAC3C,MAAM,UAAU,MAAM,CAAC,IAAa,EAAE,UAA6B,EAAE;IACnE,OAAO,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { applyCatalogDeps } from '../common/apply-catalog-deps.js';
|
|
|
6
6
|
import { CreateAppError } from '../common/create-app-target.js';
|
|
7
7
|
import { checkPlannedConflicts } from '../common/safety.js';
|
|
8
8
|
import { refreshAgentsProjectList } from '../common/agents-doc.js';
|
|
9
|
-
import {
|
|
9
|
+
import { deriveAppDir, findWorkspaceRoot, listProjects, validatePackageName, writableContainerFor } from '../common/project-layout.js';
|
|
10
10
|
import { resolveTemplate, getTemplateDir } from '../common/template-manifest.js';
|
|
11
11
|
import { appTemplateFilter, buildTemplateVariables } from '../common/generate-app.js';
|
|
12
12
|
import { collectTemplateOutputPaths, renderTemplateDir } from '../common/template-renderer.js';
|
|
@@ -73,7 +73,7 @@ export async function addProject(type, nameArg, options = {}) {
|
|
|
73
73
|
if (!dir || !/^[a-z0-9-_]+$/.test(dir)) {
|
|
74
74
|
throw new CreateAppError(`无法从工程名 "${name}" 推导出合法的子目录名`);
|
|
75
75
|
}
|
|
76
|
-
const projectRel = `${
|
|
76
|
+
const projectRel = `${writableContainerFor(wsRoot, type)}/${dir}`;
|
|
77
77
|
const projectTargetDir = join(wsRoot, projectRel);
|
|
78
78
|
if (existsSync(projectTargetDir)) {
|
|
79
79
|
throw new CreateAppError(`工程目录已存在: ${projectRel}`, ExitCode.TARGET_CONFLICT);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../src/commands/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjG,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../src/commands/add-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,10 @@ export async function buildComponents(options) {
|
|
|
10
10
|
const farris = await getFarrisConfigAsync(options.configFile);
|
|
11
11
|
const names = listLibComponents(process.cwd(), farris.excludeComponents);
|
|
12
12
|
if (names.length === 0) {
|
|
13
|
-
|
|
13
|
+
// 空组件仓库:暂无可构建的组件,构建视为成功(产物为空),不报错。
|
|
14
|
+
// 否则 `farris-cli add-lib` 新建的空仓库 `pnpm build` 会默认失败。
|
|
15
|
+
console.log('暂无可构建的组件(components/*/index.ts),跳过构建。');
|
|
16
|
+
return;
|
|
14
17
|
}
|
|
15
18
|
const componentOutDir = farris.componentOutDir || './package/components';
|
|
16
19
|
const outDir = farris.outDir || 'lib';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-components.js","sourceRoot":"","sources":["../../src/commands/build-components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAsB,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA2B;IAC/D,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,
|
|
1
|
+
{"version":3,"file":"build-components.js","sourceRoot":"","sources":["../../src/commands/build-components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAsB,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA2B;IAC/D,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACzE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,mCAAmC;QACnC,qDAAqD;QACrD,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,sBAAsB,CAAC;IACzE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC;IAEtC,kCAAkC;IAClC,iDAAiD;IACjD,iEAAiE;IACjE,oBAAoB;IACpB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnE,yEAAyE;IACzE,wCAAwC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAC9B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,IAAI,WAAW,CAAC,CAAC,CAC3D,CAAC;IAEF,MAAM,OAAO,GAAG,GAAG,CAAC,wBAAwB,CAAC,CAAC,KAAK,EAAE,CAAC;IACtD,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC;IAErC,MAAM,WAAW,CAAC;QAChB,GAAG,OAAO;QACV,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACN,SAAS,EAAE,EAAE;YACb,KAAK,EAAE;gBACL,WAAW,EAAE,KAAK;gBAClB,GAAG,EAAE,EAAE,KAAK,EAAE;gBACd,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;aACtC;SACF;KACF,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACrB,SAAS;SACV;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,MAAM,QAAQ,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACxB;IAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1C,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,aAAa,CACX,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,EAClC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAC/D,CAAC;KACH;IAED,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAC9C,CAAC"}
|
package/lib/commands/create.js
CHANGED
|
@@ -9,7 +9,7 @@ import { CreateAppError } from '../common/create-app-target.js';
|
|
|
9
9
|
import { generateApp } from '../common/generate-app.js';
|
|
10
10
|
import { fail, printNextSteps, printSuccess, sendJson, setJsonMode } from '../common/output.js';
|
|
11
11
|
import { PROJECT_CONTAINERS, containerFor, deriveAppDir } from '../common/project-layout.js';
|
|
12
|
-
import { renderCommandTable, renderProjectList } from '../common/workspace-contract.js';
|
|
12
|
+
import { renderCommandTable, renderProjectList, renderProjectOverview } from '../common/workspace-contract.js';
|
|
13
13
|
import { ALLOWED_TYPES, DEFAULT_APP_FORMAT, DEFAULT_LIB_FORMATS, resolvePackageName } from './create-app-options.js';
|
|
14
14
|
export { parseCreateArgv } from './create-options.js';
|
|
15
15
|
const DEFAULT_WORKSPACE = 'my-workspace';
|
|
@@ -180,6 +180,7 @@ function scaffoldWorkspaceRoot(targetPath, context) {
|
|
|
180
180
|
appContainer: PROJECT_CONTAINERS.app,
|
|
181
181
|
libContainer: PROJECT_CONTAINERS.lib,
|
|
182
182
|
commandTable: renderCommandTable(),
|
|
183
|
+
projectOverview: renderProjectOverview(context.workspaceTitle),
|
|
183
184
|
projectList: renderProjectList(context.plannedProjects),
|
|
184
185
|
title: context.workspaceTitle
|
|
185
186
|
}
|
|
@@ -187,14 +188,12 @@ function scaffoldWorkspaceRoot(targetPath, context) {
|
|
|
187
188
|
if (rootRender.unreplacedPlaceholders.length > 0) {
|
|
188
189
|
throw new Error(`根模板未替换: ${rootRender.unreplacedPlaceholders.map((p) => p.placeholder).join(', ')}`);
|
|
189
190
|
}
|
|
190
|
-
//
|
|
191
|
-
//
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
writeFileSync(join(containerDir, '.gitkeep'), '');
|
|
197
|
-
}
|
|
191
|
+
// 容器按需创建:只建「真的有工程」的那一类,空容器目录不出现。
|
|
192
|
+
// 另一类在首次 add-app / add-lib 时自动生成;pnpm 的 `container/*` glob 在目录不存在时
|
|
193
|
+
// 只是匹配为空,不影响安装,因此无需 .gitkeep 占位。
|
|
194
|
+
const containers = new Set(context.plannedProjects.map((project) => containerFor(project.type)));
|
|
195
|
+
for (const container of containers) {
|
|
196
|
+
mkdirSync(join(targetPath, container), { recursive: true });
|
|
198
197
|
}
|
|
199
198
|
}
|
|
200
199
|
/** 渲染子工程模板、去掉子工程内的 CI 文件并把可入 catalog 的依赖改写为 catalog:。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { createServer, mergeConfig } from 'vite';
|
|
|
2
2
|
import { getViteConfig } from '../common/get-vite-config.js';
|
|
3
3
|
export const devServe = async (options) => {
|
|
4
4
|
const { port = 1337, host = true } = options;
|
|
5
|
-
const config = await getViteConfig();
|
|
5
|
+
const config = await getViteConfig('app', undefined, { mock: options.mock });
|
|
6
6
|
const devConfig = mergeConfig(config, {
|
|
7
7
|
configFile: false,
|
|
8
8
|
mode: 'dev',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-serve.js","sourceRoot":"","sources":["../../src/commands/dev-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-serve.js","sourceRoot":"","sources":["../../src/commands/dev-serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAQ7D,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAqB,EAAE,EAAE;IACtD,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAE7C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7E,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE;QACpC,UAAU,EAAE,KAAK;QACjB,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACN,IAAI;YACJ,IAAI;YACJ,GAAG,EAAE,IAAI;SACV;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;IAEtB,MAAM,CAAC,SAAS,EAAE,CAAC;AACrB,CAAC,CAAC"}
|
|
@@ -4,6 +4,50 @@ import { getDependencies } from '../common/get-dependencies.js';
|
|
|
4
4
|
import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
|
|
5
5
|
import { logWarn } from './output.js';
|
|
6
6
|
import { ALLOWED_APP_FORMATS, CWD } from './constant.js';
|
|
7
|
+
import { farrisMockPlugin } from '../plugins/mock.js';
|
|
8
|
+
/**
|
|
9
|
+
* 解析 mock 开关与参数。
|
|
10
|
+
* 优先级:命令行参数(--no-mock)> 环境变量(MOCK=none)> farris.config.mjs 的 mock 键。
|
|
11
|
+
*/
|
|
12
|
+
export function resolveMockOptions(mock, cliOptions = {}, env = process.env) {
|
|
13
|
+
const detailed = mock && typeof mock === 'object' ? mock : {};
|
|
14
|
+
let enabled = typeof mock === 'boolean' ? mock : detailed.enable !== false;
|
|
15
|
+
if (env.MOCK === 'none') {
|
|
16
|
+
enabled = false;
|
|
17
|
+
}
|
|
18
|
+
if (cliOptions.mock === false) {
|
|
19
|
+
enabled = false;
|
|
20
|
+
}
|
|
21
|
+
return {
|
|
22
|
+
enabled,
|
|
23
|
+
dir: detailed.dir ?? 'mock',
|
|
24
|
+
timeout: detailed.timeout ?? 0,
|
|
25
|
+
apiPrefixes: detailed.apiPrefixes ?? ['/api']
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 校验多来源代理配置没有同键冲突:同一前缀只允许配置在一处
|
|
30
|
+
*/
|
|
31
|
+
export function assertProxyKeysDisjoint(sources) {
|
|
32
|
+
const owners = new Map();
|
|
33
|
+
const conflicts = [];
|
|
34
|
+
for (const source of sources) {
|
|
35
|
+
for (const key of Object.keys(source.proxy ?? {})) {
|
|
36
|
+
const previous = owners.get(key);
|
|
37
|
+
if (previous && previous !== source.name) {
|
|
38
|
+
conflicts.push({ key, names: [previous, source.name] });
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
owners.set(key, source.name);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (conflicts.length > 0) {
|
|
46
|
+
throw new Error(`代理配置冲突:${conflicts
|
|
47
|
+
.map((item) => `${item.key}(${item.names.join(' 与 ')})`)
|
|
48
|
+
.join(';')}。同一前缀只能配置在一处:farris.config.mjs 的 proxy 键、server.proxy 或 viteConfig.server.proxy。`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
7
51
|
/**
|
|
8
52
|
* 解析有效 Base 及其来源
|
|
9
53
|
*/
|
|
@@ -45,7 +89,7 @@ export function validateBaseAndRouterMode(base, routerMode) {
|
|
|
45
89
|
}
|
|
46
90
|
export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
47
91
|
const isApp = type === 'app';
|
|
48
|
-
const { lib, format: configFormat, target, minify = true, outDir: configOutDir, externals = { include: [], exclude: [] }, externalDependencies, plugins = [], alias, server, cssInjected, packageName = '@farris/mobile-ui-vue', base: configBase, publicPath: configPublicPath, routerMode } = farrisConfig;
|
|
92
|
+
const { lib, format: configFormat, target, minify = true, outDir: configOutDir, externals = { include: [], exclude: [] }, externalDependencies, plugins = [], alias, server, proxy, mock, cssInjected, packageName = '@farris/mobile-ui-vue', base: configBase, publicPath: configPublicPath, routerMode } = farrisConfig;
|
|
49
93
|
// CLI 参数覆盖(仅 app):--format / --outDir
|
|
50
94
|
if (isApp && cliOptions.format != null) {
|
|
51
95
|
if (typeof cliOptions.format !== 'string' ||
|
|
@@ -66,6 +110,14 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
66
110
|
if (type === 'app') {
|
|
67
111
|
validateBaseAndRouterMode(effectiveBase, routerMode);
|
|
68
112
|
}
|
|
113
|
+
// proxy 一等键与 server.proxy 合并;同一前缀冲突时报错,不做静默合并
|
|
114
|
+
assertProxyKeysDisjoint([
|
|
115
|
+
{ name: '`proxy` 键', proxy },
|
|
116
|
+
{ name: '`server.proxy`', proxy: server?.proxy }
|
|
117
|
+
]);
|
|
118
|
+
const resolvedServer = proxy || server?.proxy
|
|
119
|
+
? { ...server, proxy: { ...(server?.proxy ?? {}), ...(proxy ?? {}) } }
|
|
120
|
+
: server;
|
|
69
121
|
const dependencies = externalDependencies ? getDependencies() : [];
|
|
70
122
|
let external = externals.include ? [...externals.include, ...dependencies] : dependencies;
|
|
71
123
|
external = external.filter((item) => !externals.exclude?.includes(item));
|
|
@@ -78,6 +130,8 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
78
130
|
if (cssInjected) {
|
|
79
131
|
plugins.push(cssInjectedByJsPlugin());
|
|
80
132
|
}
|
|
133
|
+
// 开发期 mock 中间件:apply: 'serve' 只在 dev server 生效,构建产物不受影响
|
|
134
|
+
plugins.push(farrisMockPlugin(resolveMockOptions(mock, cliOptions)));
|
|
81
135
|
if (packageName) {
|
|
82
136
|
process.env.PackageName = packageName;
|
|
83
137
|
}
|
|
@@ -109,7 +163,7 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
109
163
|
},
|
|
110
164
|
outDir
|
|
111
165
|
},
|
|
112
|
-
server,
|
|
166
|
+
server: resolvedServer,
|
|
113
167
|
plugins,
|
|
114
168
|
resolve: {
|
|
115
169
|
alias
|
|
@@ -119,6 +173,14 @@ export const formatFarrisConfig = (farrisConfig, type, cliOptions = {}) => {
|
|
|
119
173
|
};
|
|
120
174
|
const formatViteConfig = async (type, configFile, cliOptions = {}) => {
|
|
121
175
|
const { viteConfig = {}, ...farrisConfig } = await getFarrisConfigAsync(configFile);
|
|
176
|
+
// 一等键与 viteConfig 之间的代理同键冲突校验,同一前缀只允许配置在一处
|
|
177
|
+
assertProxyKeysDisjoint([
|
|
178
|
+
{
|
|
179
|
+
name: 'farris.config.mjs',
|
|
180
|
+
proxy: { ...(farrisConfig.proxy ?? {}), ...(farrisConfig.server?.proxy ?? {}) }
|
|
181
|
+
},
|
|
182
|
+
{ name: 'viteConfig.server.proxy', proxy: viteConfig?.server?.proxy }
|
|
183
|
+
]);
|
|
122
184
|
const customViteConfig = formatFarrisConfig(farrisConfig, type, cliOptions);
|
|
123
185
|
return mergeConfig(customViteConfig, viteConfig);
|
|
124
186
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-vite-config.js","sourceRoot":"","sources":["../../src/common/get-vite-config.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"get-vite-config.js","sourceRoot":"","sources":["../../src/common/get-vite-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4D,WAAW,EAAiB,OAAO,EAAE,MAAM,MAAM,CAAC;AACrH,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,qBAAqB,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAoDtD;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAA4B,EAC5B,aAA+B,EAAE,EACjC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,QAAQ,GAAG,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,IAAI,OAAO,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,KAAK,CAAC;IAC3E,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;QACvB,OAAO,GAAG,KAAK,CAAC;KACjB;IACD,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE;QAC7B,OAAO,GAAG,KAAK,CAAC;KACjB;IACD,OAAO;QACL,OAAO;QACP,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,MAAM;QAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,CAAC;QAC9B,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAiE;IAEjE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,MAAM,SAAS,GAA4C,EAAE,CAAC;IAC9D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE;YACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,QAAQ,IAAI,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE;gBACxC,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACzD;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;aAC9B;SACF;KACF;IACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,UAAU,SAAS;aAChB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aACvD,IAAI,CAAC,GAAG,CAAC,kFAAkF,CAC/F,CAAC;KACH;AACH,CAAC;AAOD;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAMpC;IACC,MAAM,EAAE,OAAO,EAAE,IAAI,GAAG,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1F,gBAAgB;IAChB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE;QAC3C,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;KACtD;IAED,uDAAuD;IACvD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAC/D,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,EAAE;QAC3C,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;KACtD;IAED,4BAA4B;IAC5B,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,EAAE,EAAE;QACjD,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,OAAO,CAAC,4EAA4E,CAAC,CAAC;SACvF;QACD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;KACjE;IAED,yCAAyC;IACzC,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,EAAE,EAAE;QAC7D,OAAO,CAAC,4DAA4D,CAAC,CAAC;QACtE,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC;KAC7E;IAED,WAAW;IACX,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAAY,EAAE,UAAmB;IACzE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IAClI,IAAI,UAAU,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,wGAAwG,CAC1I,CAAC;KACH;AACH,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,YAA0B,EAAE,IAAY,EAAE,aAA+B,EAAE,EAAE,EAAE;IAChH,MAAM,KAAK,GAAG,IAAI,KAAK,KAAK,CAAC;IAC7B,MAAM,EACJ,GAAG,EACH,MAAM,EAAE,YAAY,EACpB,MAAM,EACN,MAAM,GAAG,IAAI,EACb,MAAM,EAAE,YAAY,EACpB,SAAS,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EACxC,oBAAoB,EACpB,OAAO,GAAG,EAAE,EACZ,KAAK,EACL,MAAM,EACN,KAAK,EACL,IAAI,EACJ,WAAW,EACX,WAAW,GAAG,uBAAuB,EACrC,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EACX,GAAG,YAAY,CAAC;IAEjB,sCAAsC;IACtC,IAAI,KAAK,IAAI,UAAU,CAAC,MAAM,IAAI,IAAI,EAAE;QACtC,IACE,OAAO,UAAU,CAAC,MAAM,KAAK,QAAQ;YACrC,CAAE,mBAAyC,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EACvE;YACA,MAAM,IAAI,KAAK,CACb,iBAAiB,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpF,CAAC;SACH;KACF;IACD,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC;IAC5D,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC;IAE5D,UAAU;IACV,MAAM,EAAE,aAAa,EAAE,GAAG,oBAAoB,CAAC;QAC7C,OAAO,EAAE,UAAU,CAAC,IAAI;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,UAAU;QACV,gBAAgB;KACjB,CAAC,CAAC;IAEH,uBAAuB;IACvB,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,yBAAyB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;KACtD;IAED,8CAA8C;IAC9C,uBAAuB,CAAC;QACtB,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE;QAC5B,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;KACjD,CAAC,CAAC;IACH,MAAM,cAAc,GAClB,KAAK,IAAI,MAAM,EAAE,KAAK;QACpB,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE;QACtE,CAAC,CAAC,MAAM,CAAC;IAEb,MAAM,YAAY,GAAG,oBAAoB,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,IAAI,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IAC1F,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAE,GAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9D,IAAI,cAAc,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,cAAwB,CAAC;KACtD;IAED,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;KACvC;IACD,wDAAwD;IACxD,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,WAAW,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;KACvC;IAED,sCAAsC;IACtC,MAAM,YAAY,GAAG,cAAc,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC;IAE/E,qBAAqB;IACrB,yEAAyE;IACzE,MAAM,SAAS,GAAG,KAAK,IAAI,YAAY,KAAK,MAAM,CAAC;IACnD,MAAM,YAAY,GAA4B,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAC5F,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE;YAC1B,MAAM,EAAE,MAAM;YACd,oBAAoB,EAAE,IAAI;YAC1B,cAAc,EAAE,UAAU;YAC1B,cAAc,EAAE,WAAW;YAC3B,cAAc,EAAE,qBAAqB;YACrC,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;KACJ;IAED,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE;YACL,MAAM;YACN,MAAM;YACN,GAAG,EAAE,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;YACrC,aAAa,EAAE;gBACb,MAAM,EAAE,YAAY;gBACpB,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ;aACnE;YACD,MAAM;SACP;QACD,MAAM,EAAE,cAAc;QACtB,OAAO;QACP,OAAO,EAAE;YACP,KAAK;SACN;KACF,CAAC;IACF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,EAAE,IAAY,EAAE,UAAmB,EAAE,aAA+B,EAAE,EAAE,EAAE;IACtG,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,YAAY,EAAE,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAEpF,2CAA2C;IAC3C,uBAAuB,CAAC;QACtB;YACE,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;SAChF;QACD,EAAE,IAAI,EAAE,yBAAyB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE;KACtE,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAE5E,OAAO,WAAW,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,UAAmB,EAAE,aAA+B,EAAE,EAAE,EAAE;IACnG,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACxE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,CAAC;IAEjF,OAAO,WAAW,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AACpD,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -1,15 +1,57 @@
|
|
|
1
1
|
import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
|
|
2
2
|
import { dirname, join, resolve } from 'node:path';
|
|
3
|
-
/** 新结构容器:app →
|
|
4
|
-
export const PROJECT_CONTAINERS = { app: '
|
|
5
|
-
/**
|
|
3
|
+
/** 新结构容器:app → application,lib → library。全仓库唯一来源(写入只用它)。 */
|
|
4
|
+
export const PROJECT_CONTAINERS = { app: 'application', lib: 'library' };
|
|
5
|
+
/**
|
|
6
|
+
* 分层容器的历史别名:`@farris/cli@2.3.2` 曾发布过复数命名 `applications` / `libraries`,
|
|
7
|
+
* 已按该命名生成的 workspace 必须继续可读可校验,因此保留为只读别名(不再写入)。
|
|
8
|
+
*/
|
|
9
|
+
export const LAYERED_CONTAINER_ALIASES = {
|
|
10
|
+
app: ['applications'],
|
|
11
|
+
lib: ['libraries']
|
|
12
|
+
};
|
|
13
|
+
/** 旧平铺结构容器:只读兼容识别,不再写入。 */
|
|
6
14
|
export const LEGACY_CONTAINERS = ['packages'];
|
|
15
|
+
/** 读取与校验可接受的容器命名:当前规范在前,历史别名在后。 */
|
|
16
|
+
export function containerAliases(type) {
|
|
17
|
+
return [PROJECT_CONTAINERS[type], ...LAYERED_CONTAINER_ALIASES[type]];
|
|
18
|
+
}
|
|
19
|
+
/** 分层布局的全部可识别容器命名(当前规范 + 历史别名)。 */
|
|
20
|
+
export const LAYERED_CONTAINERS = [
|
|
21
|
+
...Object.values(PROJECT_CONTAINERS),
|
|
22
|
+
...LAYERED_CONTAINER_ALIASES.app,
|
|
23
|
+
...LAYERED_CONTAINER_ALIASES.lib
|
|
24
|
+
];
|
|
25
|
+
/** 容器命名 → 工程类型;非分层容器(如 `packages`)返回 null,由调用方按工程证据推断。 */
|
|
26
|
+
export function containerType(container) {
|
|
27
|
+
if (containerAliases('app').includes(container)) {
|
|
28
|
+
return 'app';
|
|
29
|
+
}
|
|
30
|
+
if (containerAliases('lib').includes(container)) {
|
|
31
|
+
return 'lib';
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
7
35
|
export function containerFor(type) {
|
|
8
36
|
return PROJECT_CONTAINERS[type];
|
|
9
37
|
}
|
|
10
38
|
export function resolveProjectPath(wsRoot, type, dir) {
|
|
11
39
|
return join(wsRoot, containerFor(type), dir);
|
|
12
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* `add-app` / `add-lib` 的写入容器:workspace 已声明同类型容器 glob 时沿用它(含历史复数别名),
|
|
43
|
+
* 否则用当前规范命名。否则在旧命名的 workspace 内会写出**不在 pnpm glob 范围内**的工程。
|
|
44
|
+
*/
|
|
45
|
+
export function writableContainerFor(wsRoot, type) {
|
|
46
|
+
const { globs, fallback } = readWorkspaceGlobs(wsRoot);
|
|
47
|
+
if (!fallback) {
|
|
48
|
+
const declared = containerAliases(type).find((container) => globs.some((glob) => glob === `${container}/*`));
|
|
49
|
+
if (declared) {
|
|
50
|
+
return declared;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return PROJECT_CONTAINERS[type];
|
|
54
|
+
}
|
|
13
55
|
/**
|
|
14
56
|
* 解析 pnpm-workspace.yaml 的 packages 列表。
|
|
15
57
|
* 只识别 `- "dir/*"` 形式,不引入 yaml 依赖;结构超出该形式时返回空数组,由调用方回退。
|
|
@@ -42,7 +84,7 @@ export function parsePackagesBlock(content) {
|
|
|
42
84
|
* 读出 workspace 的待扫描 glob。解析不到时回退到三个约定容器目录,并置 fallback=true。
|
|
43
85
|
*/
|
|
44
86
|
export function readWorkspaceGlobs(wsRoot) {
|
|
45
|
-
const convention = [...LEGACY_CONTAINERS, ...
|
|
87
|
+
const convention = [...LEGACY_CONTAINERS, ...LAYERED_CONTAINERS].map((container) => `${container}/*`);
|
|
46
88
|
const yamlPath = join(wsRoot, 'pnpm-workspace.yaml');
|
|
47
89
|
if (!existsSync(yamlPath)) {
|
|
48
90
|
return { globs: convention, fallback: true };
|
|
@@ -57,7 +99,8 @@ function detectLegacyType(projectDir) {
|
|
|
57
99
|
return existsSync(join(projectDir, 'components', 'index.ts')) ? 'lib' : 'app';
|
|
58
100
|
}
|
|
59
101
|
/**
|
|
60
|
-
* 扫描 workspace
|
|
102
|
+
* 扫描 workspace 内的工程:同时支持分层结构(`application` / `library`,含历史复数别名)
|
|
103
|
+
* 与旧平铺结构(`packages`)。
|
|
61
104
|
*/
|
|
62
105
|
export function listProjects(wsRoot) {
|
|
63
106
|
const { globs } = readWorkspaceGlobs(wsRoot);
|
|
@@ -83,25 +126,23 @@ export function listProjects(wsRoot) {
|
|
|
83
126
|
continue;
|
|
84
127
|
}
|
|
85
128
|
seen.add(dir);
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
: container === PROJECT_CONTAINERS.lib
|
|
89
|
-
? 'lib'
|
|
90
|
-
: detectLegacyType(projectDir);
|
|
129
|
+
// 分层容器按容器名定类型(含历史别名);旧平铺结构按工程证据推断。
|
|
130
|
+
const type = containerType(container) ?? detectLegacyType(projectDir);
|
|
91
131
|
entries.push({ type, dir, name });
|
|
92
132
|
}
|
|
93
133
|
}
|
|
94
134
|
return entries;
|
|
95
135
|
}
|
|
96
136
|
/**
|
|
97
|
-
* workspace
|
|
137
|
+
* workspace 是否已采用分层容器结构(当前规范命名或历史复数别名)。
|
|
138
|
+
* verifier 用它区分「新工作空间强校验」与「旧平铺工作空间只读兼容」。
|
|
98
139
|
*/
|
|
99
140
|
export function usesNewContainers(wsRoot) {
|
|
100
141
|
const { globs, fallback } = readWorkspaceGlobs(wsRoot);
|
|
101
142
|
if (fallback) {
|
|
102
143
|
return false;
|
|
103
144
|
}
|
|
104
|
-
return globs.some((glob) =>
|
|
145
|
+
return globs.some((glob) => LAYERED_CONTAINERS.some((container) => glob.startsWith(`${container}/`)));
|
|
105
146
|
}
|
|
106
147
|
/**
|
|
107
148
|
* 从包名推导目录名(去掉 scope 并转为合法 kebab-case)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-layout.js","sourceRoot":"","sources":["../../src/common/project-layout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEnD,
|
|
1
|
+
{"version":3,"file":"project-layout.js","sourceRoot":"","sources":["../../src/common/project-layout.ts"],"names":[],"mappings":"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"}
|
package/lib/common/safety.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync, lstatSync, readdirSync } from 'node:fs';
|
|
2
2
|
import { resolve } from 'node:path';
|
|
3
3
|
import { WorkspaceStatus } from './constant.js';
|
|
4
|
+
import { LAYERED_CONTAINERS, LEGACY_CONTAINERS } from './project-layout.js';
|
|
4
5
|
// 已知 AI 配置与项目元数据文件/目录(忽略列表)
|
|
5
6
|
export const KNOWN_AI_AND_META_ENTRIES = new Set([
|
|
6
7
|
'.git',
|
|
@@ -22,7 +23,7 @@ export const KNOWN_AI_AND_META_ENTRIES = new Set([
|
|
|
22
23
|
'.windsurfrules',
|
|
23
24
|
'.cursorrules'
|
|
24
25
|
]);
|
|
25
|
-
//
|
|
26
|
+
// 工程证据关键文件。容器目录名一律取自 project-layout,避免字面量漂移
|
|
26
27
|
export const PROJECT_EVIDENCE_FILES = [
|
|
27
28
|
'package.json',
|
|
28
29
|
'pnpm-workspace.yaml',
|
|
@@ -34,9 +35,8 @@ export const PROJECT_EVIDENCE_FILES = [
|
|
|
34
35
|
'farris.config.mjs',
|
|
35
36
|
'tsconfig.json',
|
|
36
37
|
'src',
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
'packages',
|
|
38
|
+
...LEGACY_CONTAINERS,
|
|
39
|
+
...LAYERED_CONTAINERS,
|
|
40
40
|
'node_modules'
|
|
41
41
|
];
|
|
42
42
|
/**
|
package/lib/common/safety.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../src/common/safety.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAmC,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../src/common/safety.ts"],"names":[],"mappings":"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"}
|