From 698bc1768046a5864ab21a70033d86eee54eb8b4 Mon Sep 17 00:00:00 2001 From: frederik Date: Wed, 28 Aug 2024 13:50:40 +0200 Subject: [PATCH 1/3] add live server --- .gitmodules | 4 ++++ extensions.toml | 4 ++++ extensions/zed-live-server | 1 + 3 files changed, 9 insertions(+) create mode 160000 extensions/zed-live-server diff --git a/.gitmodules b/.gitmodules index ef2cf30fb1..b22cdca200 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1082,6 +1082,10 @@ path = extensions/zed url = https://github.com/zed-industries/zed.git +[submodule "extensions/zed-live-server"] + path = extensions/zed-live-server + url = https://github.com/frederik-uni/zed-live-server + [submodule "extensions/zedokai"] path = extensions/zedokai url = https://github.com/slymax/zedokai.git diff --git a/extensions.toml b/extensions.toml index 4b6dff564e..8a393587e9 100644 --- a/extensions.toml +++ b/extensions.toml @@ -576,6 +576,10 @@ version = "0.0.4" submodule = "extensions/liquid" version = "0.0.1" +[live-server] +submodule = "extensions/zed-live-server" +version = "0.3.0" + [log] submodule = "extensions/log" version = "0.0.6" diff --git a/extensions/zed-live-server b/extensions/zed-live-server new file mode 160000 index 0000000000..2cdc457550 --- /dev/null +++ b/extensions/zed-live-server @@ -0,0 +1 @@ +Subproject commit 2cdc457550262c3a88007fad9f0745deced59960 From 6b06207dfd881929baf259c06befcd0dda8cf5a8 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 30 Aug 2024 10:09:34 -0400 Subject: [PATCH 2/3] Remove old submodule --- .gitmodules | 4 ---- extensions.toml | 2 +- extensions/zed-live-server | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 160000 extensions/zed-live-server diff --git a/.gitmodules b/.gitmodules index 5c5914cde9..5c691671f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1110,10 +1110,6 @@ path = extensions/zed url = https://github.com/zed-industries/zed.git -[submodule "extensions/zed-live-server"] - path = extensions/zed-live-server - url = https://github.com/frederik-uni/zed-live-server - [submodule "extensions/zedokai"] path = extensions/zedokai url = https://github.com/slymax/zedokai.git diff --git a/extensions.toml b/extensions.toml index efe1657185..fec6c575ec 100644 --- a/extensions.toml +++ b/extensions.toml @@ -593,7 +593,7 @@ submodule = "extensions/liquid" version = "0.0.1" [live-server] -submodule = "extensions/zed-live-server" +submodule = "extensions/live-server" version = "0.3.0" [log] diff --git a/extensions/zed-live-server b/extensions/zed-live-server deleted file mode 160000 index 2cdc457550..0000000000 --- a/extensions/zed-live-server +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2cdc457550262c3a88007fad9f0745deced59960 From 5b5df9c025a804e865f3c8014e13e3d03a16a574 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 30 Aug 2024 10:09:55 -0400 Subject: [PATCH 3/3] Re-add submodule --- .gitmodules | 4 ++++ extensions/live-server | 1 + 2 files changed, 5 insertions(+) create mode 160000 extensions/live-server diff --git a/.gitmodules b/.gitmodules index 5c691671f7..21cb08966a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -526,6 +526,10 @@ path = extensions/liquid url = https://github.com/TheBeyondGroup/zed-shopify-liquid.git +[submodule "extensions/live-server"] + path = extensions/live-server + url = https://github.com/frederik-uni/zed-live-server.git + [submodule "extensions/log"] path = extensions/log url = https://github.com/nervenes/zed-log.git diff --git a/extensions/live-server b/extensions/live-server new file mode 160000 index 0000000000..2cdc457550 --- /dev/null +++ b/extensions/live-server @@ -0,0 +1 @@ +Subproject commit 2cdc457550262c3a88007fad9f0745deced59960