Merge branch 'v2-dev' into refactor/preview-server

farm-fe · Nov 10, 2024 · ed61594 · ed61594
2 parents 24dfd4b + 3cceff0
commit ed61594
Show file tree

Hide file tree

Showing 347 changed files with 11,088 additions and 11,445 deletions.
diff --git a/.changeset/clever-wasps-battle.md b/.changeset/clever-wasps-battle.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/core": major
+---
+
+export loadenv api
diff --git a/.changeset/happy-mice-visit.md b/.changeset/happy-mice-visit.md
diff --git a/.changeset/shiny-guests-deliver.md b/.changeset/shiny-guests-deliver.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/core": major
+---
+
+build cjs script
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -131,6 +131,11 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
+      - uses: actions/download-artifact@v4
+        id: download-plugin-replace-dirname
+        with:
+          name: ${{ github.sha }}-${{ matrix.settings.abi }}-plugin-replace-dirname
+          path: ./rust-plugins/replace-dirname/npm/${{ matrix.settings.abi }}
       - name: Install Dependencies
         run: npm install -g [email protected] && pnpm i --frozen-lockfile
       - name: Build CLI and Core
@@ -189,6 +194,7 @@ jobs:
         settings:
           - name: plugin-sass
           - name: plugin-react
+          - name: plugin-replace-dirname
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -199,34 +205,3 @@ 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 [email protected] && 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/release.yaml b/.github/workflows/release.yaml
@@ -35,12 +35,14 @@ jobs:
           do
             mv /tmp/artifacts/${{ github.sha }}-${abi}/* ./packages/core/npm/${abi}
             mv /tmp/artifacts/${{ github.sha }}-${abi}-plugin-react/* ./rust-plugins/react/npm/${abi}
+            mv /tmp/artifacts/${{ github.sha }}-${abi}-plugin-replace-dirname/* ./rust-plugins/replace-dirname/npm/${abi}
             mv /tmp/artifacts/${{ github.sha }}-${abi}-plugin-sass/* ./rust-plugins/sass/npm/${abi}
             mv /tmp/artifacts/${{ github.sha }}-${abi}-create-farm/* ./packages/create-farm/npm/${abi}
 
             test -f ./packages/core/npm/${abi}/farm.${abi}.node
             test -f ./packages/create-farm/npm/${abi}/create-farm.${abi}.node
             test -f ./rust-plugins/react/npm/${abi}/index.farm
+            test -f ./rust-plugins/replace-dirname/npm/${abi}/index.farm
             test -f ./rust-plugins/sass/npm/${abi}/index.farm
           done
           for abi in android-arm-eabi linux-arm-gnueabihf android-arm64

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -22,6 +22,9 @@
   <a href="https://github.com/farm-fe/farm/blob/main/LICENSE">
     <img src="https://img.shields.io/npm/l/@farmfe/core?style=flat-square&colorA=ffe3f5&colorB=711a5f" alt="license" />
   </a>
+  <a href="https://gurubase.io/g/farm">
+    <img src="https://img.shields.io/badge/Gurubase-Ask%20Farm%20Guru-711a5f?style=flat-square&labelColor=ffe3f5" alt="Gurubase" />
+  </a>
   </p>
   <br/>
 </div>

diff --git a/crates/compiler/src/build/mod.rs b/crates/compiler/src/build/mod.rs
@@ -488,6 +488,14 @@ impl Compiler {
             return;
           }
 
+          if let ResolveKind::Entry(ref name) = resolve_param.kind {
+            context
+              .module_graph
+              .write()
+              .entries
+              .insert(module.id.clone(), name.to_string());
+          }
+
           match Self::build_module(
             resolve_module_id_result.resolve_result,
             &mut module,

diff --git a/crates/compiler/src/generate/render_resource_pots.rs b/crates/compiler/src/generate/render_resource_pots.rs
@@ -84,8 +84,9 @@ pub fn render_resource_pots_and_generate_resources(
         &mut resource_pot_info,
       )?;
 
-      let r = &mut res.resource;
       let resource_pot_info: ResourcePotInfo = resource_pot_info.unwrap();
+      res.resource.info = Some(resource_pot_info);
+      let r = &mut res.resource;
 
       // ignore runtime resource
       if !matches!(r.resource_type, ResourceType::Runtime) {
@@ -149,7 +150,6 @@ pub fn render_resource_pots_and_generate_resources(
 
       resource_pot.add_resource(res.resource.name.clone());
 
-      res.resource.info = Some(resource_pot_info);
 
       resources.lock().push(res.resource);
       Ok::<(), CompilationError>(())

diff --git a/crates/compiler/src/generate/snapshots/generate_resource_pot_map-2.snap b/crates/compiler/src/generate/snapshots/generate_resource_pot_map-2.snap
@@ -1,59 +1,65 @@
 ---
 source: crates/compiler/src/generate/partial_bundling.rs
-input_file: crates/compiler/src/generate/partial_bundling.rs
+input_file: crates/testing_helpers/src/lib.rs
 ---
-(
-    (
-        "immutable",
-        false,
-    ),
-    (
-        "modules",
-        [
-            ModuleId {
-                relative_path: "B",
-                query_string: "",
-            },
-            ModuleId {
-                relative_path: "E",
-                query_string: "",
-            },
-        ],
-    ),
-    (
-        "resource_pot_type",
-        Custom(
-            "__farm_unknown",
-        ),
-    ),
-    (
-        "name",
-        "B_2f5d",
-    ),
-    (
-        "id",
-        "B_2f5d",
-    ),
-    (
-        "entry",
-        Some(
-            ModuleId {
-                relative_path: "B",
-                query_string: "",
-            },
-        ),
-    ),
-    (
-        "resources",
-        [],
-    ),
-    (
-        "module_groups",
-        [
-            ModuleId {
-                relative_path: "B",
-                query_string: "",
-            },
-        ],
-    ),
+name: A_66be
+id: A_66be
+immutable: false
+resource_pot_type: Js
+entry: Some(
+    ModuleId {
+        relative_path: "A",
+        query_string: "",
+    },
 )
+module_groups: [
+    ModuleId {
+        relative_path: "A",
+        query_string: "",
+    },
+    ModuleId {
+        relative_path: "F",
+        query_string: "",
+    },
+]
+modules: [
+    ModuleId {
+        relative_path: "A",
+        query_string: "",
+    },
+    ModuleId {
+        relative_path: "C",
+        query_string: "",
+    },
+]
+resources: []
+
+-------
+
+name: B_2f5d
+id: B_2f5d
+immutable: false
+resource_pot_type: Js
+entry: Some(
+    ModuleId {
+        relative_path: "B",
+        query_string: "",
+    },
+)
+module_groups: [
+    ModuleId {
+        relative_path: "B",
+        query_string: "",
+    },
+]
+modules: [
+    ModuleId {
+        relative_path: "B",
+        query_string: "",
+    },
+    ModuleId {
+        relative_path: "E",
+        query_string: "",
+    },
+]
+resources: []