Merge pull request #9 from leviosa42/feat-refactor

Feat refactor
leviosa42 · Sep 15, 2024 · 17ce326 · 17ce326
2 parents d6a6d0c + 2080f23
commit 17ce326
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 6 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -1,4 +1,4 @@
-import * as rpn from './core/index.ts';
+import * as rpn from './core/mod.ts';
 
 import { parseArgs } from 'https://deno.land/std/cli/parse_args.ts';
 

diff --git a/src/core/index.ts → src/core/mod.ts b/src/core/index.ts → src/core/mod.ts
@@ -2,5 +2,5 @@ export * from './evaluate.ts';
 export * from './interpreter.ts';
 export * from './parser.ts';
 export * from './TOKENS.ts';
-export * from './types.d.ts';
 export * from './error.ts';
+export type * from './types.d.ts';
diff --git a/src/components/KEYS.ts → src/webapp/components/KEYS.ts b/src/components/KEYS.ts → src/webapp/components/KEYS.ts
diff --git a/src/components/Key.tsx → src/webapp/components/Key.tsx b/src/components/Key.tsx → src/webapp/components/Key.tsx
@@ -2,7 +2,7 @@
 import { FC } from 'react';
 import { useSound } from 'use-sound';
 
-const SOUND_ONCLICK = new URL('../../public/keyboard_1.mp3', import.meta.url).href;
+const SOUND_ONCLICK = new URL('../public/keyboard_1.mp3', import.meta.url).href;
 
 export type KeyAction = {
   type: 'insert' | 'delete' | 'clear' | 'enter' | 'modifier' | 'noop' | 'keypad_mode' | 'cursor.move';

diff --git a/src/components/Keypad.tsx → src/webapp/components/Keypad.tsx b/src/components/Keypad.tsx → src/webapp/components/Keypad.tsx
diff --git a/src/components/Screen.tsx → src/webapp/components/Screen.tsx b/src/components/Screen.tsx → src/webapp/components/Screen.tsx
@@ -2,7 +2,7 @@
 import { FC } from 'react';
 import type { State } from '../index.tsx';
 import type { KeyAction, Props } from './Key.tsx';
-import * as rpn from '../core/index.ts';
+import * as rpn from '../../core/mod.ts';
 
 export const Verbose = ({ dispatch, state }: {
   dispatch: (action: KeyAction) => void;

diff --git a/src/webapp/import_map.json b/src/webapp/import_map.json
@@ -0,0 +1,12 @@
+{
+  "imports": {
+    "rpn": "../core/mod.ts",
+    "@types/react": "npm:@types/react@^18.3.4",
+    "@types/react-dom": "npm:@types/react-dom@^18.3.0",
+    "@vitejs/plugin-react": "npm:@vitejs/plugin-react@^4.3.1",
+    "react": "npm:react@^18.3.1",
+    "react-dom": "npm:react-dom@^18.3.1",
+    "use-sound": "npm:use-sound@^4.0.3",
+    "vite": "npm:vite@^5.4.2"
+  }
+}
diff --git a/index.html → src/webapp/index.html b/index.html → src/webapp/index.html
@@ -13,6 +13,6 @@
 
 <body>
   <div id="app"></div>
-  <script type="module" src="./src/index.tsx"></script>
+  <script type="module" src="./index.tsx"></script>
 
 </html>
diff --git a/src/index.tsx → src/webapp/index.tsx b/src/index.tsx → src/webapp/index.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useReducer, useState } from 'react';
 // @ts-types="@types/react-dom/client"
 import { createRoot } from 'react-dom/client';
 
-import * as rpn from './core/index.ts';
+import * as rpn from '../core/mod.ts';
 
 import './styles/index.css';
 import { KeyAction } from './components/Key.tsx';

diff --git a/public/keyboard_1.mp3 → src/webapp/public/keyboard_1.mp3 b/public/keyboard_1.mp3 → src/webapp/public/keyboard_1.mp3
diff --git a/src/styles/index.css → src/webapp/styles/index.css b/src/styles/index.css → src/webapp/styles/index.css
diff --git a/src/styles/keypad.css → src/webapp/styles/keypad.css b/src/styles/keypad.css → src/webapp/styles/keypad.css
diff --git a/src/styles/screen.css → src/webapp/styles/screen.css b/src/styles/screen.css → src/webapp/styles/screen.css
diff --git a/src/styles/theme.css → src/webapp/styles/theme.css b/src/styles/theme.css → src/webapp/styles/theme.css
diff --git a/vite.config.mjs b/vite.config.mjs
@@ -3,5 +3,12 @@ import react from '@vitejs/plugin-react';
 
 export default defineConfig({
   plugins: [react()],
+  root: './src/webapp',
   base: './',
+  publicDir: './public',
+  // dist
+  build: {
+    outDir: '../../dist',
+    emptyOutDir: true,
+  },
 });