fix: #703

farm-fe · Nov 3, 2023 · 47db6bf · 47db6bf
1 parent 50b8821
commit 47db6bf
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 24 deletions.
diff --git a/crates/plugin_resolve/src/resolver.rs b/crates/plugin_resolve/src/resolver.rs
@@ -623,6 +623,11 @@ impl Resolver {
         .try_file(&resolved_path_buf, context)
         .or_else(|| self.try_directory(source, &resolved_path_buf, kind, true, context))
         .unwrap_or(resolved_path);
+
+      let resolved_path = self
+        .try_browser_replace(package_json_info, &resolved_path, context)
+        .unwrap_or(resolved_path);
+
       PluginResolveHookResult {
         resolved_path,
         side_effects,

diff --git a/crates/plugin_resolve/tests/browser.rs b/crates/plugin_resolve/tests/browser.rs
@@ -241,3 +241,34 @@ fn resolve_browser_target_env_node() {
     }
   );
 }
+
+#[test]
+fn resolve_browser_entry_replace() {
+  fixture!(
+    "tests/fixtures/resolve-node-modules/browser/index.ts",
+    |file, _| {
+      let cwd = file.parent().unwrap().to_path_buf();
+      let resolver = Resolver::new();
+
+      let resolved = resolver.resolve(
+        "entry-replace",
+        cwd.clone(),
+        &ResolveKind::Import,
+        &Arc::new(CompilationContext::default()),
+      );
+      assert!(resolved.is_some());
+      let resolved = resolved.unwrap();
+
+      assert_eq!(
+        resolved.resolved_path,
+        cwd
+          .join("node_modules")
+          .join("entry-replace")
+          .join("lib")
+          .join("browser.js")
+          .to_string_lossy()
+          .to_string()
+      );
+    }
+  );
+}
diff --git a/...lve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/lib/browser.js b/...lve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/lib/browser.js
diff --git a/...solve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/lib/index.js b/...solve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/lib/index.js
diff --git a/...solve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/package.json b/...solve/tests/fixtures/resolve-node-modules/browser/node_modules/entry-replace/package.json
diff --git a/examples/qrcode/index.html b/examples/qrcode/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Document</title>
+</head>
+<body>
+  <div id="canvas"></div>
+  <script src="./index"></script>
+</body>
+</html>
diff --git a/examples/qrcode/index.mjs b/examples/qrcode/index.mjs
@@ -0,0 +1,9 @@
+import QRCode from 'qrcode'
+
+// With promises
+QRCode.toCanvas('text', { errorCorrectionLevel: 'H' }, function (err, canvas) {
+  if (err) throw err
+
+  var container = document.getElementById('canvas')
+  container.appendChild(canvas)
+})
diff --git a/examples/qrcode/package.json b/examples/qrcode/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@farmfe-examples/qrcode",
+  "version": "0.0.0",
+  "scripts": {
+    "start": "farm start",
+    "build": "farm build"
+  },
+  "devDependencies": {
+    "@farmfe/cli": "workspace:^",
+    "@farmfe/core": "workspace:^"
+  },
+  "dependencies": {
+    "qrcode": "^1.5.3"
+  }
+}
diff --git a/examples/vite-adapter-vue/components.d.ts b/examples/vite-adapter-vue/components.d.ts
@@ -9,6 +9,7 @@ declare module 'vue' {
   export interface GlobalComponents {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElTree: typeof import('element-plus/es')['ElTree']
     HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']

diff --git a/examples/vite-adapter-vue/src/components/HelloWorld.vue b/examples/vite-adapter-vue/src/components/HelloWorld.vue
@@ -4,6 +4,78 @@ import { ref } from 'vue';
 defineProps<{ msg: string }>()
 const count = ref(0)
 console.log(count.value);
+
+interface Tree {
+  label: string
+  children?: Tree[]
+}
+
+const handleNodeClick = (data: Tree) => {
+  console.log(data)
+}
+
+const data: Tree[] = [
+  {
+    label: 'Level one 1',
+    children: [
+      {
+        label: 'Level two 1-1',
+        children: [
+          {
+            label: 'Level three 1-1-1',
+          },
+        ],
+      },
+    ],
+  },
+  {
+    label: 'Level one 2',
+    children: [
+      {
+        label: 'Level two 2-1',
+        children: [
+          {
+            label: 'Level three 2-1-1',
+          },
+        ],
+      },
+      {
+        label: 'Level two 2-2',
+        children: [
+          {
+            label: 'Level three 2-2-1',
+          },
+        ],
+      },
+    ],
+  },
+  {
+    label: 'Level one 3',
+    children: [
+      {
+        label: 'Level two 3-1',
+        children: [
+          {
+            label: 'Level three 3-1-1',
+          },
+        ],
+      },
+      {
+        label: 'Level two 3-2',
+        children: [
+          {
+            label: 'Level three 3-2-1',
+          },
+        ],
+      },
+    ],
+  },
+]
+
+const defaultProps = {
+  children: 'children',
+  label: 'label',
+}
 </script>
 
 <template>
@@ -12,6 +84,7 @@ console.log(count.value);
   <div class="card">
     <el-button type="primary" @click="count++">count is {{ count }}</el-button>
 
+    <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" />
     <p>
       Edit
       <code>components/HelloWorld.vue</code> to test HMR