Monorepo setup

LeahHirst · Sep 18, 2024 · a2b6ae7 · a2b6ae7
1 parent da18615
commit a2b6ae7
Show file tree

Hide file tree

Showing 244 changed files with 22,600 additions and 59,012 deletions.
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install, build, and upload your site
         uses: withastro/action@v3
         with:
-          path: ./site
+          path: ./apps/site
 
   deploy:
     needs: build

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+
+    - name: Setup Node.js environment
+      uses: actions/setup-node@v4
+
     - name: Install modules
-      run: npm install
+      run: yarn
+
     - name: Run tests
-      run: npm run test
+      run: yarn test
diff --git a/.gitignore b/.gitignore
@@ -128,3 +128,6 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
+# turbo
+.turbo
diff --git a/test/.npmrc → .npmrc b/test/.npmrc → .npmrc
diff --git a/site/.gitignore → apps/site/.gitignore b/site/.gitignore → apps/site/.gitignore
diff --git a/site/.storybook/main.ts → apps/site/.storybook/main.ts b/site/.storybook/main.ts → apps/site/.storybook/main.ts
diff --git a/site/.storybook/preview.ts → apps/site/.storybook/preview.ts b/site/.storybook/preview.ts → apps/site/.storybook/preview.ts
diff --git a/site/.vscode/extensions.json → apps/site/.vscode/extensions.json b/site/.vscode/extensions.json → apps/site/.vscode/extensions.json
diff --git a/site/.vscode/launch.json → apps/site/.vscode/launch.json b/site/.vscode/launch.json → apps/site/.vscode/launch.json
diff --git a/site/README.md → apps/site/README.md b/site/README.md → apps/site/README.md
diff --git a/site/astro.config.mjs → apps/site/astro.config.mjs b/site/astro.config.mjs → apps/site/astro.config.mjs
@@ -1,9 +1,10 @@
 // @ts-check
 import { defineConfig } from 'astro/config';
+
 import react from '@astrojs/react';
 
 // https://astro.build/config
 export default defineConfig({
   site: 'https://nospacelang.org',
   integrations: [react()],
-});
+});
diff --git a/site/package-lock.json → apps/site/package-lock.json b/site/package-lock.json → apps/site/package-lock.json
diff --git a/site/package.json → apps/site/package.json b/site/package.json → apps/site/package.json
@@ -1,5 +1,6 @@
 {
   "name": "site",
+  "private": true,
   "type": "module",
   "version": "0.0.1",
   "scripts": {
@@ -13,12 +14,16 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.3",
+    "@astrojs/react": "^3.6.2",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@monaco-editor/react": "^4.6.0",
+    "@types/react": "^18.3.7",
+    "@types/react-dom": "^18.3.0",
     "astro": "^4.15.4",
     "monaco-editor": "^0.51.0",
     "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "typescript": "^5.5.4"
   },
   "devDependencies": {

diff --git a/site/public/CNAME → apps/site/public/CNAME b/site/public/CNAME → apps/site/public/CNAME
diff --git a/site/public/favicon.svg → apps/site/public/favicon.svg b/site/public/favicon.svg → apps/site/public/favicon.svg
diff --git a/site/public/ogimage.png → apps/site/public/ogimage.png b/site/public/ogimage.png → apps/site/public/ogimage.png
diff --git a/site/src/components/chevron.astro → apps/site/src/components/chevron.astro b/site/src/components/chevron.astro → apps/site/src/components/chevron.astro
@@ -1,7 +1,7 @@
 ---
 const { color, direction, width, height } = Astro.props;
 
-function calculateDegrees(direction) {
+function calculateDegrees(direction: 'left' | 'up' | 'right' | 'down') {
   switch (direction) {
     case 'left': return 90;
     case 'up': return 180;

diff --git a/site/src/components/cta.astro → apps/site/src/components/cta.astro b/site/src/components/cta.astro → apps/site/src/components/cta.astro
diff --git a/site/src/components/features.astro → apps/site/src/components/features.astro b/site/src/components/features.astro → apps/site/src/components/features.astro
diff --git a/site/src/components/hero.astro → apps/site/src/components/hero.astro b/site/src/components/hero.astro → apps/site/src/components/hero.astro
diff --git a/site/src/components/icon.astro → apps/site/src/components/icon.astro b/site/src/components/icon.astro → apps/site/src/components/icon.astro
diff --git a/site/src/components/navbar.astro → apps/site/src/components/navbar.astro b/site/src/components/navbar.astro → apps/site/src/components/navbar.astro
diff --git a/site/src/components/playground/Button.tsx → ...site/src/components/playground/Button.tsx b/site/src/components/playground/Button.tsx → ...site/src/components/playground/Button.tsx
@@ -11,6 +11,8 @@ const Base = styled.button`
   padding: 16px 10px;
   font-weight: 500;
   align-items: center;
+  color: white;
+  background-color: #767676;
 
   &:hover {
     background-color: #262626;

diff --git a/apps/site/src/components/playground/Editor.tsx b/apps/site/src/components/playground/Editor.tsx
@@ -0,0 +1,10 @@
+import React, { useEffect } from 'react';
+import { Editor as MonacoEditor, useMonaco } from '@monaco-editor/react';
+
+export default function Editor() {
+  const monaco = useMonaco();
+
+  return (
+    <MonacoEditor defaultValue="" theme="vs-dark" options={{ minimap: { enabled: false }, fontSize: 16, fontFamily: 'monaco, Consolas, "Lucida Console", monospace' }} />
+  );
+}
diff --git a/apps/site/src/components/playground/Header.tsx b/apps/site/src/components/playground/Header.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+// import Editor, { DiffEditor, useMonaco, loader } from '@monaco-editor/react';
+// import styled from '@emotion/styled';
+
+export default function Header() {
+  return (
+    // <Editor defaultValue="" theme="vs-dark" />
+    <div>hello</div>
+  );
+}
diff --git a/.../src/components/playground/Playground.tsx → .../src/components/playground/Playground.tsx b/.../src/components/playground/Playground.tsx → .../src/components/playground/Playground.tsx
diff --git a/...nts/playground/stories/Button.stories.tsx → ...nts/playground/stories/Button.stories.tsx b/...nts/playground/stories/Button.stories.tsx → ...nts/playground/stories/Button.stories.tsx
diff --git a/apps/site/src/content/blog/test.md b/apps/site/src/content/blog/test.md
@@ -0,0 +1,5 @@
+---
+title: Test blog post
+---
+
+Testing
diff --git a/site/src/env.d.ts → apps/site/src/env.d.ts b/site/src/env.d.ts → apps/site/src/env.d.ts
diff --git a/site/src/layouts/blog.astro → apps/site/src/layouts/blog.astro b/site/src/layouts/blog.astro → apps/site/src/layouts/blog.astro
diff --git a/site/src/layouts/shell.astro → apps/site/src/layouts/shell.astro b/site/src/layouts/shell.astro → apps/site/src/layouts/shell.astro
@@ -17,8 +17,7 @@ const { title } = Astro.props;
 		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 		<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap" rel="stylesheet">
 		<style is:global>
-			body { margin: 0; }
-			* { font-family: -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; }
+			body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", sans-serif; }
 		</style>
 	</head>
 	<body>

diff --git a/site/src/pages/blog/type-system.astro → apps/site/src/pages/blog/test.astro b/site/src/pages/blog/type-system.astro → apps/site/src/pages/blog/test.astro
@@ -1,8 +1,8 @@
 ---
 import Blog from '../../layouts/blog.astro';
 import { getEntry } from 'astro:content';
-const entry = await getEntry('blog', 'type-system');
-const { Content, headings } = await entry.render();
+const entry = await getEntry('blog', 'test');
+const { Content } = await entry.render();
 ---
 
 <style is:global>
@@ -18,4 +18,4 @@ const { Content, headings } = await entry.render();
   authorImage="https://avatars.githubusercontent.com/u/9085100?v=4"
 >
   <Content />
-</Blog>
+</Blog>
diff --git a/site/src/pages/index.astro → apps/site/src/pages/index.astro b/site/src/pages/index.astro → apps/site/src/pages/index.astro
diff --git a/site/src/pages/play.astro → apps/site/src/pages/play.astro b/site/src/pages/play.astro → apps/site/src/pages/play.astro
@@ -1,6 +1,6 @@
 ---
 import Shell from '../layouts/shell.astro';
-import Editor from '../components/editor.astro';
+import Editor from '../components/playground/Editor.tsx';
 import Chevron from '../components/chevron.astro';
 ---
 
@@ -178,7 +178,7 @@ import Chevron from '../components/chevron.astro';
             Insert
           </div>
         </div>
-        <Editor client:load />
+        <Editor client:only="react" />
       </div>
       <div class="sidebar">
         <div class="field">

diff --git a/site/src/stories/Button.stories.ts → apps/site/src/stories/Button.stories.ts b/site/src/stories/Button.stories.ts → apps/site/src/stories/Button.stories.ts
diff --git a/site/src/stories/Button.tsx → apps/site/src/stories/Button.tsx b/site/src/stories/Button.tsx → apps/site/src/stories/Button.tsx
diff --git a/site/src/stories/Configure.mdx → apps/site/src/stories/Configure.mdx b/site/src/stories/Configure.mdx → apps/site/src/stories/Configure.mdx
diff --git a/site/src/stories/Header.stories.ts → apps/site/src/stories/Header.stories.ts b/site/src/stories/Header.stories.ts → apps/site/src/stories/Header.stories.ts
diff --git a/site/src/stories/Header.tsx → apps/site/src/stories/Header.tsx b/site/src/stories/Header.tsx → apps/site/src/stories/Header.tsx
diff --git a/site/src/stories/Page.stories.ts → apps/site/src/stories/Page.stories.ts b/site/src/stories/Page.stories.ts → apps/site/src/stories/Page.stories.ts
diff --git a/site/src/stories/Page.tsx → apps/site/src/stories/Page.tsx b/site/src/stories/Page.tsx → apps/site/src/stories/Page.tsx
diff --git a/site/src/stories/assets/accessibility.png → ...site/src/stories/assets/accessibility.png b/site/src/stories/assets/accessibility.png → ...site/src/stories/assets/accessibility.png
diff --git a/site/src/stories/assets/accessibility.svg → ...site/src/stories/assets/accessibility.svg b/site/src/stories/assets/accessibility.svg → ...site/src/stories/assets/accessibility.svg
diff --git a/site/src/stories/assets/addon-library.png → ...site/src/stories/assets/addon-library.png b/site/src/stories/assets/addon-library.png → ...site/src/stories/assets/addon-library.png
diff --git a/site/src/stories/assets/assets.png → apps/site/src/stories/assets/assets.png b/site/src/stories/assets/assets.png → apps/site/src/stories/assets/assets.png
diff --git a/site/src/stories/assets/avif-test-image.avif → ...e/src/stories/assets/avif-test-image.avif b/site/src/stories/assets/avif-test-image.avif → ...e/src/stories/assets/avif-test-image.avif
diff --git a/site/src/stories/assets/context.png → apps/site/src/stories/assets/context.png b/site/src/stories/assets/context.png → apps/site/src/stories/assets/context.png
diff --git a/site/src/stories/assets/discord.svg → apps/site/src/stories/assets/discord.svg b/site/src/stories/assets/discord.svg → apps/site/src/stories/assets/discord.svg
diff --git a/site/src/stories/assets/docs.png → apps/site/src/stories/assets/docs.png b/site/src/stories/assets/docs.png → apps/site/src/stories/assets/docs.png
diff --git a/site/src/stories/assets/figma-plugin.png → .../site/src/stories/assets/figma-plugin.png b/site/src/stories/assets/figma-plugin.png → .../site/src/stories/assets/figma-plugin.png
diff --git a/site/src/stories/assets/github.svg → apps/site/src/stories/assets/github.svg b/site/src/stories/assets/github.svg → apps/site/src/stories/assets/github.svg
diff --git a/site/src/stories/assets/share.png → apps/site/src/stories/assets/share.png b/site/src/stories/assets/share.png → apps/site/src/stories/assets/share.png
diff --git a/site/src/stories/assets/styling.png → apps/site/src/stories/assets/styling.png b/site/src/stories/assets/styling.png → apps/site/src/stories/assets/styling.png
diff --git a/site/src/stories/assets/testing.png → apps/site/src/stories/assets/testing.png b/site/src/stories/assets/testing.png → apps/site/src/stories/assets/testing.png
diff --git a/site/src/stories/assets/theming.png → apps/site/src/stories/assets/theming.png b/site/src/stories/assets/theming.png → apps/site/src/stories/assets/theming.png
diff --git a/site/src/stories/assets/tutorials.svg → apps/site/src/stories/assets/tutorials.svg b/site/src/stories/assets/tutorials.svg → apps/site/src/stories/assets/tutorials.svg
diff --git a/site/src/stories/assets/youtube.svg → apps/site/src/stories/assets/youtube.svg b/site/src/stories/assets/youtube.svg → apps/site/src/stories/assets/youtube.svg
diff --git a/site/src/stories/button.css → apps/site/src/stories/button.css b/site/src/stories/button.css → apps/site/src/stories/button.css
diff --git a/site/src/stories/header.css → apps/site/src/stories/header.css b/site/src/stories/header.css → apps/site/src/stories/header.css
diff --git a/site/src/stories/page.css → apps/site/src/stories/page.css b/site/src/stories/page.css → apps/site/src/stories/page.css
diff --git a/site/svelte.config.js → apps/site/svelte.config.js b/site/svelte.config.js → apps/site/svelte.config.js
diff --git a/apps/site/tsconfig.json b/apps/site/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "astro/tsconfigs/strict",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "jsxImportSource": "react"
+  }
+}
diff --git a/site/yarn.lock → apps/site/yarn.lock b/site/yarn.lock → apps/site/yarn.lock
diff --git a/astro.config.mjs b/astro.config.mjs
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,3 +128,6 @@ dist @@
     .yarn/build-state.yml
     .yarn/install-state.gz
     .pnp.*
+    # turbo
+    .turbo