@flatjs/evolve 3.0.0-next.6 → 3.0.0

package/dist/core/rspack/create-plugins.js

@@ -1 +1 @@
-import CaseSensitivePathsPlugin from"case-sensitive-paths-webpack-plugin";import{logger}from"@flatjs/common";import{RsdoctorRspackPlugin}from"@rsdoctor/rspack-plugin";import rspack,{CssExtractRspackPlugin}from"@rspack/core";import ReactRefreshPlugin from"@rspack/plugin-react-refresh";import{enableBundleHashNameForModule}from"../../helpers/enable-bundle-hashname-for-module.js";import{getBundleFileName}from"../../helpers/get-bundle-file-name.js";import{shouldEnableReactFastRefresh}from"../../helpers/should-enable-react-fast-refresh.js";import{createBuiltinDefineVariablesRspackPlugins}from"../../plugins/rspack/define-variable/index.js";import{createModuleFederationRspackPlugins}from"../../plugins/rspack/module-federation/index.js";import{createHtmlRspackPlugins}from"../../plugins/rspack/multi-html/index.js";import{createProgressRspackPlugins}from"../../plugins/rspack/progress-plugin/index.js";import{createCircularDependencyWebpackPlugins}from"../../plugins/webpack/circular-dependency/index.js";import{createCleanWebpackPlugins}from"../../plugins/webpack/clean-webpack/index.js";import{createStatsWebpackPlugins}from"../../plugins/webpack/stats-webpack/index.js";export const createRspackPlugins=async(e,s,a,r)=>{const n=s[0],[i,l]=n,c=enableBundleHashNameForModule(a,l?.options),t=[...createProgressRspackPlugins(s),new rspack.IgnorePlugin({resourceRegExp:/\.d\.[cm]ts$/}),new CaseSensitivePathsPlugin,...createCircularDependencyWebpackPlugins(e,a),new CssExtractRspackPlugin({filename:`[name]/${getBundleFileName("css",e,c)}`,chunkFilename:c?"[id].[contenthash].css":"[id].css"}),...await createBuiltinDefineVariablesRspackPlugins(e,a),...createCleanWebpackPlugins(e,s,a),...createModuleFederationRspackPlugins(e,s,a),...createHtmlRspackPlugins(e,s,a),...createStatsWebpackPlugins(e,a,r)],o=shouldEnableReactFastRefresh(e,n,a);o&&t.push(new ReactRefreshPlugin({overlay:!1,exclude:[/node_modules/]})),!o&&e&&(a.devServer?.liveReload?logger.warn('The HMR disabled cause of "liveReload" specificed'):logger.warn(`The HMR disabled cause of \`"moduleFederation":"${i}"\``)),a.openRsdoctor&&t.push(new RsdoctorRspackPlugin);const p=a.webpack?.plugins||[];return t.concat(p)};
+import CaseSensitivePathsPlugin from"case-sensitive-paths-webpack-plugin";import{logger}from"@flatjs/common";import{RsdoctorRspackPlugin}from"@rsdoctor/rspack-plugin";import rspack,{CssExtractRspackPlugin}from"@rspack/core";import ReactRefreshPlugin from"@rspack/plugin-react-refresh";import{enableBundleHashNameForModule}from"../../helpers/enable-bundle-hashname-for-module.js";import{getBundleFileName}from"../../helpers/get-bundle-file-name.js";import{shouldEnableReactFastRefresh}from"../../helpers/should-enable-react-fast-refresh.js";import{createBuiltinDefineVariablesRspackPlugins}from"../../plugins/rspack/define-variable/index.js";import{createModuleFederationRspackPlugins}from"../../plugins/rspack/module-federation/index.js";import{createHtmlRspackPlugins}from"../../plugins/rspack/multi-html/index.js";import{createProgressRspackPlugins}from"../../plugins/rspack/progress-plugin/index.js";import{createCircularDependencyWebpackPlugins}from"../../plugins/webpack/circular-dependency/index.js";import{createCleanWebpackPlugins}from"../../plugins/webpack/clean-webpack/index.js";import{createStatsWebpackPlugins}from"../../plugins/webpack/stats-webpack/index.js";export const createRspackPlugins=async(e,s,a,r)=>{const n=s[0],[i,l]=n,c=enableBundleHashNameForModule(a,l?.options),t=[...createProgressRspackPlugins(e,s),new rspack.IgnorePlugin({resourceRegExp:/\.d\.[cm]ts$/}),new CaseSensitivePathsPlugin,...createCircularDependencyWebpackPlugins(e,a),new CssExtractRspackPlugin({filename:`[name]/${getBundleFileName("css",e,c)}`,chunkFilename:c?"[id].[contenthash].css":"[id].css"}),...await createBuiltinDefineVariablesRspackPlugins(e,a),...createCleanWebpackPlugins(e,s,a),...createModuleFederationRspackPlugins(e,s,a),...createHtmlRspackPlugins(e,s,a),...createStatsWebpackPlugins(e,a,r)],o=shouldEnableReactFastRefresh(e,n,a);o&&t.push(new ReactRefreshPlugin({overlay:!1,exclude:[/node_modules/]})),!o&&e&&(a.devServer?.liveReload?logger.warn('The HMR disabled cause of "liveReload" specificed'):logger.warn(`The HMR disabled cause of \`"moduleFederation":"${i}"\``)),a.openRsdoctor&&t.push(new RsdoctorRspackPlugin);const p=a.webpack?.plugins||[];return t.concat(p)};

package/dist/helpers/merge-inspector-evolve-config.js

@@ -1 +1 @@
-import{dirname,join}from"path";import{fileURLToPath}from"url";import{searchPackageDir}from"@armit/package";import{logger,mergeOptions,requireResolve}from"@flatjs/common";export const mergeInspectorEvolveConfig=e=>{const{inspector:r}=e;if(!r)return e;const{externals:n}=e.webpack||{};if(n){let r=n;if("function"==typeof n&&(r=n()),r.react||r["react-dom"])return logger.warn("React and ReactDOM are external dependencies, you need to manually integrate Inspector"),e}const{keys:t=["$mod","i"],customLaunchEditorEndpoint:o="/__hps_inspector"}=r,i={"process.env.INSPECTOR_ENDPOINT":JSON.stringify(`/pages/${o}`.replace(/\/\//g,"/")),"process.env.INSPECTOR_KEYS":JSON.stringify(t.join(",")),"process.env.INSPECTOR_HIDE_CONSOLE":JSON.stringify("FALSE"),"process.env.INSPECTOR_HIDE_CONTEXT":JSON.stringify("TRUE"),"process.env.INSPECTOR_HIDE_DOM_PATH_ATTR":JSON.stringify("TRUE"),"process.env.INSPECTOR_DISABLE":JSON.stringify("FALSE")},s=mergeOptions(e,{pluginOptions:{definePlugin:i}}),c=requireResolve(import.meta.url,"@hyperse/inspector"),p=searchPackageDir({cwd:fileURLToPath(dirname(c))});if(!p)return logger.debug("@hyperse/inspector package not found"),s;const a=join(p,"dist","client","index.js"),g=s.entryMap;for(const[e,r]of Object.entries(g)){r.entry.push(a)}return s};
+import{dirname,join}from"path";import{fileURLToPath}from"url";import{searchPackageDir}from"@armit/package";import{logger,mergeOptions,requireResolve}from"@flatjs/common";import{normalizePageProxy}from"./normalize-page-proxy.js";export const mergeInspectorEvolveConfig=e=>{const{inspector:r,devServer:o}=e;if(!r)return e;const{externals:n}=e.webpack||{};if(n){let r=n;if("function"==typeof n&&(r=n()),r.react||r["react-dom"])return logger.warn("React and ReactDOM are external dependencies, you need to manually integrate Inspector"),e}const t=normalizePageProxy(o?.pageProxy||"/pages"),{keys:i=["$mod","i"],customLaunchEditorEndpoint:s="/__hps_inspector"}=r,a={"process.env.INSPECTOR_ENDPOINT":JSON.stringify(join(t,s)),"process.env.INSPECTOR_KEYS":JSON.stringify(i.join(",")),"process.env.INSPECTOR_HIDE_CONSOLE":JSON.stringify("FALSE"),"process.env.INSPECTOR_HIDE_CONTEXT":JSON.stringify("TRUE"),"process.env.INSPECTOR_HIDE_DOM_PATH_ATTR":JSON.stringify("TRUE"),"process.env.INSPECTOR_DISABLE":JSON.stringify("FALSE")},p=mergeOptions(e,{pluginOptions:{definePlugin:a}}),c=requireResolve(import.meta.url,"@hyperse/inspector"),g=searchPackageDir({cwd:fileURLToPath(dirname(c))});if(!g)return logger.debug("@hyperse/inspector package not found"),p;const m=join(g,"dist","client","index.js"),f=p.entryMap;for(const[e,r]of Object.entries(f)){r.entry.push(m)}return p};

package/dist/plugins/rspack/progress-plugin/index.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin as RspackPlugin } from '@rspack/core';
 import { type ProgressPluginArgument } from '@rspack/core';
 import type { EntryMapItem } from '../../../types/types-entry-map.js';
-export declare const createProgressRspackPlugins: (entryMapItemList: EntryMapItem[], pluginOptions?: ProgressPluginArgument) => RspackPlugin[];
+export declare const createProgressRspackPlugins: (serveMode: boolean, entryMapItemList: EntryMapItem[], pluginOptions?: ProgressPluginArgument) => RspackPlugin[];

package/dist/plugins/rspack/progress-plugin/index.js

@@ -1 +1 @@
-import{Worker}from"node:worker_threads";import{resolve}from"path";import{getDirname}from"@armit/file-utility";import{mergeOptions}from"@hyperse/config-loader";import{ProgressPlugin}from"@rspack/core";import{progressHandler}from"./progress-handler.js";export const createProgressRspackPlugins=(r,e={})=>{if("test"===process.env.NODE_ENV)return console.warn("[WARNING] Using fake thread pool worker for unittest!"),[new ProgressPlugin({prefix:"[ evolve vite progress ]"})];const o=resolve(getDirname(import.meta.url),"./progress-worker.js"),s=new Worker(o,{env:{...process.env,FORCE_COLOR:"3"}}),t=mergeOptions(progressHandler(s,r),e);return[new ProgressPlugin(t),{apply(r){r.hooks.done.tap("shutdown",()=>{s.terminate()})}}]};
+import{Worker}from"node:worker_threads";import{resolve}from"path";import{getDirname}from"@armit/file-utility";import{mergeOptions}from"@hyperse/config-loader";import{ProgressPlugin}from"@rspack/core";import{progressHandler}from"./progress-handler.js";export const createProgressRspackPlugins=(r,e,o={})=>{if(r)return[];if("test"===process.env.NODE_ENV)return console.warn("[WARNING] Using fake thread pool worker for unittest!"),[new ProgressPlugin({prefix:"[ evolve vite progress ]"})];const s=resolve(getDirname(import.meta.url),"./progress-worker.js"),t=new Worker(s,{env:{...process.env,FORCE_COLOR:"3"}}),n=mergeOptions(progressHandler(t,e),o);return[new ProgressPlugin(n),{apply(r){r.hooks.done.tap("shutdown",()=>{t.terminate()})}}]};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatjs/evolve",
-  "version": "3.0.0-next.6",
+  "version": "3.0.0",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -49,25 +49,25 @@
     "@babel/core": "^7.27.4",
     "@clack/prompts": "^0.11.0",
     "@discoveryjs/json-ext": "0.6.3",
-    "@flatjs/babel-plugin-import": "2.2.9-next.4",
-    "@flatjs/common": "2.2.4-next.1",
-    "@flatjs/evolve-preset-babel": "2.2.4-next.1",
-    "@flatjs/forge-postcss-plugin-pixel": "2.2.4-next.1",
-    "@flatjs/forge-ts-checker": "1.1.2-next.1",
-    "@flatjs/graph": "2.2.9-next.4",
-    "@flatjs/mock": "2.4.1-next.4",
-    "@flatjs/swc-plugin-import": "1.0.0-next.4",
+    "@flatjs/babel-plugin-import": "2.2.9",
+    "@flatjs/common": "2.2.4",
+    "@flatjs/evolve-preset-babel": "2.2.4",
+    "@flatjs/forge-postcss-plugin-pixel": "2.2.4",
+    "@flatjs/forge-ts-checker": "1.1.2",
+    "@flatjs/graph": "2.2.9",
+    "@flatjs/mock": "2.4.1",
+    "@flatjs/swc-plugin-import": "1.0.0",
     "@hyperse/config-loader": "^1.0.5",
     "@hyperse/html-webpack-plugin-loader": "^1.0.6",
-    "@hyperse/inspector": "^1.1.8",
-    "@hyperse/inspector-babel-plugin": "^1.1.6",
-    "@hyperse/inspector-common": "^1.1.3",
-    "@hyperse/inspector-middleware": "^1.1.6",
-    "@hyperse/inspector-swc-plugin": "^1.1.7",
+    "@hyperse/inspector": "^1.1.13",
+    "@hyperse/inspector-babel-plugin": "^1.1.7",
+    "@hyperse/inspector-common": "^1.1.4",
+    "@hyperse/inspector-middleware": "^1.1.7",
+    "@hyperse/inspector-swc-plugin": "^1.1.9",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.6.0",
-    "@rsdoctor/rspack-plugin": "^1.1.3",
-    "@rspack/core": "^1.3.15",
-    "@rspack/dev-server": "^1.1.3",
+    "@rsdoctor/rspack-plugin": "^1.1.6",
+    "@rspack/core": "~1.4.2",
+    "@rspack/dev-server": "~1.1.3",
     "@rspack/plugin-react-refresh": "^1.4.3",
     "@swc/helpers": "^0.5.17",
     "@types/babel__core": "^7.20.5",
@@ -105,7 +105,7 @@
     "webpack-sources": "^3.3.2"
   },
   "devDependencies": {
-    "@flatjs/testing": "2.2.4-next.1",
+    "@flatjs/testing": "2.2.4",
     "@hyperse/eslint-config-hyperse": "^1.4.5",
     "@swc/core": "1.12.1",
     "@types/express": "5.0.3",