mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-26 00:01:37 +00:00
synchronize hub script is moved to new windmill cli
This commit is contained in:
@@ -0,0 +1 @@
|
||||
-- Add down migration script here
|
||||
File diff suppressed because one or more lines are too long
@@ -29,7 +29,11 @@ const p = {
|
||||
const filter = new RegExp(
|
||||
`^(?!\\.\/main\\.ts)(?!${cdir}\/main\\.ts)(?!(?:/private)?${cdirNoPrivate}\/wrapper\\.mjs).*\\.ts$`
|
||||
);
|
||||
let cdirNodeModules = `${cdir}/node_modules/`;
|
||||
build.onResolve({ filter }, (args) => {
|
||||
if (args.importer?.startsWith(cdirNodeModules)) {
|
||||
return undefined;
|
||||
}
|
||||
const file_path =
|
||||
args.importer == "./main.ts" || args.importer == resolve("./main.ts")
|
||||
? current_path
|
||||
|
||||
@@ -38,5 +38,4 @@ export * as http from "node:http";
|
||||
export { WebSocketServer, WebSocket } from "npm:ws";
|
||||
|
||||
export * as open from "npm:open";
|
||||
export { default as gitignore_parser } from "npm:gitignore-parser";
|
||||
export * as esMain from "npm:es-main";
|
||||
|
||||
+5
-27
@@ -21,7 +21,6 @@ import {
|
||||
yamlParse,
|
||||
ScheduleService,
|
||||
SEP,
|
||||
gitignore_parser,
|
||||
UserService,
|
||||
GroupService,
|
||||
} from "./deps.ts";
|
||||
@@ -817,31 +816,12 @@ export async function ignoreF(wmillconf: {
|
||||
},
|
||||
};
|
||||
}
|
||||
let ign:
|
||||
| {
|
||||
denies(file: string): boolean;
|
||||
}
|
||||
| undefined = undefined;
|
||||
|
||||
try {
|
||||
const ignoreContent = await Deno.readTextFile(".wmillignore");
|
||||
const condensed = ignoreContent
|
||||
.split("\n")
|
||||
.filter((l) => l != "" && !l.startsWith("#"))
|
||||
.join(", ");
|
||||
log.info(
|
||||
colors.gray(
|
||||
`(Deprecated, use wmill.yaml/includes instead) Using .wmillignore file (${condensed})`
|
||||
)
|
||||
);
|
||||
ign = gitignore_parser.compile(ignoreContent);
|
||||
} catch {}
|
||||
|
||||
if (ign && whitelist) {
|
||||
log.error(
|
||||
"Cannot have both .wmillignore and wmill.yaml/includes or excludes, ignoring .wmillignore"
|
||||
);
|
||||
ign = undefined;
|
||||
await Deno.stat(".wmillignore");
|
||||
throw Error(".wmillignore is not supported anymore, switch to wmill.yaml");
|
||||
} catch {
|
||||
//expected
|
||||
}
|
||||
|
||||
// new Gitignore.default({ initialRules: ignoreContent.split("\n")}).ignoreContent).compile();
|
||||
@@ -849,9 +829,7 @@ export async function ignoreF(wmillconf: {
|
||||
return (
|
||||
!isWhitelisted(p) &&
|
||||
(isNotWmillFile(p, isDirectory) ||
|
||||
(!isDirectory &&
|
||||
((whitelist != undefined && !whitelist.approve(p)) ||
|
||||
(ign != undefined && ign.denies(p)))))
|
||||
(!isDirectory && whitelist != undefined && !whitelist.approve(p)))
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
<div class="w-full flex flex-col gap-1 h-full overflow-y-auto p">
|
||||
{#if savedInputs === undefined}
|
||||
<Skeleton layout={[[8]]} />
|
||||
{:else if savedInputs.length > 0}
|
||||
{:else if savedInputs?.length > 0}
|
||||
{#each savedInputs as i}
|
||||
<button
|
||||
class={classNames(
|
||||
@@ -324,7 +324,7 @@
|
||||
<div class="w-full flex flex-col gap-1 p-0 h-full overflow-y-auto">
|
||||
{#if loading && (jobs == undefined || jobs?.length == 0)}
|
||||
<div class="text-left text-tertiary text-xs">Loading current runs...</div>
|
||||
{:else if jobs.length > 0}
|
||||
{:else if jobs?.length > 0}
|
||||
{#each jobs as i (i.id)}
|
||||
<button
|
||||
class={classNames(
|
||||
@@ -379,7 +379,7 @@
|
||||
</div>
|
||||
</button>
|
||||
{/each}
|
||||
{#if jobs.length == 5}
|
||||
{#if jobs?.length == 5}
|
||||
<div class="text-left text-tertiary text-xs"
|
||||
>... there may be more runs not displayed here as the limit is 5</div
|
||||
>
|
||||
@@ -392,7 +392,7 @@
|
||||
<div class="w-full flex flex-col gap-1 p-0 h-full overflow-y-auto">
|
||||
{#if previousInputs === undefined}
|
||||
<Skeleton layout={[[8]]} />
|
||||
{:else if previousInputs.length > 0}
|
||||
{:else if previousInputs?.length > 0}
|
||||
{#each previousInputs as i (i.id)}
|
||||
<button
|
||||
class={classNames(
|
||||
|
||||
@@ -72,6 +72,7 @@
|
||||
import GfmMarkdown from '$lib/components/GfmMarkdown.svelte'
|
||||
import EmailTriggerPanel from '$lib/components/details/EmailTriggerPanel.svelte'
|
||||
import Star from '$lib/components/Star.svelte'
|
||||
import LogViewer from '$lib/components/LogViewer.svelte'
|
||||
|
||||
let script: Script | undefined
|
||||
let topHash: string | undefined
|
||||
@@ -578,15 +579,16 @@
|
||||
{#if script.lock_error_logs || topHash || script.archived || script.deleted}
|
||||
<div class="flex flex-col gap-2 my-2">
|
||||
{#if script.lock_error_logs}
|
||||
<div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4" role="alert">
|
||||
<div
|
||||
class="bg-red-100 dark:bg-red-700 border-l-4 border-red-500 p-4"
|
||||
role="alert"
|
||||
>
|
||||
<p class="font-bold">Error deploying this script</p>
|
||||
<p>
|
||||
This script has not been deployed successfully because of the following
|
||||
errors:
|
||||
</p>
|
||||
<pre class="w-full text-xs mt-2 whitespace-pre-wrap"
|
||||
>{script.lock_error_logs}</pre
|
||||
>
|
||||
<LogViewer content={script.lock_error_logs} isLoading={false} tag={undefined} />
|
||||
</div>
|
||||
{/if}
|
||||
{#if topHash}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -717,10 +717,10 @@ const config = {
|
||||
}
|
||||
},
|
||||
input: {
|
||||
backgroundColor: 'rgb(var(--color-surface-secondary)) !important'
|
||||
backgroundColor: 'rgb(var(--color-surface-secondary) / 30%) !important'
|
||||
},
|
||||
textarea: {
|
||||
backgroundColor: 'rgb(var(--color-surface-secondary)) !important'
|
||||
backgroundColor: 'rgb(var(--color-surface-secondary) / 30%) !important'
|
||||
}
|
||||
})
|
||||
addComponents({
|
||||
|
||||
Reference in New Issue
Block a user