farm-fe · ErKeLost · Aug 20, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[rust]": {
     "editor.defaultFormatter": "rust-lang.rust-analyzer"

diff --git a/cspell.json b/cspell.json
@@ -73,6 +73,7 @@
     "hashbrown",
     "hasher",
     "Hensel",
+    "HMRPing",
     "icns",
     "idents",
     "IHDR",

diff --git a/examples/public-dir/src/main.tsx b/examples/public-dir/src/main.tsx
@@ -1,15 +1,16 @@
 import React, { useState } from "react";
 import "./main.css";
 import reactLogo from "./assets/react.svg";
-// import FarmLogo from "../public/logo.png";
+import FarmLogo from "/new-logo.png";
+// import FarmLogo from "../newPublic/new-logo.png";
 export function Main() {
   const [count, setCount] = useState(0);
 
   return (
     <>
       <div>
         <a href="https://farmfe.org/" target="_blank">
-          {/* <img src={FarmLogo} className="logo" alt="Farm logo" /> */}
+          <img src={FarmLogo} className="logo" alt="Farm logo" />
         </a>
         <a href="https://react.dev" target="_blank">
           <img src={reactLogo} className="logo react" alt="React logo" />

diff --git a/examples/react/farm.config.js b/examples/react/farm.config.js
@@ -5,6 +5,10 @@ export default defineConfig(() => {
     compilation: {
       sourcemap: true,
       // persistentCache: false,
+      persistentCache: {
+        // cacheDir: "node_modules/.farm/adny",
+        cacheDir: "node_modules/adny/cache",
+      },
       presetEnv: false,
       progress: false
       // output: {

diff --git a/examples/react/public/vite.svg b/examples/react/public/vite.svg
diff --git a/examples/react/src/vite.svg b/examples/react/src/vite.svg
diff --git a/examples/refactor-react/about.html b/examples/refactor-react/about.html
@@ -0,0 +1,11 @@
+<!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>
+  im about page
+</body>
+</html>
diff --git a/examples/refactor-react/farm.config.ts b/examples/refactor-react/farm.config.ts
@@ -3,7 +3,9 @@ import { defineConfig } from "@farmfe/core";
 import react from "@farmfe/plugin-react";
 export default defineConfig({
   plugins: [react()],
-  server: {
-    // port: 3005,
-  },
+  compilation: {
+    output: {
+      publicPath: '/aaa/',
+    }
+  }
 });
diff --git a/examples/refactor-react/index.html b/examples/refactor-react/index.html
@@ -4,11 +4,12 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
+  <!-- <link rel="icon" type="image/svg+xml" href="/favicon.ico" /> -->
+  <link rel="icon" type="image/svg+xml" href='/react.svg' />
   <title>Farm + React + TS</title>
 </head>
 <body>
   <div id="root"></div>
   <script src="./src/index.tsx"></script>
 </body>
-</html>
+</html>
diff --git a/examples/refactor-react/public/react.svg b/examples/refactor-react/public/react.svg
diff --git a/examples/refactor-react/src/assets/base/react.svg b/examples/refactor-react/src/assets/base/react.svg
diff --git a/examples/refactor-react/src/main.css b/examples/refactor-react/src/main.css
@@ -15,7 +15,7 @@
   filter: drop-shadow(0 0 2em #9F1A8Faa);
 }
 .logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
+  filter: drop-shadow(0 0 2em #9761fbaa);
 }
 
 @keyframes logo-spin {

diff --git a/examples/refactor-react/src/main.tsx b/examples/refactor-react/src/main.tsx
@@ -1,19 +1,19 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import "./main.css";
-import reactLogo from "./assets/react.svg";
+import reactLogo from "/react.svg";
 import FarmLogo from "./assets/logo.png";
 export function Main() {
   const [count, setCount] = useState(0);
 
   return (
     <>
       <div>
-        <a href="https://farmfe.org/" target="_blank">
+        {/* <a href="https://farmfe.org/" target="_blank">
           <img src={FarmLogo} className="logo" alt="Farm logo" />
         </a>
         <a href="https://react.dev" target="_blank">
           <img src={reactLogo} className="logo react" alt="React logo" />
-        </a>
+        </a> */}
       </div>
       <h1>Farm + React</h1>
       <div className="card">

diff --git a/examples/vite-adapter-react/src/pages/index.tsx b/examples/vite-adapter-react/src/pages/index.tsx
@@ -4,7 +4,7 @@ import FarmLogo from '../assets/logo.png';
 import reactLogo from '../assets/react.svg';
 import './main.css';
 
- export default function () {
+export default function () {
   const [count, setCount] = useState(0);
   const go = useNavigate();
 

diff --git a/examples/vite-adapter-svelte/src/App.svelte b/examples/vite-adapter-svelte/src/App.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
-  import svelteLogo from './assets/svelte.svg'
-  import farmLogo from '/logo.png'
-  import Counter from './lib/Counter.svelte'
+  import svelteLogo from "./assets/svelte.svg";
+  import farmLogo from "/logo.png";
+  import Counter from "./lib/Counter.svelte";
 </script>
 
 <main>
-  <div>
+  <dbiv>
     <a href="https://farmfe.org" target="_blank" rel="noreferrer">
       <img src={farmLogo} class="logo" alt="Farm Logo" />
     </a>
     <a href="https://svelte.dev" target="_blank" rel="noreferrer">
       <img src={svelteLogo} class="logo svelte" alt="Svelte Logo" />
     </a>
-  </div>
+  </dbiv>
   <h1>Farm + Svelte</h1>
 
   <div class="card">
@@ -23,9 +23,7 @@
     Powered by <a href="https://farmfe.org">Farm</a> and svelet vite plugin
   </p>
 
-  <p class="read-the-docs">
-    Click on the Farm and Svelte logos to learn more
-  </p>
+  <p class="read-the-docs">Click on the Farm and Svelte logos to learn more</p>
 </main>
 
 <style>

diff --git a/examples/vite-adapter-vue/farm.config.ts b/examples/vite-adapter-vue/farm.config.ts
@@ -32,9 +32,10 @@ export default defineConfig({
     // persistentCache: false
     output:{
       path: "build",
-      publicPath: "/vue-public-path/",
+      // publicPath: "/vue-public-path/",
     },
-    persistentCache: false,
+    // persistentCache: false,
+    // lazyCompilation: false,
     sourcemap: false,
   },
   plugins: [

diff --git a/examples/vite-adapter-vue/package.json b/examples/vite-adapter-vue/package.json
@@ -15,8 +15,6 @@
     "vue-router": "^4.2.1"
   },
   "devDependencies": {
-    "@farmfe/cli": "workspace:*",
-    "@farmfe/core": "workspace:*",
     "@farmfe/js-plugin-less": "workspace:^",
     "@farmfe/js-plugin-postcss": "workspace:^",
     "@farmfe/js-plugin-sass": "workspace:^",

diff --git a/examples/vite-adapter-vue/src/App.vue b/examples/vite-adapter-vue/src/App.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <img src="/logo.png" alt="">
+    <img src="/logo.png" alt="" />
     <test />
     <test1 />
     <aboute />
-    <home/>
+    <home />
   </div>
   <router-view />
 </template>
 
 <script lang="ts" setup>
-import test1 from './components/test1.vue';
-import test from './components/test.vue';
-import home from './pages/index.vue';
-import aboute from '../deps/node_modules/my-ui/index.vue'
+import test1 from "./components/test1.vue";
+import test from "./components/test.vue";
+import home from "./pages/index.vue";
+import aboute from "../deps/node_modules/my-ui/index.vue";
 
-import './test';
+import "./test";
 </script>
 
 <style lang="scss" scoped>

diff --git a/examples/vite-adapter-vue/src/components/Formatter.vue b/examples/vite-adapter-vue/src/components/Formatter.vue
@@ -30,4 +30,4 @@ const format = async () => {
 
 <style lang="scss" scoped>
 /* build error */
-</style>
+</style>
diff --git a/examples/vue-antdv/src/main.vue b/examples/vue-antdv/src/main.vue
@@ -7,10 +7,10 @@
           <RouterLink to="/test">To Test</RouterLink>
         </a-menu-item>
         <a-menu-item key="2">
-          <RouterLink to="/">To Main</RouterLink>
+          <RouterLink to="/">To </RouterLink>
         </a-menu-item>
         <a-menu-item key="3">
-          <RouterLink to="/test1/test2">To Nest Test3</RouterLink>
+          <RouterLink to="/test1/test2">To Nest Test3222222</RouterLink>
         </a-menu-item>
       </a-menu>
     </a-layout-header>
@@ -122,4 +122,4 @@ export default defineComponent({
 .site-layout-background {
   background: #fff;
 }
-</style>
+</style>
diff --git a/examples/vue3/README.md b/examples/vue3/README.md
@@ -0,0 +1,37 @@
+# Farm + Vue
+
+This template should help you start developing using Vue and TypeScript in Farm.
+
+## Setup
+
+Install the dependencies:
+
+```bash
+pnpm install
+```
+
+## Get Started
+
+Start the dev server:
+
+```bash
+pnpm start
+```
+
+Build the app for production:
+
+```bash
+pnpm build
+```
+
+Preview the Production build product:
+
+```bash
+pnpm preview
+```
+
+Clear persistent cache local files
+
+```bash
+pnpm clean
+```