From ad5b08f007f4c79a2ac69d8138dff1ba5907d644 Mon Sep 17 00:00:00 2001
From: DogeisCut <23178844+DogeisCut@users.noreply.github.com>
Date: Fri, 3 Apr 2026 18:24:44 -0600
Subject: [PATCH 01/10] really broken svelte setup
---
.github/workflows/ci.yml | 56 +
.github/workflows/webpack.yml | 48 -
index.html | 25 +
package-lock.json | 5806 +++++++--------------------------
package.json | 17 +-
src/editor.ts | 272 +-
src/global.d.ts | 4 +
src/index.html | 115 +-
src/main.ts | 7 +
src/ui/Editor.svelte | 1 +
tsconfig.json | 6 +-
vite.config.ts | 12 +
webpack.config.js | 75 -
13 files changed, 1283 insertions(+), 5161 deletions(-)
create mode 100644 .github/workflows/ci.yml
delete mode 100644 .github/workflows/webpack.yml
create mode 100644 index.html
create mode 100644 src/global.d.ts
create mode 100644 src/main.ts
create mode 100644 src/ui/Editor.svelte
create mode 100644 vite.config.ts
delete mode 100644 webpack.config.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..064f69f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,56 @@
+name: CI
+
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Use Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version: '18'
+ cache: 'npm'
+
+ - name: Install dependencies
+ run: npm ci
+
+ - name: Run build
+ run: npm run build --if-present
+
+ - name: Upload build artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: site-dist
+ path: dist
+
+ deploy:
+ needs: build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Download artifact
+ uses: actions/download-artifact@v4
+ with:
+ name: site-dist
+
+ - name: Configure Pages
+ uses: actions/configure-pages@v3
+
+ - name: Upload artifact for Pages
+ uses: actions/upload-pages-artifact@v1
+ with:
+ path: ./dist
+
+ - name: Deploy to GitHub Pages
+ uses: actions/deploy-pages@v1
diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml
deleted file mode 100644
index fac0683..0000000
--- a/.github/workflows/webpack.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Deploy Webpack to GitHub Pages
-
-on:
- push:
- branches: ["main"]
-
-permissions:
- contents: read
- pages: write
- id-token: write
-
-concurrency:
- group: "pages"
- cancel-in-progress: true
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
-
- - name: Setup Node.js
- uses: actions/setup-node@v4
- with:
- node-version: 20
- cache: 'npm'
-
- - name: Install and Build
- run: |
- npm ci
- npx webpack --mode production
-
- - name: Upload artifact
- uses: actions/upload-pages-artifact@v3
- with:
- # This points to your output folder
- path: ./dist
-
- deploy:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
- needs: build
- steps:
- - name: Deploy to GitHub Pages
- id: deployment
- uses: actions/deploy-pages@v4
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..6e98297
--- /dev/null
+++ b/index.html
@@ -0,0 +1,25 @@
+
+
+
+
+ MarchBlocks
+
-
-
- #bae6f3
-
-
-
-
- 0
- 1
- -5
-
-
-
-
- 0
-
-
-
-
- 0
-
-
- sin
-
-
- 0
-
-
-
-
- 0
-
-
-
-
- 90
-
-
-
-
-
-
-
-
- -5
-
-
-
-
-
-
- 2
-
-
-
-
- 0
-
-
-
-
- 0
-
-
- cos
-
-
- 0
-
-
-
-
- 0
-
-
-
-
- 90
-
-
-
-
-
-
-
-
- -5
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
- 23
-
-
-
-
- 0
-
-
-
-
- 0
-
-
-
-
- 90
-
-
-
-
-
-
- 0
-
-
-
-
-
-
- 75
-
-
-
-
- FALSE
-
-
-
-
-
-
-
-
-
-
- 1
- 1
- 1
-
-
-
-
-
-
-
-
-
-`
-
-Blockly.Xml.domToWorkspace(defaultWorkspaceElement, ws)
-
-ws.addChangeListener(Blockly.Events.disableOrphans);
-// its in a weird spot now because of the floating preview
-//ws.centerOnBlock("scene")
-
-if (ws) {
- ws.addChangeListener((e: Blockly.Events.Abstract) => {
- if (
- e.isUiEvent ||
- e.type == Blockly.Events.FINISHED_LOADING ||
- ws.isDragging()
- ) {
- return;
- }
- Compiler.compile(ws);
- });
-}
-
-const canvas = document.querySelector('#raymarcherDiv canvas') as HTMLCanvasElement;
-
-(window as any).Blockly = Blockly;
-(window as any).Workspace = ws;
-(window as any).Serializer = Serializer;
-(window as any).Canvas = canvas;
-(window as any).saveAs = function () {
- Serializer.createFile(ws, "Untitled Project", canvas).then(blob => { // temp
- const a = document.createElement('a');
- a.href = URL.createObjectURL(blob);
- a.download = 'Untitled Project.mblks';
- a.click();
- URL.revokeObjectURL(a.href);
- });
-}
+export { Serializer, Compiler };
// might replace this with react based UI at some point
// TODO: fix corner resize
@@ -303,7 +43,7 @@ class MarchBlocksUI {
this.header = document.getElementById('widgetHeader')!;
this.container = document.getElementById('pageContainer')!;
this.fullscreenBtn = document.getElementById('fullscreenBtn') as HTMLButtonElement;
- this.canvas = canvas;
+ this.canvas = null as any;
this.initDraggable();
this.initFullscreen();
@@ -413,8 +153,4 @@ class MarchBlocksUI {
this.canvas.height = this.projectHeight;
}
}
-}
-
-window.addEventListener('DOMContentLoaded', () => {
- new MarchBlocksUI();
-});
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/global.d.ts b/src/global.d.ts
new file mode 100644
index 0000000..58551a9
--- /dev/null
+++ b/src/global.d.ts
@@ -0,0 +1,4 @@
+declare module '*.svelte' {
+ const component: any;
+ export default component;
+}
diff --git a/src/index.html b/src/index.html
index 58d73a2..373eca0 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,101 +6,28 @@
MarchBlocks
-
-