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

pref: remove regexp external in node_polyfill #998

Merged
merged 1 commit into from
Mar 27, 2024
Merged

pref: remove regexp external in node_polyfill #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions crates/mako/src/plugins/farm_tree_shake/shake/module_concatenate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ pub fn optimize_module_graph(

GLOBALS.set(&context.meta.script.globals, || {
for config in &concat_configurations {
if cfg!(debug_assertions) {
dbg!(&config);
}
let mut module_items: Vec<ModuleItem> = Vec::new();

let mut concatenate_context = ConcatenateContext::default();
Expand All @@ -251,14 +248,6 @@ pub fn optimize_module_graph(

let import_source_to_module_id = source_to_module_id(id, module_graph);

if cfg!(debug_assertions) {
println!("\n*** start for {}", id.id);
println!(
"config.external_interops(id) {:?} ",
&config.external_interops(id)
);
}

if let Some(interop) = config.external_interops(id) {
let base_name = uniq_module_prefix(id);
let runtime_flags: RuntimeFlags = interop.into();
Expand Down
23 changes: 6 additions & 17 deletions crates/mako/src/plugins/node_polyfill.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ use std::path::Path;
use mako_core::anyhow::Result;

use crate::compiler::Args;
use crate::config::{
Config, ExternalAdvanced, ExternalAdvancedSubpath, ExternalAdvancedSubpathRule,
ExternalAdvancedSubpathTarget, ExternalConfig,
};
use crate::config::{Config, ExternalConfig};
use crate::plugin::Plugin;

pub struct NodePolyfillPlugin {}
Expand All @@ -27,20 +24,12 @@ impl Plugin for NodePolyfillPlugin {
// empty modules
for name in get_empty_modules().iter() {
// e.g. support fs and fs/promise
config
.externals
.insert(name.to_string(), ExternalConfig::Basic("".to_string()));
config.externals.insert(
name.to_string(),
ExternalConfig::Advanced(ExternalAdvanced {
root: "".into(),
script: None,
subpath: Some(ExternalAdvancedSubpath {
rules: vec![ExternalAdvancedSubpathRule {
regex: ".*".into(),
target: ExternalAdvancedSubpathTarget::Empty,
target_converter: None,
}],
exclude: None,
}),
}),
format!("{name}/promise"),
ExternalConfig::Basic("".to_string()),
);
}
// identifier
Expand Down
Loading