diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel index 2617271fe..693b80d3e 100644 --- a/ts/editor/BUILD.bazel +++ b/ts/editor/BUILD.bazel @@ -19,10 +19,10 @@ filegroup( compile_svelte( name = "svelte", srcs = svelte_files, + visibility = ["//visibility:public"], deps = [ "//ts/components", ], - visibility = ["//visibility:public"], ) compile_sass( @@ -38,8 +38,8 @@ compile_sass( compile_sass( srcs = [ - "fields.scss", "color.scss", + "fields.scss", ], group = "base_css", visibility = ["//visibility:public"], @@ -56,11 +56,11 @@ compile_sass( "legacy.scss", ], group = "local_css", + visibility = ["//visibility:public"], deps = [ "//ts/sass:button_mixins_lib", "//ts/sass/bootstrap", ], - visibility = ["//visibility:public"], ) ts_library( @@ -128,18 +128,18 @@ esbuild( "--resolve-extensions=.mjs,.js", "--log-level=warning", ], - output_css = "editor.css", + entry_point = "index_wrapper.ts", external = [ "protobufjs/light", ], - entry_point = "index_wrapper.ts", + output_css = "editor.css", visibility = ["//visibility:public"], deps = [ "base_css", "bootstrap-icons", - "mdi-icons", "editor_ts", "local_css", + "mdi-icons", "svelte_components", "//ts/components", "//ts/components:svelte_components", @@ -177,9 +177,4 @@ svelte_check( "//ts/components:svelte_components", "@npm//@types/bootstrap", ], - target_compatible_with = select({ - "@platforms//os:osx": [], - "@platforms//os:linux": [], - "//conditions:default": ["@platforms//os:linux"], - }), ) diff --git a/ts/svelte/svelte.bzl b/ts/svelte/svelte.bzl index 61dc14994..27610ad88 100644 --- a/ts/svelte/svelte.bzl +++ b/ts/svelte/svelte.bzl @@ -78,7 +78,7 @@ def compile_svelte(name, srcs, deps = [], visibility = ["//visibility:private"]) visibility = visibility, ) -def svelte_check(name = "svelte_check", srcs = [], target_compatible_with = []): +def svelte_check(name = "svelte_check", srcs = []): _svelte_check( name = name, args = [ @@ -95,5 +95,11 @@ def svelte_check(name = "svelte_check", srcs = [], target_compatible_with = []): "@npm//sass", ] + srcs, env = {"SASS_PATH": "$(rootpath //ts:tsconfig.json)/../.."}, - target_compatible_with = target_compatible_with, + # a lack of sandboxing on Windows breaks the local svelte_check + # tests, so we need to disable them on Windows for now + target_compatible_with = select({ + "@platforms//os:osx": [], + "@platforms//os:linux": [], + "//conditions:default": ["@platforms//os:linux"], + }), )