fix: farm-fe#770 (farm-fe#807)

NidMo · Nov 30, 2023 · 2bcf360 · 2bcf360
1 parent 0a83fff
commit 2bcf360
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 12 deletions.
diff --git a/.changeset/eighty-cheetahs-behave.md b/.changeset/eighty-cheetahs-behave.md
@@ -0,0 +1,5 @@
+---
+'@farmfe/runtime': patch
+---
+
+fix #802
diff --git a/.changeset/tame-dolphins-learn.md b/.changeset/tame-dolphins-learn.md
@@ -0,0 +1,5 @@
+---
+'@farmfe/core': patch
+---
+
+fix #770
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -37,7 +37,7 @@ swc_html_ast = { version = "0.33.9", features = ["rkyv-impl"] }
 heck = "0.4.1"
 puffin = { version = "0.17.0", features = ["packing"], optional = true }
 regex = "1.7.3"
-enhanced-magic-string = { version = "0.0.11" }
+enhanced-magic-string = { version = "0.0.12" }
 
 [features]
 profile = ["dep:puffin"]
diff --git a/examples/vite-adapter-vue/components.d.ts b/examples/vite-adapter-vue/components.d.ts
@@ -8,9 +8,10 @@ export {}
 declare module 'vue' {
  export interface GlobalComponents {
  ElButton: typeof import('element-plus/es')['ElButton']
- ElTree: typeof import('element-plus/es')['ElTree']
+ ElInput: typeof import('element-plus/es')['ElInput']
  Formatter: typeof import('./src/components/Formatter.vue')['default']
  HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
+ Intro: typeof import('./src/components/Intro.vue')['default']
  RouterLink: typeof import('vue-router')['RouterLink']
  RouterView: typeof import('vue-router')['RouterView']
  }

diff --git a/examples/vite-adapter-vue/src/components/Formatter.vue b/examples/vite-adapter-vue/src/components/Formatter.vue
@@ -28,4 +28,6 @@ const format = async () => {
 };
 </script>
 
-<style scoped></style>
+<style lang="scss" scoped>
+/* build error */
+</style>
diff --git a/examples/vite-adapter-vue/src/components/HelloWorld.vue b/examples/vite-adapter-vue/src/components/HelloWorld.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
+import Intro from './async-comp';
 
 defineProps<{ msg: string }>()
 const count = ref(0)
@@ -91,12 +92,7 @@ const defaultProps = {
  </p>
  </div>
 
- <p>
- Install
- <a href="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/vuejs/language-tools" target="_blank">Volar</a>
- in your IDE for a better DX
- </p>
- <p class="read-the-docs">Click on the Farm and Vue logos to learn more</p>
+ <intro />
 </template>
 
 <style scoped lang="scss">

diff --git a/examples/vite-adapter-vue/src/components/Intro.vue b/examples/vite-adapter-vue/src/components/Intro.vue
@@ -0,0 +1,14 @@
+<script lang="ts"></script>
+
+<template>
+ <p>
+ Install
+ <a href="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/vuejs/language-tools" target="_blank">Volar</a>
+ in your IDE for a better DX
+ </p>
+ <p class="read-the-docs">Click on the Farm and Vue logos to learn more</p>
+</template>
+
+<style lang="scss" scoped>
+/* build error */
+</style>
diff --git a/examples/vite-adapter-vue/src/components/async-comp.ts b/examples/vite-adapter-vue/src/components/async-comp.ts
@@ -0,0 +1,3 @@
+import { defineAsyncComponent } from "vue";
+
+export default defineAsyncComponent(() => import("./Intro.vue"));
diff --git a/packages/runtime/src/resource-loader.ts b/packages/runtime/src/resource-loader.ts
@@ -36,7 +36,9 @@ export class ResourceLoader {
  }
 
  const publicPath = this.publicPaths[index];
- const url = `${publicPath === '/' ? '' : publicPath}/${resource.path}`;
+ const url = `${
+ publicPath.endsWith('/') ? publicPath.slice(0, -1) : publicPath
+ }/${resource.path}`;
 
  if (this._loadedResources[resource.path]) {
  return;