Merge pull request #91 from melange-re/playground/deploy

playground: deploy
melange-re · Aug 15, 2023 · 242d7ac · 242d7ac
1 parent 42977c7
commit 242d7ac
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,6 +16,12 @@ jobs:
         with:
           python-version: 3.x
       - run: python3 -m pip install -r ./pip-requirements.txt
+      - uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: 4.14.x
+          dune-cache: true
+      - name: Build playground
+        run: make build-playground
       - name: Configure Git user
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"

diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml
@@ -14,6 +14,12 @@ jobs:
         with:
           python-version: 3.x
       - run: python3 -m pip install -r ./pip-requirements.txt
+      - uses: ocaml/setup-ocaml@v2
+        with:
+          ocaml-compiler: 4.14.x
+          dune-cache: true
+      - name: Build playground
+        run: make build-playground
       - name: Configure Git user
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ _build
 _opam
 .vscode
 .DS_Store
+
+docs/playground
diff --git a/Makefile b/Makefile
@@ -39,3 +39,8 @@ format: ## Format the codebase with ocamlformat
 .PHONY: format-check
 format-check: ## Checks if format is correct
 	$(DUNE) build @fmt
+
+.PHONY: build-playground
+build-playground: install ## Builds the playground
+	$(DUNE) build @playground-assets
+	cd playground && yarn && yarn build
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -30,8 +30,8 @@ nav:
   - Reference:
     - API: api.md
   - Try:
-    - Playground: try.md
-  - Talk:
+    - Playground: playground
+  - About:
     - Community: community.md
 
 extra_css:

diff --git a/playground/README.md b/playground/README.md
@@ -18,9 +18,3 @@ cd playground && yarn dev
 ```
 
 To build, `yarn build`.
-
-## TODO
-
-* Documentation
-* Tests
-* Themeability
diff --git a/playground/index.html b/playground/index.html
@@ -5,7 +5,7 @@
     <!-- Example of public static images -->
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>Melange Playground</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/playground/package.json b/playground/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
+    "build": "vite build --emptyOutDir",
     "preview": "vite preview"
   },
   "dependencies": {

diff --git a/playground/vite.config.ts b/playground/vite.config.ts
@@ -3,5 +3,9 @@ import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()]
+  plugins: [react()],
+  build: {
+    outDir: "../docs/playground",
+  },
+  base: "./",
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,5 @@ _build @@
     _opam
     .vscode
     .DS_Store
+    docs/playground