Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: hot-update 文件生成放到 node_modules 下 #424

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

feat: hot-update 文件生成放到 node_modules 下 #424

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2c1cc45
feat: hot-update 文件生成放到 node_modules 下
Sep 7, 2023
8e4c23b
Merge branch 'master' of https://github.com/umijs/mako into feat/0906_CY
Sep 7, 2023
caf9838
Merge branch 'master' of https://github.com/umijs/mako into feat/0906_CY
Sep 7, 2023
0bea63d
Merge branch 'master' of https://github.com/umijs/mako into feat/0906_CY
Sep 7, 2023
b79b5ca
feat: hot-update 文件生成放到 node_modules 下
Sep 10, 2023
9840c18
feat: hot-update 文件生成放到 node_modules 下
Sep 10, 2023
583d3e0
test: 更新单测快照
Sep 10, 2023
7d5f0b3
merge: 合并master
HiLanXiao Sep 10, 2023
ae9e4fb
Merge branch 'master' of https://github.com/umijs/mako into feat/0906_CY
Sep 11, 2023
2befd13
test: 更新单测快照
Sep 11, 2023
8f097f7
test: 更新单测快照
Sep 11, 2023
5d1e91e
feat: 优化下hmr server 的匹配逻辑
HiLanXiao Sep 12, 2023
7bca4dc
feat: 去除hmr req的hot_update前缀
Sep 13, 2023
39ac097
test: 更新单测快照
Sep 13, 2023
0a84860
feat: dev server 优化
Sep 15, 2023
b70b89a
feat: 更新单测快照
Sep 16, 2023
859e09f
feat: 更新单测快照
Sep 16, 2023
1f17c10
feat: 回退运行时变更，禁止用户配置不以 / 开头的 publicPath
Sep 17, 2023
edea548
test: 更新单测和快照
Sep 17, 2023
001c95f
feat: 回退禁止用户配置不以 / 开头的 publicPath的变更
Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 40 additions & 27 deletions crates/mako/src/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::io::Error as IoError;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Instant;
Expand Down Expand Up @@ -79,6 +80,41 @@ impl DevServer {
let static_serve =
hyper_staticfile::Static::new(for_fn.context.config.output.path.clone());

let static_serve_hmr =
hyper_staticfile::Static::new(for_fn.context.root.join("node_modules/.mako"));

let get_serve_response = |serve_result: Result<
hyper::Response<hyper::Body>,
IoError,
>| {
match serve_result {
Ok(mut res) => {
if let Some(content_type) = res.headers().get(CONTENT_TYPE).cloned() {
if let Ok(c_str) = content_type.to_str() {
if c_str.contains("javascript") || c_str.contains("text") {
res.headers_mut()
.insert(
CONTENT_TYPE,
HeaderValue::from_str(&format!(
"{c_str}; charset=utf-8"
))
.unwrap(),
)
.unwrap();
}
}
}
Ok(res)
}
Err(_) => Ok::<_, hyper::Error>(
hyper::Response::builder()
.status(hyper::StatusCode::NOT_FOUND)
.body(hyper::Body::from("404 - Page not found"))
.unwrap(),
),
}
};

match path {
"__/hmr-ws" => {
if hyper_tungstenite::is_upgrade_request(&req) {
Expand All @@ -102,35 +138,12 @@ impl DevServer {
)
}
}
_ if path.starts_with("hot_update") => {
get_serve_response(static_serve_hmr.serve(req).await)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

之前 dev server 也写的仓促，有时间精力可以看下这部分有没有更加优雅的 crate 可以用。类似 express 一样 mout 。

}
_ => {
// try chunk content in memory first, else use dist content
match static_serve.serve(req).await {
Ok(mut res) => {
if let Some(content_type) = res.headers().get(CONTENT_TYPE).cloned()
{
if let Ok(c_str) = content_type.to_str() {
if c_str.contains("javascript") || c_str.contains("text") {
res.headers_mut()
.insert(
CONTENT_TYPE,
HeaderValue::from_str(&format!(
"{c_str}; charset=utf-8"
))
.unwrap(),
)
.unwrap();
}
}
}
Ok(res)
}
Err(_) => Ok::<_, hyper::Error>(
hyper::Response::builder()
.status(hyper::StatusCode::NOT_FOUND)
.body(hyper::Body::from("404 - Page not found"))
.unwrap(),
),
}
get_serve_response(static_serve.serve(req).await)
}
}
}
Expand Down
27 changes: 20 additions & 7 deletions crates/mako/src/generate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ impl Compiler {
let (code, sourcemap) =
self.generate_hmr_chunk(chunk, &filename, &modified_ids, current_full_hash)?;
// TODO the final format should be {name}.{full_hash}.hot-update.{ext}
self.write_to_dist(&filename, code);
self.write_to_dist(format!("{}.map", &filename), sourcemap);
self.write_to_hot_update_dir(&filename, code);
self.write_to_hot_update_dir(format!("{}.map", &filename), sourcemap);
}
}
let t_generate_hmr_chunk = t_generate_hmr_chunk.elapsed();

self.write_to_dist(
self.write_to_hot_update_dir(
format!("{}.hot-update.json", last_full_hash),
serde_json::to_string(&HotUpdateManifest {
removed_chunks,
Expand Down Expand Up @@ -372,15 +372,28 @@ impl Compiler {
Ok(current_full_hash)
}

pub fn write_to_dist<P: AsRef<std::path::Path>, C: AsRef<[u8]>>(
// pub fn write_to_dist<P: AsRef<std::path::Path>, C: AsRef<[u8]>>(
// &self,
// filename: P,
// content: C,
// ) {
// let to = self.context.config.output.path.join(filename);

// std::fs::write(to, content).unwrap();
// }

pub fn write_to_hot_update_dir<P: AsRef<std::path::Path>, C: AsRef<[u8]>>(
&self,
filename: P,
content: C,
) {
let to = self.context.config.output.path.join(filename);

std::fs::write(to, content).unwrap();
let hmr_dir = self.context.root.join("node_modules/.mako/hot_update");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里用 node_modules/.mako，是不是 runtime 就不需要调整了，改动可以小一点。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好像是可以的，我再调整下

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 如果用 node_modules/.mako，runtime 还是需要改的：不放到 output 目录下了，得把 requireModule.publicPath 去掉。
  • 我这里还是保留 /hot_update 呢，感觉语义更清晰些

if !hmr_dir.exists() {
fs::create_dir_all(&hmr_dir).unwrap();
}
std::fs::write(hmr_dir.join(filename), content).unwrap();
}

// 写入产物前记录 content 大小, 并加上 hash 值
pub fn write_to_dist_with_stats(&self, file: EmitFile) {
let to: PathBuf = self.context.config.output.path.join(file.hashname.clone());
Expand Down
7 changes: 2 additions & 5 deletions crates/mako/src/runtime/runtime_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate() {},
check() {
const current_hash = requireModule.currentHash();

return fetch(
`${requireModule.publicPath}${current_hash}.hot-update.json`,
)
return fetch(`/hot_update/${current_hash}.hot-update.json`)
.then((res) => {
return res.json();
})
Expand All @@ -194,7 +191,7 @@ function createRuntime(makoModules, entryModuleId) {
].join('.');

return new Promise((done) => {
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}),
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里写死 会不会和用户的路由有冲突。业务有一个 hot_update/:id 的路由。这里可以参考下 umi 在 配置了 publicPath 这些资源是怎么 serve 的

原来 public_path 下 也可能定义 /:id

return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_class.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_dynamic_import.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -163,7 +163,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_export_default.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_export_namespace.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_exported.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_fn.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_issues_271.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_named_export.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_named_reexport.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
4 changes: 2 additions & 2 deletions crates/mako/src/snapshots/mako__tree_shaking__tests__tree_shaking_reexport.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function createRuntime(makoModules, entryModuleId) {
invalidate () {},
check () {
const current_hash = requireModule.currentHash();
return fetch(`${requireModule.publicPath}${current_hash}.hot-update.json`).then((res)=>{
return fetch(`/hot_update/${current_hash}.hot-update.json`).then((res)=>{
return res.json();
}).then((update)=>{
return Promise.all(update.c.map((chunk)=>{
Expand All @@ -162,7 +162,7 @@ function createRuntime(makoModules, entryModuleId) {
ext
].join('.');
return new Promise((done)=>{
const url = `${requireModule.publicPath}${hotChunkName}`;
const url = `/hot_update/${hotChunkName}`;
requireModule.loadScript(url, done);
});
}));
Expand Down
Loading