Merge branch 'main' into optimize/code

farm-fe · Apr 10, 2024 · a7fc47d · a7fc47d
2 parents 7191b32 + 49a7fe0
commit a7fc47d
Show file tree

Hide file tree

Showing 50 changed files with 249 additions and 90 deletions.
diff --git a/.changeset/polite-nails-remember.md b/.changeset/polite-nails-remember.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/compiler/CHANGELOG.md b/crates/compiler/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.5](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.4...farmfe_compiler-v0.0.5) - 2024-04-09
+
+### Other
+- updated the following local packages: farmfe_plugin_static_assets
+
 ## [0.0.4](https://github.com/farm-fe/farm/compare/farmfe_compiler-v0.0.3...farmfe_compiler-v0.0.4) - 2024-04-08
 
 ### Added

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "farmfe_compiler"
-version = "0.0.4"
+version = "0.0.5"
 edition = "2021"
 authors = ["brightwu(吴明亮) <1521488775@qq.com>"]
 license = "MIT"
@@ -19,7 +19,7 @@ farmfe_plugin_html = { path = "../plugin_html", version = "0.0.4" }
 farmfe_plugin_tree_shake = { path = "../plugin_tree_shake", version = "0.0.4" }
 farmfe_plugin_css = { path = "../plugin_css", version = "0.0.5" }
 farmfe_plugin_lazy_compilation = { path = "../plugin_lazy_compilation", version = "0.0.4" }
-farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.4" }
+farmfe_plugin_static_assets = { path = "../plugin_static_assets", version = "0.0.5" }
 farmfe_plugin_minify = { path = "../plugin_minify", version = "0.0.4" }
 farmfe_toolkit = { path = "../toolkit", version = "0.0.6" }
 farmfe_utils = { path = "../utils", version = "0.1.4" }

diff --git a/crates/plugin_static_assets/CHANGELOG.md b/crates/plugin_static_assets/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.5](https://github.com/farm-fe/farm/compare/farmfe_plugin_static_assets-v0.0.4...farmfe_plugin_static_assets-v0.0.5) - 2024-04-09
+
+### Fixed
+- static assets transform and sass import watch ([#1145](https://github.com/farm-fe/farm/pull/1145))
+
 ## [0.0.4](https://github.com/farm-fe/farm/compare/farmfe_plugin_static_assets-v0.0.3...farmfe_plugin_static_assets-v0.0.4) - 2024-04-08
 
 ### Other

diff --git a/crates/plugin_static_assets/Cargo.toml b/crates/plugin_static_assets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "farmfe_plugin_static_assets"
-version = "0.0.4"
+version = "0.0.5"
 edition = "2021"
 authors = ["brightwu(吴明亮) <1521488775@qq.com>"]
 license = "MIT"

diff --git a/crates/plugin_static_assets/src/lib.rs b/crates/plugin_static_assets/src/lib.rs
@@ -124,11 +124,6 @@ impl Plugin for FarmPluginStaticAssets {
   ) -> farmfe_core::error::Result<Option<farmfe_core::plugin::PluginLoadHookResult>> {
     let path = Path::new(param.resolved_path);
     let extension = path.extension().and_then(|s| s.to_str());
-    let is_query_valid = param.query.is_empty() || is_asset_query(&param.query);
-    // ignore invalid query
-    if !is_query_valid {
-      return Ok(None);
-    }
 
     if let Some(source) = param.resolved_path.strip_prefix(PUBLIC_ASSET_PREFIX) {
       return Ok(Some(farmfe_core::plugin::PluginLoadHookResult {

diff --git a/examples/public-dir/index.html b/examples/public-dir/index.html
@@ -1,17 +1,15 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  <div id="root"></div>
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <div id="root"></div>
 
-
-
-  <script src="./newPublic/test.js"></script>
-  <script src="./src/index.tsx"></script>
-</body>
+    <script src="./newPublic/test.js"></script>
+    <script src="./src/index.tsx"></script>
+  </body>
 </html>
diff --git a/examples/public-dir/package.json b/examples/public-dir/package.json
@@ -1,6 +1,7 @@
 {
-  "name": "public-dir",
+  "name": "@farmfe-examples/public-dir",
   "version": "1.0.0",
+  "private": true,
   "dependencies": {
     "clsx": "^1.2.1",
     "react": "18",

diff --git a/examples/sass/src/style/dep.scss b/examples/sass/src/style/dep.scss
@@ -5,4 +5,4 @@
   color: red;
   width: 200px;
   height: 50px;
-}
+}
diff --git a/examples/static-assets/.eslintrc.json b/examples/static-assets/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+  "root": true,
+  "extends": "../../.eslintrc.base.json",
+  "rules": {}
+}
diff --git a/examples/static-assets/.gitignore b/examples/static-assets/.gitignore
@@ -0,0 +1,2 @@
+dist
+build
diff --git a/examples/static-assets/farm.config.ts b/examples/static-assets/farm.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from '@farmfe/core';
+import sass from '@farmfe/js-plugin-sass';
+
+export default defineConfig({
+  plugins: [
+    sass({
+      legacy: true
+    })
+  ]
+})
diff --git a/examples/static-assets/index.html b/examples/static-assets/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <script src="./src/index.ts"></script>
+  </body>
+</html>
diff --git a/examples/static-assets/package.json b/examples/static-assets/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@farmfe-examples/static-assets",
+  "version": "0.0.1",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "@farmfe/cli": "workspace:*",
+    "@farmfe/core": "workspace:*",
+    "@farmfe/js-plugin-sass": "workspace:*"
+  },
+  "scripts": {
+    "start": "farm start",
+    "build": "farm build",
+    "preview": "farm preview"
+  }
+}
diff --git a/examples/static-assets/src/index.ts b/examples/static-assets/src/index.ts
@@ -0,0 +1,3 @@
+import './style/index.scss';
+
+document.body.innerHTML = '<div id="root"><div>Hello World</div></div>';
diff --git a/examples/static-assets/src/style/dep/font.scss b/examples/static-assets/src/style/dep/font.scss
@@ -0,0 +1,14 @@
+@font-face {
+  font-family: 'iconfont'; /* Project id 2208059 */
+  src: url('iconfont.woff2?t=1671895108120') format('woff2'),
+    url('iconfont.woff?t=1671895108120') format('woff'),
+    url('iconfont.ttf?t=1671895108120') format('truetype');
+}
+
+body {
+  font-family: 'iconfont';
+}
+
+body:before {
+  content: '\e620';
+}
diff --git a/examples/static-assets/src/style/dep/iconfont.ttf b/examples/static-assets/src/style/dep/iconfont.ttf
diff --git a/examples/static-assets/src/style/dep/iconfont.woff b/examples/static-assets/src/style/dep/iconfont.woff
diff --git a/examples/static-assets/src/style/dep/iconfont.woff2 b/examples/static-assets/src/style/dep/iconfont.woff2
diff --git a/examples/static-assets/src/style/index.scss b/examples/static-assets/src/style/index.scss
@@ -0,0 +1 @@
+@import './dep/font.scss';
diff --git a/js-plugins/sass/CHANGELOG.md b/js-plugins/sass/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @farmfe/js-plugin-sass
 
+## 2.5.4
+
+### Patch Changes
+
+- e1071eca: fix sass files watch and static assets transform
+- Updated dependencies [e1071eca]
+- Updated dependencies [6cbc9fa8]
+- Updated dependencies [2ada5819]
+  - @farmfe/core@1.0.16
+
 ## 2.5.3
 
 ### Patch Changes

diff --git a/js-plugins/sass/package.json b/js-plugins/sass/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/js-plugin-sass",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "support scss compile for farm.",
   "main": "./build/cjs/index.cjs",
   "types": "./build/cjs/index.d.ts",
@@ -46,13 +46,13 @@
   "license": "MIT",
   "devDependencies": {
     "@farmfe/cli": "workspace:*",
-    "@farmfe/core": "workspace:^1.0.11",
+    "@farmfe/core": "workspace:^1.0.16",
     "@farmfe/js-plugin-dts": "workspace:*",
     "sass": "^1.62.1",
     "sass-embedded": "^1.62.0"
   },
   "peerDependencies": {
-    "@farmfe/core": "workspace:^1.0.11",
+    "@farmfe/core": "workspace:^1.0.16",
     "sass": "^1.3.0",
     "sass-embedded": "*"
   }

diff --git a/js-plugins/sass/src/index.ts b/js-plugins/sass/src/index.ts
@@ -215,7 +215,9 @@ async function resolveDependency(
         ctx
       );
       if (result) return result;
-    } catch (_error) {}
+    } catch (_error) {
+      /* do nothing */
+    }
   }
 
   if (default_import_error) {
@@ -259,24 +261,29 @@ async function compileScss(param: CompileCssParams) {
     root
   } = param;
 
-  const { css, sourceMap } = (await sassImpl.compileStringAsync(
+  const { css, sourceMap, loadedUrls } = (await sassImpl.compileStringAsync(
     `${additionContext}\n${transformParam.content}`,
     {
       ...(options?.sassOptions ?? {}),
       sourceMap: options.sassOptions?.sourceMap ?? sourceMapEnabled,
       url: pathToFileURL(transformParam.resolvedPath),
       importers: [
         {
-          canonicalize(url, _) {
+          async canonicalize(url, _) {
             // file:///xxxx
             // /xxx
             // ./xxx
-            return pathToFileURL(normalizePath(url, root));
+            const normalizedPath = normalizePath(url, root);
+            const normalizedUrl = path.relative(root, normalizedPath);
+            const filePath = await resolveDependency(
+              normalizedUrl,
+              transformParam,
+              ctx
+            );
+            return pathToFileURL(filePath);
           },
           async load(canonicalUrl) {
-            const file = fileURLToPath(canonicalUrl);
-            const url = path.relative(root, file);
-            const filePath = await resolveDependency(url, transformParam, ctx);
+            const filePath = fileURLToPath(canonicalUrl);
             const { contents } = await rebaseUrls(
               filePath,
               transformParam.resolvedPath,
@@ -302,6 +309,14 @@ async function compileScss(param: CompileCssParams) {
     } as StringOptions<'async'>
   )) as CompileResult;
 
+  for (const fileUrl of loadedUrls) {
+    const file = fileURLToPath(fileUrl);
+
+    if (file === transformParam.resolvedPath) continue;
+
+    ctx.addWatchFile(transformParam.resolvedPath, file);
+  }
+
   return { css, sourceMap };
 }
 
@@ -323,15 +338,8 @@ async function compileScssLegacy(param: CompileCssParams) {
         sourceMap: options.sassOptions?.sourceMap ?? sourceMapEnabled,
         outFile: transformParam.resolvedPath,
         importer: [
-          function (url, importer, done) {
-            resolveDependency(
-              url,
-              {
-                ...transformParam,
-                moduleId: importer
-              },
-              ctx
-            ).then((resolvedPath) => {
+          function (url, _, done) {
+            resolveDependency(url, transformParam, ctx).then((resolvedPath) => {
               rebaseUrls(
                 resolvedPath,
                 transformParam.resolvedPath,
@@ -359,6 +367,11 @@ async function compileScssLegacy(param: CompileCssParams) {
           return;
         }
 
+        result.stats.includedFiles.forEach((file) => {
+          if (file === transformParam.resolvedPath) return;
+          ctx.addWatchFile(transformParam.resolvedPath, file);
+        });
+
         resolve({ css: result.css.toString(), sourceMap: result.map });
       }
     );

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

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

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @farmfe/core
 
+## 1.0.16
+
+### Patch Changes
+
+- e1071eca: fix sass files watch and static assets transform
+- 6cbc9fa8: resolve config file with set NODE_ENV
+- 2ada5819: Add parsing in alias to node_modules
+
 ## 1.0.15
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/core",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

diff --git a/packages/core/src/config/index.ts b/packages/core/src/config/index.ts
@@ -623,7 +623,8 @@ async function readConfigFile(
             progress: false
           }
         },
-        logger
+        logger,
+        inlineOptions.mode as CompilationMode
       );
 
       const compiler = new Compiler({

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -72,6 +72,7 @@ export async function build(
 ): Promise<void> {
   const logger = inlineConfig.logger ?? new Logger();
   setProcessEnv('production');
+
   const resolvedUserConfig = await resolveConfig(
     inlineConfig,
     logger,