mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-12 08:05:44 +00:00
fix: bun default registry and performance improvements
This commit is contained in:
@@ -291,7 +291,8 @@ lazy_static::lazy_static! {
|
||||
}
|
||||
|
||||
pub fn remove_pinned_imports(code: &str) -> anyhow::Result<String> {
|
||||
let imports = parse_expr_for_imports(code)?;
|
||||
let mut imports = parse_expr_for_imports(code)?;
|
||||
imports.sort_by_key(|f| 0 - (f.len() as i32));
|
||||
let mut content = code.to_string();
|
||||
for import in imports {
|
||||
let to_c = IMPORTS_VERSION.captures(&import);
|
||||
|
||||
@@ -19,7 +19,6 @@ if (!bo.success) {
|
||||
content.replaceAll("__require", "require")
|
||||
);
|
||||
|
||||
const { intersect } = require("semver-intersect");
|
||||
const dependencies: Record<string, string[]> = {};
|
||||
for (const i of imports) {
|
||||
let [_, name, version] = i.path.match(captureVersion) ?? [];
|
||||
@@ -47,15 +46,23 @@ if (!bo.success) {
|
||||
}
|
||||
const resolvedDeps: Record<string, string> = {};
|
||||
for (const i in dependencies) {
|
||||
const versions = dependencies[i];
|
||||
resolvedDeps[i] =
|
||||
dependencies[i].length == 0
|
||||
versions.length == 0
|
||||
? "latest"
|
||||
: dependencies[i].reduce((a, b) => {
|
||||
return intersect(a, b);
|
||||
});
|
||||
: versions.length == 1
|
||||
? versions[0]
|
||||
: reduceIntersect(versions);
|
||||
}
|
||||
await Bun.write(
|
||||
"./package.json",
|
||||
JSON.stringify({ dependencies: resolvedDeps }, null, 2)
|
||||
);
|
||||
|
||||
function reduceIntersect(versions: string[]): string {
|
||||
const { intersect } = require("semver-intersect");
|
||||
return versions.reduce((a, b) => {
|
||||
return intersect(a, b);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,12 +190,12 @@ async fn gen_bunfig(job_dir: &str) -> Result<()> {
|
||||
let (url, token_opt) = if let Some(ref s) = registry {
|
||||
let url = s.trim();
|
||||
if url.is_empty() {
|
||||
("https://registry.npmjs.org".to_string(), None)
|
||||
("https://registry.npmjs.org/".to_string(), None)
|
||||
} else {
|
||||
parse_npm_config(s)
|
||||
}
|
||||
} else {
|
||||
("https://registry.npmjs.org".to_string(), None)
|
||||
("https://registry.npmjs.org/".to_string(), None)
|
||||
};
|
||||
let registry_toml_string = if let Some(token) = token_opt {
|
||||
format!("{{ url = \"{url}\", token = \"{token}\" }}")
|
||||
|
||||
@@ -127,7 +127,7 @@ export const settings: Record<string, Setting[]> = {
|
||||
description: 'Add private NPM registry',
|
||||
key: 'npm_config_registry',
|
||||
fieldType: 'text',
|
||||
placeholder: 'https://yourregistry',
|
||||
placeholder: 'https://registry.npmjs.org/:_authToken=npm_FOOBAR',
|
||||
storage: 'setting',
|
||||
ee_only: ''
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user