@flatjs/evolve 1.8.1-next.103 → 1.8.1-next.105

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @flatjs/evolve
 
+## 1.8.1-next.105
+
+### Patch Changes
+
+- 9be1d2d: expose `defineConfig` with correct typings export
+- Updated dependencies [9be1d2d]
+  - @flatjs/mock@1.8.1-next.79
+  - @flatjs/graph@1.8.1-next.55
+
+## 1.8.1-next.104
+
+### Patch Changes
+
+- 3a8aa0b: Add `graphTreeNodeFilter` allow customized filter wihile dynamic build
+- 9f098ad: Bump version
+- Updated dependencies [9f098ad]
+  - @flatjs/forge-postcss-plugin-pixel@1.8.1-next.37
+  - @flatjs/evolve-preset-babel@1.8.1-next.22
+  - @flatjs/common@1.8.1-next.37
+  - @flatjs/graph@1.8.1-next.54
+  - @flatjs/mock@1.8.1-next.78
+
 ## 1.8.1-next.103
 
 ### Patch Changes

package/dist/define-config/define-config.d.ts

@@ -21,4 +21,6 @@ export interface EvolveConfigBase extends ConfigEnvBase {
      */
     resolve: typeof requireResolve;
 }
-export declare const defineConfig: (userConfig: UserConfigExport<PartialDeep<FlatEvolveOptions>, EvolveConfigBase>) => UserConfigExport<import("type-fest/source/partial-deep.js").PartialObjectDeep<FlatEvolveOptions, {}>, EvolveConfigBase>;
+type DefineConfigFn = (userConfig: UserConfigExport<PartialDeep<FlatEvolveOptions>, EvolveConfigBase>) => UserConfigExport<PartialDeep<FlatEvolveOptions>, EvolveConfigBase>;
+export declare const defineConfig: DefineConfigFn;
+export {};

package/dist/main/start-build-dynamic.d.ts

@@ -2,7 +2,7 @@ import { type PartialDeep } from 'type-fest';
 import { type ConfigLoaderOptions } from '../load-config/load-evolve-config.js';
 import { type FlatEvolveOptions } from '../types/types-options.js';
 import { type EvolveBuildResult } from './start-one-entry-build.js';
-export declare function getBuildEntryFiles(projectCwd: string, diffFiles: string[], allEntryInputs: string[], resolveAlias?: Record<string, string>): Promise<string[]>;
+export declare function getBuildEntryFiles(projectCwd: string, diffFiles: string[], allEntryInputs: string[], resolveAlias?: Record<string, string>, graphTreeNodeFilter?: (moduleId: string) => boolean): Promise<string[]>;
 /**
  * Dynamic check which entry modules need to build.
  * @returns

package/dist/main/start-build-dynamic.js

@@ -1 +1 @@
-import{isAbsolute,join}from"node:path";import{getDiffFiles,getCommitIdOfBranch}from"@armit/git";import{createThreadPool}from"@armit/worker-threads";import{arraysIntersect,chalk,logger,requireResolve}from"@flatjs/common";import{traverseGraph}from"@flatjs/graph";import Listr from"listr";import{filterActivedEntriesByEntryInputs,filterActivedEntriesByModule}from"../helpers/filter-actived-entries.js";import{getGitRoot}from"../helpers/get-git-root.js";import{getMaxProcessTasks}from"../helpers/get-max-process-tasks.js";import{jsonSerializer}from"../helpers/json-serializer.js";import{resolveEntryMapInputFiles}from"../helpers/resolve-entry-map-input-files.js";import{loadEvolveConfig}from"../load-config/load-evolve-config.js";import{envVerify}from"./env-verify.js";import{getWorkerPath}from"./get-worker-path.js";export async function getBuildEntryFiles(e,t,r,i){const o=[],n=[];for(const e of r)t.includes(e)?o.push(e):n.push(e);if(n.length){const r=await traverseGraph({input:n,projectCwd:e,treeNodeFilter:()=>!0,lessImportOptions:{projectCwd:e,aliases:i}});if(!r)return o;logger.debug(`DependencyGraph:\n${JSON.stringify(r,null,2)}`);for(const e of n){const i=r[e]||[];arraysIntersect(i,t)&&o.push(e)}}return o}export async function dynamicCheckBuildEntryMap(e,t,r,i,o){const n={command:"build",resolve:requireResolve},s=await loadEvolveConfig(n,e,i,o);if(s.ci?.fixedBuildModules&&s.ci?.fixedBuildModules.length){logger.info("Use `fixedBuildModules` configuration to build...");return{buildEntries:filterActivedEntriesByModule(s.entryMap,s.ci?.fixedBuildModules),newEvolveOptions:s}}if(logger.info("Dynamicly checking code changed modules ..."),!t){const e=s.ci?.basedBranch||"origin/master";t=await getCommitIdOfBranch(e),logger.info(`Resolving base branch "${e}" commit hash "${t}" ...`)}let a=t?await getDiffFiles(t,r):[];const l=getGitRoot(e);if(!l)throw new Error(`No .git root (${e}) found`);if(a=a.map((e=>isAbsolute(e)?e:join(l,e))),logger.debug(`Diff files: \n${JSON.stringify(a,null,2)}`),!a.length)return logger.warn("It seems that there are no code files changed."),{buildEntries:{},newEvolveOptions:s};const c=await resolveEntryMapInputFiles(e,s.entryMap),d=await getBuildEntryFiles(e,a,c,s.webpack?.resolve?.alias);logger.debug(`To build entry files: \n${JSON.stringify(d,null,2)}`);return{buildEntries:await filterActivedEntriesByEntryInputs(e,s.entryMap,d),newEvolveOptions:s}}export const startDynamicBuild=async(e,t,r,i={},o)=>{const{buildEntries:n,newEvolveOptions:s}=await dynamicCheckBuildEntryMap(e,t,r,i,o);await envVerify(e,s);const a=Object.keys(n);if(!a.length)return logger.warn("No build entries providered!"),[];const l=getMaxProcessTasks(a.length,s.maxProcesses);logger.info(`Start dynamic build with (${chalk(["magenta"])(String(l))}) workers:\n${JSON.stringify({buildEntries:a},null,2)}`);const c=getWorkerPath(),d=await createThreadPool(c,{size:l}),f=new Listr([],{concurrent:l,exitOnError:!0}),g=[];for(const[t]of Object.entries(n))f.add({title:`Build module ${chalk(["magenta"])(t)} ...`,task:async()=>{const r=await d.startBuildWorker(e,t,jsonSerializer.stringify(i),o);g.push(r)}});return f.tasks.length&&await f.run(),d.pool.terminate(),g};
+import{isAbsolute,join}from"node:path";import{getDiffFiles,getCommitIdOfBranch}from"@armit/git";import{createThreadPool}from"@armit/worker-threads";import{arraysIntersect,chalk,logger,requireResolve}from"@flatjs/common";import{traverseGraph}from"@flatjs/graph";import Listr from"listr";import{moduleName}from"../constants.js";import{filterActivedEntriesByEntryInputs,filterActivedEntriesByModule}from"../helpers/filter-actived-entries.js";import{getGitRoot}from"../helpers/get-git-root.js";import{getMaxProcessTasks}from"../helpers/get-max-process-tasks.js";import{jsonSerializer}from"../helpers/json-serializer.js";import{resolveEntryMapInputFiles}from"../helpers/resolve-entry-map-input-files.js";import{loadEvolveConfig}from"../load-config/load-evolve-config.js";import{envVerify}from"./env-verify.js";import{getWorkerPath}from"./get-worker-path.js";export async function getBuildEntryFiles(e,t,r,i,o){const n=[],s=[];for(const e of r)t.includes(e)?n.push(e):s.push(e);if(o&&logger.info("Use custom graph traverse filter",moduleName),s.length){const r=await traverseGraph({input:s,projectCwd:e,treeNodeFilter:o||(()=>!0),lessImportOptions:{projectCwd:e,aliases:i}});if(!r)return n;logger.debug(`DependencyGraph:\n${JSON.stringify(r,null,2)}`);for(const e of s){const i=r[e]||[];arraysIntersect(i,t)&&n.push(e)}}return n}export async function dynamicCheckBuildEntryMap(e,t,r,i,o){const n={command:"build",resolve:requireResolve},s=await loadEvolveConfig(n,e,i,o);if(s.ci?.fixedBuildModules&&s.ci?.fixedBuildModules.length){logger.info("Use `fixedBuildModules` configuration to build...");return{buildEntries:filterActivedEntriesByModule(s.entryMap,s.ci?.fixedBuildModules),newEvolveOptions:s}}if(logger.info("Dynamicly checking code changed modules ..."),!t){const e=s.ci?.basedBranch||"origin/master";t=await getCommitIdOfBranch(e),logger.info(`Resolving base branch "${e}" commit hash "${t}" ...`)}let a=t?await getDiffFiles(t,r):[];const l=getGitRoot(e);if(!l)throw new Error(`No .git root (${e}) found`);if(a=a.map((e=>isAbsolute(e)?e:join(l,e))),logger.debug(`Diff files: \n${JSON.stringify(a,null,2)}`),!a.length)return logger.warn("It seems that there are no code files changed."),{buildEntries:{},newEvolveOptions:s};const c=await resolveEntryMapInputFiles(e,s.entryMap),d=await getBuildEntryFiles(e,a,c,s.webpack?.resolve?.alias,s.ci?.graphTreeNodeFilter);logger.debug(`To build entry files: \n${JSON.stringify(d,null,2)}`);return{buildEntries:await filterActivedEntriesByEntryInputs(e,s.entryMap,d),newEvolveOptions:s}}export const startDynamicBuild=async(e,t,r,i={},o)=>{const{buildEntries:n,newEvolveOptions:s}=await dynamicCheckBuildEntryMap(e,t,r,i,o);await envVerify(e,s);const a=Object.keys(n);if(!a.length)return logger.warn("No build entries providered!"),[];const l=getMaxProcessTasks(a.length,s.maxProcesses);logger.info(`Start dynamic build with (${chalk(["magenta"])(String(l))}) workers:\n${JSON.stringify({buildEntries:a},null,2)}`);const c=getWorkerPath(),d=await createThreadPool(c,{size:l}),f=new Listr([],{concurrent:l,exitOnError:!0}),g=[];for(const[t]of Object.entries(n))f.add({title:`Build module ${chalk(["magenta"])(t)} ...`,task:async()=>{const r=await d.startBuildWorker(e,t,jsonSerializer.stringify(i),o);g.push(r)}});return f.tasks.length&&await f.run(),d.pool.terminate(),g};

package/dist/types/types-ci.d.ts

@@ -5,6 +5,13 @@
  * 3. Normally build manually using (`flat build evolve -m "a;b"`)
  */
 export type FlatEvolveCI = {
+    /**
+     * A function used to determine if a module (also include root node) should be included in the dependency tree
+     * it should not work if you have `fixedBuildModules` definition.
+     * @param moduleId The imported module
+     * @default `() => true`
+     */
+    graphTreeNodeFilter?: (moduleId: string) => boolean;
     /**
      * The build module patterns, `Highest Priority First`
      * Support "a;b;c" RegExp pattern; `new RegExp(`${pattern}`).test(entryKey)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatjs/evolve",
-  "version": "1.8.1-next.103",
+  "version": "1.8.1-next.105",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -37,18 +37,18 @@
     "typecheck": "tsc --project ./tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@armit/config-loader": "^0.0.52",
-    "@armit/file-utility": "^0.0.29",
-    "@armit/git": "^0.0.37",
-    "@armit/package": "^0.0.46",
-    "@armit/worker-threads": "^0.0.6",
+    "@armit/config-loader": "^0.0.53",
+    "@armit/file-utility": "^0.0.30",
+    "@armit/git": "^0.0.38",
+    "@armit/package": "^0.0.47",
+    "@armit/worker-threads": "^0.0.7",
     "@babel/core": "7.22.10",
-    "@flatjs/common": "1.8.1-next.36",
-    "@flatjs/evolve-preset-babel": "1.8.1-next.21",
-    "@flatjs/forge-postcss-plugin-pixel": "1.8.1-next.36",
-    "@flatjs/graph": "1.8.1-next.53",
-    "@flatjs/mock": "1.8.1-next.77",
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
+    "@flatjs/common": "1.8.1-next.37",
+    "@flatjs/evolve-preset-babel": "1.8.1-next.22",
+    "@flatjs/forge-postcss-plugin-pixel": "1.8.1-next.37",
+    "@flatjs/graph": "1.8.1-next.55",
+    "@flatjs/mock": "1.8.1-next.79",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
     "@types/babel__core": "7.20.1",
     "babel-loader": "9.1.3",
     "babel-merge": "3.0.0",
@@ -59,7 +59,7 @@
     "cssnano": "6.0.1",
     "express": "4.18.2",
     "fork-ts-checker-webpack-plugin": "8.0.0",
-    "happy-dom": "10.9.0",
+    "happy-dom": "10.10.0",
     "html-webpack-plugin": "5.5.3",
     "image-minimizer-webpack-plugin": "3.8.3",
     "less": "4.2.0",
@@ -67,7 +67,7 @@
     "listr": "0.14.3",
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.7.6",
-    "postcss": "8.4.27",
+    "postcss": "8.4.28",
     "postcss-loader": "7.3.3",
     "react-refresh": "0.14.0",
     "svgo": "3.0.2",
@@ -81,21 +81,21 @@
     "webpack-sources": "3.2.3"
   },
   "devDependencies": {
-    "@armit/eslint-config-bases": "^0.0.24",
-    "@flatjs/testing": "1.8.1-next.38",
-    "@swc/core": "1.3.76",
+    "@armit/eslint-config-bases": "^0.0.25",
+    "@flatjs/testing": "1.8.1-next.39",
+    "@swc/core": "1.3.77",
     "@types/express": "4.17.17",
     "@types/listr": "0.14.4",
-    "@types/node": "20.4.9",
+    "@types/node": "20.5.0",
     "@vitest/coverage-istanbul": "0.34.1",
     "@vitest/ui": "0.34.1",
-    "eslint": "8.46.0",
+    "eslint": "8.47.0",
     "imagemin-gifsicle": "7.0.0",
     "imagemin-jpegtran": "7.0.0",
     "imagemin-pngquant": "9.0.2",
     "imagemin-svgo": "10.0.1",
     "npm-run-all": "4.1.5",
-    "prettier": "3.0.1",
+    "prettier": "3.0.2",
     "react": "18.2.0",
     "rimraf": "5.0.1",
     "swc-unplugin-ts": "1.0.2",