Merge branch 'main' into refactor/node

farm-fe · Oct 12, 2024 · 9dc4f7a · 9dc4f7a
2 parents 08e14b7 + 04a124f
commit 9dc4f7a
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 8 deletions.
diff --git a/.changeset/wet-snakes-greet.md b/.changeset/wet-snakes-greet.md
@@ -0,0 +1,6 @@
+---
+"@farmfe/runtime": patch
+"@farmfe/core": patch
+---
+
+Fix css dynamic loading runtime error #1551
diff --git a/bench/CHANGELOG.md b/bench/CHANGELOG.md
@@ -1,5 +1,12 @@
 # bench
 
+## 1.0.16
+
+### Patch Changes
+
+- Updated dependencies
+  - @farmfe/core@1.3.27
+
 ## 1.0.15
 
 ### Patch Changes

diff --git a/bench/package.json b/bench/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bench",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "private": true,
   "description": "",
   "scripts": {},

diff --git a/examples/css-url/src/dynamic.css b/examples/css-url/src/dynamic.css
@@ -0,0 +1,3 @@
+body {
+  background-color: lightblue;
+}
diff --git a/examples/css-url/src/main.tsx b/examples/css-url/src/main.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import './main.css';
 
+import('./dynamic.css');
+
 export function Main() {
   return (
     <>

diff --git a/js-plugins/solid/package.json b/js-plugins/solid/package.json
@@ -39,7 +39,7 @@
     "solid-js": "^1.7.8"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.3.26"
+    "@farmfe/core": "workspace:^1.3.27"
   },
   "files": [
     "build"

diff --git a/js-plugins/vue/package.json b/js-plugins/vue/package.json
@@ -50,7 +50,7 @@
     "source-map": "^0.7.4"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.3.26",
+    "@farmfe/core": "workspace:^1.3.27",
     "less": "*",
     "sass": "*",
     "stylus": "*"

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @farmfe/core
 
+## 1.3.27
+
+### Patch Changes
+
+- Bump version
+- Updated dependencies
+  - @farmfe/runtime@0.12.6
+
 ## 1.3.26
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/core",
-  "version": "1.3.26",
+  "version": "1.3.27",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -90,7 +90,7 @@
     "ws": "^8.14.2"
   },
   "dependencies": {
-    "@farmfe/runtime": "workspace:0.12.5",
+    "@farmfe/runtime": "workspace:0.12.6",
     "@farmfe/runtime-plugin-hmr": "workspace:3.5.7",
     "@farmfe/runtime-plugin-import-meta": "workspace:0.2.2",
     "@farmfe/utils": "workspace:*",

diff --git a/packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap b/packages/core/tests/js-plugin-hooks/__snapshots__/transform-html.spec.ts.snap
diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @farmfe/runtime
 
+## 0.12.6
+
+### Patch Changes
+
+- Bump version
+
 ## 0.12.5
 
 ### Patch Changes

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/runtime",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "Runtime of Farm",
   "author": {
     "name": "bright wu",

diff --git a/packages/runtime/src/module-system.ts b/packages/runtime/src/module-system.ts
@@ -175,6 +175,11 @@ export class ModuleSystem {
       }),
     )
       .then(() => {
+        // Do not require the module if all the resources are not js resources
+        if (resources.every(resource => resource.type !== 0)) {
+          return;
+        }
+
         if (!this.modules[moduleId]) {
           throw new Error(
             `Dynamic imported module "${moduleId}" is not registered.`,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml