fix: #1672 (#1692)

* fix: #1672 * chore: update lockfile * chore: update snapshots * fix: #1715 and #1699 * chore: remove codspeed.yaml * chore: add changeset
farm-fe · Aug 19, 2024 · ef19162 · ef19162
1 parent a785d6f
commit ef19162
Show file tree

Hide file tree

Showing 177 changed files with 3,147 additions and 348 deletions.
diff --git a/.changeset/healthy-lies-prove.md b/.changeset/healthy-lies-prove.md
@@ -0,0 +1,9 @@
+---
+"@farmfe/runtime-plugin-hmr": patch
+"create-farm": patch
+"@farmfe/plugin-react": patch
+"@farmfe/runtime": patch
+"@farmfe/core": patch
+---
+
+Optimize dynamic resources map size and fix minify.moduleDecls cyclic dependencies issues
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -192,3 +192,34 @@ jobs:
           do
             test -f /tmp/artifacts/${{ github.sha }}-${abi}-${{ matrix.settings.name }}/index.farm
           done
+
+  benchmarks:
+    needs: [call-rust-build]
+    runs-on: ${{ matrix.settings.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        settings:
+          - os: ubuntu-latest
+            abi: linux-x64-gnu
+    steps:
+      - uses: "actions/checkout@v3"
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Install Dependencies
+        run: npm install -g pnpm@9.1.0 && pnpm i --frozen-lockfile
+      - name: Build CLI and Core
+        run: pnpm --filter @farmfe/cli run build
+      - uses: actions/download-artifact@v4
+        id: download
+        with:
+          name: ${{ github.sha }}-${{ matrix.settings.abi }}
+          path: ./packages/core/binding
+      - name: Build Core CJS
+        run: cd packages/core && pnpm run build:cjs
+      - name: Run benchmarks
+        uses: CodSpeedHQ/action@v3
+        with:
+          run: npm exec vitest bench
+          token: ${{ secrets.CODSPEED_TOKEN }}
diff --git a/.github/workflows/codspeed.yml b/.github/workflows/codspeed.yml
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://farmfe.org"
 license = "MIT"
 repository = "https://github.com/farm-fe/farm"
 
-[profile.release]
+[profile.release-publish]
+inherits = "release"
 codegen-units = 1
 lto = "fat"
 opt-level = 3
@@ -17,7 +18,7 @@ panic = "abort"
 
 [profile.ci-test]
 inherits = "release"
-opt-level = 0
-debug = 2
-lto = false
-codegen-units = 16
+# opt-level = 0
+# debug = 2
+# lto = false
+# codegen-units = 16
diff --git a/bench/package.json b/bench/package.json
@@ -1,6 +1,7 @@
 {
   "name": "bench",
   "version": "1.0.1",
+  "private": true,
   "description": "",
   "scripts": {},
   "dependencies": {

diff --git a/crates/compiler/tests/fixtures/css/modules/composes/external_import/output.js b/crates/compiler/tests/fixtures/css/modules/composes/external_import/output.js
@@ -85,7 +85,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index).base);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_c9a6.css:
  .farm-base {

diff --git a/crates/compiler/tests/fixtures/css/modules/composes/global_import/output.js b/crates/compiler/tests/fixtures/css/modules/composes/global_import/output.js
@@ -76,7 +76,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index).base);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_2528.css:
  .farm-base {

diff --git a/crates/compiler/tests/fixtures/css/modules/composes/local_import/output.js b/crates/compiler/tests/fixtures/css/modules/composes/local_import/output.js
@@ -77,7 +77,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index).action);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_2528.css:
  .farm-base {

diff --git a/crates/compiler/tests/fixtures/css/modules/global/output.js b/crates/compiler/tests/fixtures/css/modules/global/output.js
@@ -74,7 +74,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index).base);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_2528.css:
   .base {

diff --git a/crates/compiler/tests/fixtures/css/modules/local/output.js b/crates/compiler/tests/fixtures/css/modules/local/output.js
@@ -79,7 +79,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index).base);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_2528.css:
  .farm-base {

diff --git a/crates/compiler/tests/fixtures/css/modules/normal/output.js b/crates/compiler/tests/fixtures/css/modules/normal/output.js
@@ -78,7 +78,7 @@
     var _f_index = module.i(farmRequire("95fe6ac5"));
     console.log(module.f(_f_index));
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_2528.css:
   .foo  .farm-hello {

diff --git a/crates/compiler/tests/fixtures/css/prefixer/normal/output.js b/crates/compiler/tests/fixtures/css/prefixer/normal/output.js
@@ -67,7 +67,7 @@
     module._m(exports);
     "";
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_337c.css:
  @-webkit-keyframes anim {}

diff --git a/crates/compiler/tests/fixtures/css/url_replacer/absolute/output.js b/crates/compiler/tests/fixtures/css/url_replacer/absolute/output.js
@@ -67,7 +67,7 @@
     module._m(exports);
     "";
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_337c.css:
  body {

diff --git a/crates/compiler/tests/fixtures/css/url_replacer/ignored/output.js b/crates/compiler/tests/fixtures/css/url_replacer/ignored/output.js
@@ -67,7 +67,7 @@
     module._m(exports);
     "";
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
 
 //index_337c.css:
  body {

diff --git a/crates/compiler/tests/fixtures/external/browser/normal/cjs/output.js b/crates/compiler/tests/fixtures/external/browser/normal/cjs/output.js
@@ -68,4 +68,4 @@
     var _f_jquery = module.i(farmRequire('jquery'));
     console.log(module.f(_f_jquery).find);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
diff --git a/crates/compiler/tests/fixtures/external/browser/normal/esm/output.js b/crates/compiler/tests/fixtures/external/browser/normal/esm/output.js
@@ -68,4 +68,4 @@
     var _f_jquery = module.i(farmRequire('jquery'));
     console.log(module.f(_f_jquery).find);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
diff --git a/crates/compiler/tests/fixtures/external/browser/object/cjs/output.js b/crates/compiler/tests/fixtures/external/browser/object/cjs/output.js
@@ -68,4 +68,4 @@
     var _f_jquery = module.i(farmRequire('jquery'));
     console.log(module.f(_f_jquery).find);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
diff --git a/crates/compiler/tests/fixtures/external/browser/object/esm/output.js b/crates/compiler/tests/fixtures/external/browser/object/esm/output.js
@@ -68,4 +68,4 @@
     var _f_jquery = module.i(farmRequire('jquery'));
     console.log(module.f(_f_jquery).find);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
diff --git a/crates/compiler/tests/fixtures/external/node/hosting/import/output.js b/crates/compiler/tests/fixtures/external/node/hosting/import/output.js
@@ -70,4 +70,4 @@ import * as __farm_external_module_jquery from "jquery";(globalThis || window ||
         xxx: module.f(_f_jquery)
     });
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
diff --git a/crates/compiler/tests/fixtures/external/node/hosting/require/output.js b/crates/compiler/tests/fixtures/external/node/hosting/require/output.js
@@ -69,4 +69,4 @@
         xxx
     });
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");export default entry;
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");export default entry;
diff --git a/crates/compiler/tests/fixtures/external/node/normala/cjs/output.js b/crates/compiler/tests/fixtures/external/node/normala/cjs/output.js
@@ -68,4 +68,4 @@ var __farm_external_module_jquery = require("jquery");(globalThis || window || g
     var _f_jquery = module.i(farmRequire('jquery'));
     console.log(module.f(_f_jquery).find);
 }
-,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap({  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");
+,});(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setInitialLoadedResources([]);(globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__.setDynamicModuleResourcesMap([],{  });var farmModuleSystem = (globalThis || window || global)['__farm_default_namespace__'].__farm_module_system__;farmModuleSystem.bootstrap();var entry = farmModuleSystem.require("b5d64806");