@@ -178,13 +176,13 @@ function App(): React.ReactNode {
restartGameToastCallbacksRef.current = GameConfiguration
.Toasts.ENABLE_RESTARTING_GAME_TOAST
? loadingToast(
- GameConfiguration.Toasts
- .RESTARTING_GAME_TOAST_PENDING_MSG,
- GameConfiguration.Toasts
- .RESTARTING_GAME_TOAST_SUCCESS_MSG,
- GameConfiguration.Toasts
- .RESTARTING_GAME_TOAST_ERROR_MSG,
- )
+ GameConfiguration.Toasts
+ .RESTARTING_GAME_TOAST_PENDING_MSG,
+ GameConfiguration.Toasts
+ .RESTARTING_GAME_TOAST_SUCCESS_MSG,
+ GameConfiguration.Toasts
+ .RESTARTING_GAME_TOAST_ERROR_MSG,
+ )
: createEmptyLoadingToastCallbacks();
stopSim();
setTimeout(() => {
@@ -204,10 +202,10 @@ function App(): React.ReactNode {
},
{
autoClose:
- GameConfiguration.Toasts.POSSIBLE_GAME_CRASH_TOAST_AUTOCLOSE,
+ GameConfiguration.Toasts.POSSIBLE_GAME_CRASH_TOAST_AUTOCLOSE,
closeOnClick:
- GameConfiguration.Toasts
- .POSSIBLE_GAME_CRASH_TOAST_CLOSE_ON_CLICK,
+ GameConfiguration.Toasts
+ .POSSIBLE_GAME_CRASH_TOAST_CLOSE_ON_CLICK,
},
);
}
@@ -233,7 +231,7 @@ function App(): React.ReactNode {
statsRef.current,
GameConfiguration.DebugStats.STATS_LOCATION,
);
- setStatsInnerText(statsText ?? "")
+ setStatsInnerText(statsText ?? "");
statsRef.current.innerText = statsText ?? "";
}
}, 100);
@@ -251,7 +249,7 @@ function App(): React.ReactNode {
const checkFocusID = setInterval(() => {
setShowNoFocusMessage(
!document.hasFocus() ||
- !simulatorRef.current?.contentDocument?.hasFocus(),
+ !simulatorRef.current?.contentDocument?.hasFocus(),
);
}, 100);
@@ -265,7 +263,6 @@ function App(): React.ReactNode {
{statsInnerText}
diff --git a/src/convert/website_to_electron/__init__.py b/src/mkcd2app/templates/vite-project/src/assets/.keep
similarity index 100%
rename from src/convert/website_to_electron/__init__.py
rename to src/mkcd2app/templates/vite-project/src/assets/.keep
diff --git a/src/templates/website_files/src/gameConfiguration.ts b/src/mkcd2app/templates/vite-project/src/gameConfiguration.ts
similarity index 100%
rename from src/templates/website_files/src/gameConfiguration.ts
rename to src/mkcd2app/templates/vite-project/src/gameConfiguration.ts
diff --git a/src/templates/website_files/src/vite-env.d.ts b/src/mkcd2app/templates/vite-project/src/global.d.ts
similarity index 60%
rename from src/templates/website_files/src/vite-env.d.ts
rename to src/mkcd2app/templates/vite-project/src/global.d.ts
index 11f02fe..39fc679 100644
--- a/src/templates/website_files/src/vite-env.d.ts
+++ b/src/mkcd2app/templates/vite-project/src/global.d.ts
@@ -1 +1,3 @@
///
+
+declare module "*.css";
diff --git a/src/templates/website_files/src/main.tsx b/src/mkcd2app/templates/vite-project/src/main.tsx
similarity index 100%
rename from src/templates/website_files/src/main.tsx
rename to src/mkcd2app/templates/vite-project/src/main.tsx
diff --git a/src/templates/website_files/src/utils/position.ts b/src/mkcd2app/templates/vite-project/src/utils/position.ts
similarity index 100%
rename from src/templates/website_files/src/utils/position.ts
rename to src/mkcd2app/templates/vite-project/src/utils/position.ts
diff --git a/src/templates/website_files/src/utils/toasts.ts b/src/mkcd2app/templates/vite-project/src/utils/toasts.ts
similarity index 69%
rename from src/templates/website_files/src/utils/toasts.ts
rename to src/mkcd2app/templates/vite-project/src/utils/toasts.ts
index a41eaf3..8e5ed98 100644
--- a/src/templates/website_files/src/utils/toasts.ts
+++ b/src/mkcd2app/templates/vite-project/src/utils/toasts.ts
@@ -1,20 +1,17 @@
import { toast } from "react-toastify";
export interface LoadingToastCallbacks {
- success: () => void
- error: () => void
-};
+ success: () => void;
+ error: () => void;
+}
-/* eslint-disable @typescript-eslint/no-empty-function */
export function createEmptyLoadingToastCallbacks(): LoadingToastCallbacks {
return {
success: () => {},
error: () => {},
};
}
-/* eslint-enable @typescript-eslint/no-empty-function */
-/* eslint-disable @typescript-eslint/no-floating-promises */
export function loadingToast(
pending: string,
success: string,
@@ -34,4 +31,3 @@ export function loadingToast(
});
return callbacks;
}
-/* eslint-enable @typescript-eslint/no-floating-promises */
diff --git a/src/templates/website_files/tsconfig.app.json b/src/mkcd2app/templates/vite-project/tsconfig.app.json
similarity index 58%
rename from src/templates/website_files/tsconfig.app.json
rename to src/mkcd2app/templates/vite-project/tsconfig.app.json
index 3625418..1a3a739 100644
--- a/src/templates/website_files/tsconfig.app.json
+++ b/src/mkcd2app/templates/vite-project/tsconfig.app.json
@@ -1,12 +1,17 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
- "target": "ES2020",
- "useDefineForClassFields": true,
- "lib": ["ES2020", "DOM", "DOM.Iterable"],
- "module": "ESNext",
+ "target": "es2023",
+ "lib": [
+ "ES2023",
+ "DOM"
+ ],
+ "module": "esnext",
+ "types": [
+ "vite/client"
+ ],
+ "allowArbitraryExtensions": true,
"skipLibCheck": true,
-
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
@@ -14,14 +19,13 @@
"moduleDetection": "force",
"noEmit": true,
"jsx": "react-jsx",
-
/* Linting */
- "strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
-// "erasableSyntaxOnly": true,
- "noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true
+ "erasableSyntaxOnly": true,
+ "noFallthroughCasesInSwitch": true
},
- "include": ["src"]
+ "include": [
+ "src"
+ ]
}
diff --git a/src/mkcd2app/templates/vite-project/tsconfig.json b/src/mkcd2app/templates/vite-project/tsconfig.json
new file mode 100644
index 0000000..ea9d0cd
--- /dev/null
+++ b/src/mkcd2app/templates/vite-project/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "files": [],
+ "references": [
+ {
+ "path": "./tsconfig.app.json"
+ },
+ {
+ "path": "./tsconfig.node.json"
+ }
+ ]
+}
diff --git a/src/templates/website_files/tsconfig.node.json b/src/mkcd2app/templates/vite-project/tsconfig.node.json
similarity index 56%
rename from src/templates/website_files/tsconfig.node.json
rename to src/mkcd2app/templates/vite-project/tsconfig.node.json
index d920a0f..3bf20da 100644
--- a/src/templates/website_files/tsconfig.node.json
+++ b/src/mkcd2app/templates/vite-project/tsconfig.node.json
@@ -1,25 +1,27 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
- "target": "ES2022",
- "lib": ["ES2023"],
- "module": "ESNext",
+ "target": "es2023",
+ "lib": [
+ "ES2023"
+ ],
+ "types": [
+ "node"
+ ],
"skipLibCheck": true,
-
/* Bundler mode */
- "moduleResolution": "bundler",
+ "module": "nodenext",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"moduleDetection": "force",
"noEmit": true,
-
/* Linting */
- "strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
-// "erasableSyntaxOnly": true,
- "noFallthroughCasesInSwitch": true,
- "noUncheckedSideEffectImports": true
+ "erasableSyntaxOnly": true,
+ "noFallthroughCasesInSwitch": true
},
- "include": ["vite.config.ts"]
+ "include": [
+ "vite.config.ts"
+ ]
}
diff --git a/src/mkcd2app/templates/vite-project/vite.config.ts b/src/mkcd2app/templates/vite-project/vite.config.ts
new file mode 100644
index 0000000..f9c3c7b
--- /dev/null
+++ b/src/mkcd2app/templates/vite-project/vite.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from "vite";
+import react, { reactCompilerPreset } from "@vitejs/plugin-react";
+import babel from "@rolldown/plugin-babel";
+
+// https://vite.dev/config/
+export default defineConfig({
+ plugins: [react(), babel({ presets: [reactCompilerPreset()] })],
+});
diff --git a/src/convert/website_to_tauri/__init__.py b/src/mkcd2app/utils/__init__.py
similarity index 100%
rename from src/convert/website_to_tauri/__init__.py
rename to src/mkcd2app/utils/__init__.py
diff --git a/src/utils/logger.py b/src/mkcd2app/utils/logger.py
similarity index 96%
rename from src/utils/logger.py
rename to src/mkcd2app/utils/logger.py
index d2c2d6e..d40fe0b 100644
--- a/src/utils/logger.py
+++ b/src/mkcd2app/utils/logger.py
@@ -56,5 +56,5 @@ def set_all_stdout_logger_levels(level: int):
for nm, lgr in logging.Logger.manager.loggerDict.items():
if not isinstance(lgr, logging.PlaceHolder):
for h in lgr.handlers:
- if "
" in repr(h):
+ if isinstance(h, logging.StreamHandler) and h.stream == sys.stdout:
h.setLevel(level)
diff --git a/src/mkcd2app/utils/resources.py b/src/mkcd2app/utils/resources.py
new file mode 100644
index 0000000..5b740f9
--- /dev/null
+++ b/src/mkcd2app/utils/resources.py
@@ -0,0 +1,18 @@
+from contextlib import contextmanager
+from importlib.resources import as_file, files
+from pathlib import Path
+from typing import Iterator
+
+
+@contextmanager
+def get_template_path(name: str) -> Iterator[Path]:
+ ref = files("mkcd2app").joinpath("templates", name)
+ with as_file(ref) as path:
+ yield path
+
+
+@contextmanager
+def get_js_tools_path() -> Iterator[Path]:
+ ref = files("mkcd2app").joinpath("js_tools")
+ with as_file(ref) as path:
+ yield path
diff --git a/src/mkcd2app/utils/run.py b/src/mkcd2app/utils/run.py
new file mode 100644
index 0000000..f358b66
--- /dev/null
+++ b/src/mkcd2app/utils/run.py
@@ -0,0 +1,29 @@
+import logging
+import subprocess
+from pathlib import Path
+
+from mkcd2app.utils.logger import create_logger
+
+logger = create_logger(name=__name__, level=logging.INFO)
+
+
+class BuildError(Exception):
+ def __init__(self, command, cwd, returncode, output):
+ self.command, self.cwd, self.returncode, self.output = command, cwd, returncode, output
+ super().__init__(f"{command} failed ({returncode}) in {cwd}")
+
+
+def run_cmd(command: str, cwd: Path | str) -> str:
+ """
+ Runs a command and captures its output.
+
+ :param command: The command to run - this is executed as a shell command!
+ :param cwd: The current working directory to execute the command in.
+ :return: The stdout
+ :raises BuildError: If the command fails.
+ """
+ logger.debug(f"Running command `{command}` in {cwd}")
+ proc = subprocess.run(command, shell=True, cwd=cwd, capture_output=True, text=True)
+ if proc.returncode != 0:
+ raise BuildError(command, cwd, proc.returncode, proc.stdout + proc.stderr)
+ return proc.stdout
diff --git a/src/templates/electron_files/README.md b/src/templates/electron_files/README.md
deleted file mode 100644
index 5eccfb2..0000000
--- a/src/templates/electron_files/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# {WEBSITE_NAME}
-
-Electron app of a React TS Vite website static export bundle of {SOURCE}.
-
-Generated by
-[MakeCode-Arcade-to-App](https://github.com/UnsignedArduino/MakeCode-Arcade-to-App).
diff --git a/src/templates/electron_files/forge.config.js b/src/templates/electron_files/forge.config.js
deleted file mode 100644
index 57b68f1..0000000
--- a/src/templates/electron_files/forge.config.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const {FusesPlugin} = require('@electron-forge/plugin-fuses');
-const {FuseV1Options, FuseVersion} = require('@electron/fuses');
-
-module.exports = {
- packagerConfig: {
- asar: true,
- extraResource: ["./src/static/binary.js"],
- icon: "./src/assets/icons/icon"
- },
- rebuildConfig: {},
- makers: [
- {
- name: '@electron-forge/maker-squirrel',
- config: {},
- },
- {
- name: '@electron-forge/maker-zip',
- platforms: ['darwin'],
- },
- {
- name: '@electron-forge/maker-deb',
- config: {},
- },
- {
- name: '@electron-forge/maker-rpm',
- config: {},
- },
- ],
- plugins: [
- {
- name: '@electron-forge/plugin-auto-unpack-natives',
- config: {},
- },
- {
- name: '@electron-forge/plugin-webpack',
- config: {
- mainConfig: './webpack.main.config.js',
- renderer: {
- config: './webpack.renderer.config.js',
- entryPoints: [
- {
- html: './src/static/index.html',
- js: './src/renderer.js',
- name: 'main_window',
- preload: {
- js: './src/preload.js',
- },
- },
- ],
- },
- },
- },
- // Fuses are used to enable/disable various Electron functionality
- // at package time, before code signing the application
- new FusesPlugin({
- version: FuseVersion.V1,
- [FuseV1Options.RunAsNode]: false,
- [FuseV1Options.EnableCookieEncryption]: true,
- [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
- [FuseV1Options.EnableNodeCliInspectArguments]: false,
- [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
- [FuseV1Options.OnlyLoadAppFromAsar]: true,
- }),
- ],
-};
diff --git a/src/templates/electron_files/package.json b/src/templates/electron_files/package.json
deleted file mode 100644
index eada747..0000000
--- a/src/templates/electron_files/package.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "name": "NAME",
- "productName": "NAME",
- "author": "AUTHOR",
- "version": "VERSION",
- "description": "DESCRIPTION",
- "main": ".webpack/main",
- "scripts": {
- "start": "electron-forge start",
- "package": "electron-forge package",
- "make": "electron-forge make",
- "publish": "electron-forge publish",
- "lint": "echo \"No linting configured\""
- },
- "keywords": [],
- "devDependencies": {
- "@electron-forge/cli": "^7.8.1",
- "@electron-forge/maker-deb": "^7.8.1",
- "@electron-forge/maker-rpm": "^7.8.1",
- "@electron-forge/maker-squirrel": "^7.8.1",
- "@electron-forge/maker-zip": "^7.8.1",
- "@electron-forge/plugin-auto-unpack-natives": "^7.8.1",
- "@electron-forge/plugin-fuses": "^7.8.1",
- "@electron-forge/plugin-webpack": "^7.8.1",
- "@electron/fuses": "^1.8.0",
- "@vercel/webpack-asset-relocator-loader": "1.7.3",
- "css-loader": "^6.11.0",
- "electron": "36.2.0",
- "copy-webpack-plugin": "^13.0.0",
- "node-loader": "^2.1.0",
- "style-loader": "^3.3.4"
- },
- "dependencies": {
- "electron-squirrel-startup": "^1.0.1"
- }
-}
diff --git a/src/templates/electron_files/src/main.js b/src/templates/electron_files/src/main.js
deleted file mode 100644
index 95f70e8..0000000
--- a/src/templates/electron_files/src/main.js
+++ /dev/null
@@ -1,73 +0,0 @@
-const {app, BrowserWindow, protocol, net} = require("electron")
-const path = require("node:path")
-const fs = require("node:fs")
-const url = require("node:url")
-
-// Handle creating/removing shortcuts on Windows when installing/uninstalling.
-if (require('electron-squirrel-startup')) {
- app.quit();
-}
-
-const windowScale = 4;
-
-const createWindow = () => {
- // Create the browser window.
- const mainWindow = new BrowserWindow({
- width: 160 * windowScale,
- height: 127 * windowScale,
- autoHideMenuBar: true,
- webPreferences: {
- preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
- },
- icon: "./src/assets/icons/icon.png",
- });
-
- // and load the index.html of the app.
- mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
-
- // Open the DevTools.
- // mainWindow.webContents.openDevTools();
-};
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
- createWindow();
-
- // On OS X it's common to re-create a window in the app when the
- // dock icon is clicked and there are no other windows open.
- app.on('activate', () => {
- if (BrowserWindow.getAllWindows().length === 0) {
- createWindow();
- }
- });
-
- console.log("Will intercept file requests for binary.js");
- console.log(`process.resourcesPath: ${process.resourcesPath}`);
- protocol.handle('file', (rq) => {
- const u = new URL(rq.url);
- const filePath = u.pathname;
- if (filePath.endsWith("binary.js")) {
- const newPath = path.join(process.resourcesPath, "binary.js");
- const newURL = url.pathToFileURL(newPath);
- console.log(`Requested for ${filePath}, serving ${newURL} instead`);
- return net.fetch(newURL.toString(), {bypassCustomProtocolHandlers: true});
- } else {
- console.log(`Requested for ${filePath}`);
- return net.fetch(rq, {bypassCustomProtocolHandlers: true});
- }
- });
-});
-
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-app.on('window-all-closed', () => {
- if (process.platform !== 'darwin') {
- app.quit();
- }
-});
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and import them here.
diff --git a/src/templates/electron_files/src/preload.js b/src/templates/electron_files/src/preload.js
deleted file mode 100644
index 5e9d369..0000000
--- a/src/templates/electron_files/src/preload.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// See the Electron documentation for details on how to use preload scripts:
-// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
diff --git a/src/templates/electron_files/src/renderer.js b/src/templates/electron_files/src/renderer.js
deleted file mode 100644
index d8ef8f1..0000000
--- a/src/templates/electron_files/src/renderer.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * This file will automatically be loaded by webpack and run in the "renderer" context.
- * To learn more about the differences between the "main" and the "renderer" context in
- * Electron, visit:
- *
- * https://electronjs.org/docs/tutorial/process-model
- *
- * By default, Node.js integration in this file is disabled. When enabling Node.js integration
- * in a renderer process, please be aware of potential security implications. You can read
- * more about security risks here:
- *
- * https://electronjs.org/docs/tutorial/security
- *
- * To enable Node.js integration in this file, open up `main.js` and enable the `nodeIntegration`
- * flag:
- *
- * ```
- * // Create the browser window.
- * mainWindow = new BrowserWindow({
- * width: 800,
- * height: 600,
- * webPreferences: {
- * nodeIntegration: true
- * }
- * });
- * ```
- */
-
-console.log('👋 This message is being logged by "renderer.js", included via webpack');
diff --git a/src/templates/electron_files/webpack.main.config.js b/src/templates/electron_files/webpack.main.config.js
deleted file mode 100644
index 3db351b..0000000
--- a/src/templates/electron_files/webpack.main.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
- /**
- * This is the main entry point for your application, it's the first file
- * that runs in the main process.
- */
- entry: './src/main.js',
- // Put your normal webpack config below here
- module: {
- rules: require('./webpack.rules'),
- }
-};
diff --git a/src/templates/electron_files/webpack.renderer.config.js b/src/templates/electron_files/webpack.renderer.config.js
deleted file mode 100644
index 4d8c816..0000000
--- a/src/templates/electron_files/webpack.renderer.config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const rules = require('./webpack.rules');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-
-rules.push(...[
- {test: /\.css$/, use: [{loader: 'style-loader'}, {loader: 'css-loader'}]}
-]);
-
-module.exports = {
- // Put your normal webpack config below here
- module: {
- rules
- },
- plugins: [
- new CopyWebpackPlugin({
- patterns: [
- {
- from: "./src/static",
- to: "./main_window",
- globOptions: {
- ignore: ["**/index.html"]
- }
- }
- ],
-
- })
- ]
-};
diff --git a/src/templates/electron_files/webpack.rules.js b/src/templates/electron_files/webpack.rules.js
deleted file mode 100644
index 23cb22a..0000000
--- a/src/templates/electron_files/webpack.rules.js
+++ /dev/null
@@ -1,35 +0,0 @@
-module.exports = [
- // Add support for native node modules
- {
- // We're specifying native_modules in the test because the asset relocator loader generates a
- // "fake" .node file which is really a cjs file.
- test: /native_modules[/\\].+\.node$/,
- use: 'node-loader',
- },
- {
- test: /[/\\]node_modules[/\\].+\.(m?js|node)$/,
- parser: { amd: false },
- use: {
- loader: '@vercel/webpack-asset-relocator-loader',
- options: {
- outputAssetBase: 'native_modules',
- },
- },
- },
- // Put your webpack loader rules in this array. This is where you would put
- // your ts-loader configuration for instance:
- /**
- * Typescript Example:
- *
- * {
- * test: /\.tsx?$/,
- * exclude: /(node_modules|.webpack)/,
- * loaders: [{
- * loader: 'ts-loader',
- * options: {
- * transpileOnly: true
- * }
- * }]
- * }
- */
-];
diff --git a/src/templates/tauri_files/README.md b/src/templates/tauri_files/README.md
deleted file mode 100644
index 92d2f29..0000000
--- a/src/templates/tauri_files/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# {WEBSITE_NAME}
-
-Tauri app of a React TS Vite website static export bundle of {SOURCE}.
-
-Generated by
-[MakeCode-Arcade-to-App](https://github.com/UnsignedArduino/MakeCode-Arcade-to-App).
diff --git a/src/templates/tauri_files/package.json b/src/templates/tauri_files/package.json
deleted file mode 100644
index 3d2d099..0000000
--- a/src/templates/tauri_files/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "tauri-app",
- "private": true,
- "version": "0.1.0",
- "type": "module",
- "scripts": {
- "tauri": "tauri"
- },
- "devDependencies": {
- "@tauri-apps/cli": "^2"
- }
-}
diff --git a/src/templates/tauri_files/src-tauri/.gitignore b/src/templates/tauri_files/src-tauri/.gitignore
deleted file mode 100644
index b21bd68..0000000
--- a/src/templates/tauri_files/src-tauri/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-# Generated by Tauri
-# will have schema files for capabilities auto-completion
-/gen/schemas
diff --git a/src/templates/tauri_files/src-tauri/Cargo.toml b/src/templates/tauri_files/src-tauri/Cargo.toml
deleted file mode 100644
index 6875383..0000000
--- a/src/templates/tauri_files/src-tauri/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "tauri-app"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-# The `_lib` suffix may seem redundant but it is necessary
-# to make the lib name unique and wouldn't conflict with the bin name.
-# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
-name = "tauri_app_lib"
-crate-type = ["staticlib", "cdylib", "rlib"]
-
-[build-dependencies]
-tauri-build = { version = "2", features = [] }
-
-[dependencies]
-tauri = { version = "2", features = [] }
-tauri-plugin-opener = "2"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-
diff --git a/src/templates/tauri_files/src-tauri/build.rs b/src/templates/tauri_files/src-tauri/build.rs
deleted file mode 100644
index d860e1e..0000000
--- a/src/templates/tauri_files/src-tauri/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
- tauri_build::build()
-}
diff --git a/src/templates/tauri_files/src-tauri/capabilities/default.json b/src/templates/tauri_files/src-tauri/capabilities/default.json
deleted file mode 100644
index 4cdbf49..0000000
--- a/src/templates/tauri_files/src-tauri/capabilities/default.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "$schema": "../gen/schemas/desktop-schema.json",
- "identifier": "default",
- "description": "Capability for the main window",
- "windows": ["main"],
- "permissions": [
- "core:default",
- "opener:default"
- ]
-}
diff --git a/src/templates/tauri_files/src-tauri/src/lib.rs b/src/templates/tauri_files/src-tauri/src/lib.rs
deleted file mode 100644
index 4a277ef..0000000
--- a/src/templates/tauri_files/src-tauri/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
-#[tauri::command]
-fn greet(name: &str) -> String {
- format!("Hello, {}! You've been greeted from Rust!", name)
-}
-
-#[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub fn run() {
- tauri::Builder::default()
- .plugin(tauri_plugin_opener::init())
- .invoke_handler(tauri::generate_handler![greet])
- .run(tauri::generate_context!())
- .expect("error while running tauri application");
-}
diff --git a/src/templates/tauri_files/src-tauri/src/main.rs b/src/templates/tauri_files/src-tauri/src/main.rs
deleted file mode 100644
index 2abccd9..0000000
--- a/src/templates/tauri_files/src-tauri/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Prevents additional console window on Windows in release, DO NOT REMOVE!!
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-fn main() {
- tauri_app_lib::run()
-}
diff --git a/src/templates/tauri_files/src-tauri/tauri.conf.json b/src/templates/tauri_files/src-tauri/tauri.conf.json
deleted file mode 100644
index 3d78041..0000000
--- a/src/templates/tauri_files/src-tauri/tauri.conf.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "$schema": "https://schema.tauri.app/config/2",
- "productName": "tauri-app",
- "version": "0.1.0",
- "identifier": "com.tauri-app.app",
- "build": {
- "frontendDist": "../src"
- },
- "app": {
- "withGlobalTauri": true,
- "windows": [
- {
- "title": "tauri-app",
- "width": 800,
- "height": 600
- }
- ],
- "security": {
- "csp": null
- }
- },
- "bundle": {
- "active": true,
- "targets": "all",
- "icon": [
- "icons/icon.png",
- "icons/icon.icns",
- "icons/icon.ico"
- ]
- }
-}
diff --git a/src/templates/website_files/README.md b/src/templates/website_files/README.md
deleted file mode 100644
index 4875af7..0000000
--- a/src/templates/website_files/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# {WEBSITE_NAME}
-
-Bundle of {SOURCE} to a React TS Vite website.
-
-Generated by
-[MakeCode-Arcade-to-App](https://github.com/UnsignedArduino/MakeCode-Arcade-to-App).
diff --git a/src/templates/website_files/eslint.config.js b/src/templates/website_files/eslint.config.js
deleted file mode 100644
index 920e044..0000000
--- a/src/templates/website_files/eslint.config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import js from "@eslint/js";
-import globals from "globals";
-import reactHooks from "eslint-plugin-react-hooks";
-import reactRefresh from "eslint-plugin-react-refresh";
-import reactX from "eslint-plugin-react-x";
-import reactDom from "eslint-plugin-react-dom";
-import tseslint from "typescript-eslint";
-
-export default tseslint.config(
- { ignores: ["dist", "public"] },
- {
- extends: [
- js.configs.recommended,
- ...tseslint.configs.recommendedTypeChecked,
- // ...tseslint.configs.strictTypeChecked,
- ...tseslint.configs.stylisticTypeChecked,
- ],
- files: ["**/*.{ts,tsx}"],
- languageOptions: {
- ecmaVersion: 2020,
- globals: globals.browser,
- parserOptions: {
- project: ["./tsconfig.node.json", "./tsconfig.app.json"],
- tsconfigRootDir: import.meta.dirname,
- },
- },
- plugins: {
- "react-hooks": reactHooks,
- "react-refresh": reactRefresh,
- "react-x": reactX,
- "react-dom": reactDom,
- },
- rules: {
- ...reactHooks.configs.recommended.rules,
- "react-refresh/only-export-components": [
- "warn",
- { allowConstantExport: true },
- ],
- ...reactX.configs["recommended-typescript"].rules,
- ...reactDom.configs.recommended.rules,
- },
- },
-);
diff --git a/src/templates/website_files/package.json b/src/templates/website_files/package.json
deleted file mode 100644
index 1bd8280..0000000
--- a/src/templates/website_files/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "name": "NAME",
- "description": "DESCRIPTION",
- "author": "AUTHOR",
- "private": true,
- "version": "VERSION",
- "type": "module",
- "scripts": {
- "dev": "vite",
- "lint": "eslint .",
- "writeLint": "eslint --fix .",
- "format": "prettier --check .",
- "writeFormat": "prettier --write .",
- "build": "tsc -b && vite build",
- "preview": "vite preview"
- },
- "dependencies": {
- "react": "^19.0.0",
- "react-dom": "^19.0.0",
- "react-toastify": "^11.0.5"
- },
- "devDependencies": {
- "@eslint/js": "^9.21.0",
- "@types/react": "^19.0.10",
- "@types/react-dom": "^19.0.4",
- "@vitejs/plugin-react": "^4.3.4",
- "eslint": "^9.21.0",
- "eslint-plugin-react-dom": "^1.42.1",
- "eslint-plugin-react-hooks": "^5.1.0",
- "eslint-plugin-react-refresh": "^0.4.19",
- "eslint-plugin-react-x": "^1.42.1",
- "globals": "^15.15.0",
- "prettier": "^3.5.3",
- "typescript": "~5.8.3",
- "typescript-eslint": "^8.24.1",
- "vite": "^6.2.0"
- },
- "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
-}
diff --git a/src/templates/website_files/src/global.d.ts b/src/templates/website_files/src/global.d.ts
deleted file mode 100644
index 35306c6..0000000
--- a/src/templates/website_files/src/global.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module '*.css';
diff --git a/src/templates/website_files/tsconfig.json b/src/templates/website_files/tsconfig.json
deleted file mode 100644
index 1ffef60..0000000
--- a/src/templates/website_files/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "files": [],
- "references": [
- { "path": "./tsconfig.app.json" },
- { "path": "./tsconfig.node.json" }
- ]
-}
diff --git a/src/templates/website_files/vite.config.ts b/src/templates/website_files/vite.config.ts
deleted file mode 100644
index a14bb4d..0000000
--- a/src/templates/website_files/vite.config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-
-// https://vite.dev/config/
-export default defineConfig({
- plugins: [react()],
- base: "./"
-})
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/utils/cmd.py b/src/utils/cmd.py
deleted file mode 100644
index dc20a28..0000000
--- a/src/utils/cmd.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import logging
-import subprocess
-from os import PathLike
-from pathlib import Path
-from typing import Optional, Sequence
-
-from .logger import create_logger
-
-logger = create_logger(name=__name__, level=logging.INFO)
-
-
-def run_command(command: str | bytes | PathLike[str] | PathLike[bytes] | Sequence[
- str | bytes | PathLike[str] | PathLike[bytes]], cwd: Optional[Path] = None):
- """
- Run a command in the specified directory.
-
- :param command: The command to run.
- :param cwd: The directory in which to run the command.
- """
- if cwd:
- logger.debug(f"Running command in {cwd}: {command}")
- else:
- logger.debug(f"Running command: {command}")
- subprocess.run(command, cwd=cwd, check=True)
-
-
-def run_shell_command(command: str, cwd: Optional[Path] = None):
- """
- Run a shell command in the specified directory.
-
- :param command: The shell command to run.
- :param cwd: The directory in which to run the command.
- """
- if cwd:
- logger.debug(f"Running command in {cwd}: {command}")
- else:
- logger.debug(f"Running command: {command}")
- subprocess.run(command, cwd=cwd, shell=True, check=True)
diff --git a/src/utils/filesystem.py b/src/utils/filesystem.py
deleted file mode 100644
index c88a1e0..0000000
--- a/src/utils/filesystem.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import logging
-import shutil
-from pathlib import Path
-
-from .logger import create_logger
-
-logger = create_logger(name=__name__, level=logging.INFO)
-
-
-def copy_these(dirs_and_files: list[str], src_dir: Path, dest_dir: Path):
- """
- Copies the specified directories and files in the src_dir to the dest_dir.
-
- :param dirs_and_files: A list of file names to copy.
- :param src_dir: The source directory from which to copy the files.
- :param dest_dir: The destination directory to which the files will be copied.
- """
- logger.debug(f"Copying {len(dirs_and_files)} directories and files")
- for file in dirs_and_files:
- src_path = src_dir / file
- dest_path = dest_dir / file
- if src_path.exists():
- logger.debug(f"Copying {src_path} to {dest_path}")
- if src_path.is_dir():
- shutil.copytree(src_path, dest_path, dirs_exist_ok=True)
- else:
- shutil.copy2(src_path, dest_path)
- else:
- logger.debug(f"{src_path} does not exist, skipping copy.")
-
-
-def delete_these(dirs_and_files: list[str], dir: Path):
- """
- Deletes the specified directories and files from the given directory.
-
- :param dirs_and_files: A list of file names to delete.
- :param dir: The directory from which to delete the files.
- """
- logger.debug(f"Searching for {len(dirs_and_files)} directories and files to delete")
- for file in dirs_and_files:
- file_path = dir / file
- if file_path.exists():
- logger.debug(f"Deleting {file_path}")
- if file_path.is_dir():
- shutil.rmtree(file_path)
- else:
- file_path.unlink()
- else:
- logger.debug(f"{file_path} does not exist, skipping deletion.")
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 27cd5b6..0000000
--- a/yarn.lock
+++ /dev/null
@@ -1,154 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@xmldom/xmldom@^0.9.8":
- version "0.9.8"
- resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.9.8.tgz#1471e82bdff9e8f20ee8bbe60d4ffa8a516e78d8"
- integrity sha512-p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A==
-
-ansi-styles@^4.1.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
- integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
- dependencies:
- color-convert "^2.0.1"
-
-balanced-match@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
- integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-brace-expansion@^1.1.7:
- version "1.1.12"
- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843"
- integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==
- dependencies:
- balanced-match "^1.0.0"
- concat-map "0.0.1"
-
-chalk@^4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
- integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
- dependencies:
- ansi-styles "^4.1.0"
- supports-color "^7.1.0"
-
-color-convert@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
- integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
- dependencies:
- color-name "~1.1.4"
-
-color-name@~1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
- integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-commander@^8.2.0:
- version "8.3.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
- integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-concat-map@0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
- integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-fs.realpath@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
- integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
-glob@^7.2.0:
- version "7.2.3"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
- integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
- dependencies:
- fs.realpath "^1.0.0"
- inflight "^1.0.4"
- inherits "2"
- minimatch "^3.1.1"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-has-flag@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
- integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-inflight@^1.0.4:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
- integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
- dependencies:
- once "^1.3.0"
- wrappy "1"
-
-inherits@2:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
- integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-makecode-core@^1.7.3:
- version "1.7.3"
- resolved "https://registry.yarnpkg.com/makecode-core/-/makecode-core-1.7.3.tgz#43c4a3ea07f43d0800d28b8e9aeba2ff0d735718"
- integrity sha512-zrKtFrQPdoKEKcdMz8bbzLDf1Q6GHM7LWrEijCve6v3hQGsm3hGi+AHmd2IFHF6yCV1RNV2CduDABPFYCWyvuw==
- dependencies:
- "@xmldom/xmldom" "^0.9.8"
- chalk "^4.1.2"
-
-makecode@^1.3.4:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/makecode/-/makecode-1.3.4.tgz#6830fbc4a4bcbd239dbfe5f40e30457eae85d956"
- integrity sha512-hwa5zLeQWyV/VY3YtSS+pDJhopp4tyFvqIyesIWJy6GrXl0y+46niITsuNYa/7hzF6s2ysuOfYxe8n/CDxhgFw==
- dependencies:
- chalk "^4.1.2"
- commander "^8.2.0"
- glob "^7.2.0"
- makecode-core "^1.7.3"
- node-watch "^0.7.2"
- semver "^7.3.7"
-
-minimatch@^3.1.1:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
- integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
- dependencies:
- brace-expansion "^1.1.7"
-
-node-watch@^0.7.2:
- version "0.7.4"
- resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.4.tgz#34557106948cd4b8ddff9aa3d284774004548824"
- integrity sha512-RinNxoz4W1cep1b928fuFhvAQ5ag/+1UlMDV7rbyGthBIgsiEouS4kvRayvvboxii4m8eolKOIBo3OjDqbc+uQ==
-
-once@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
- integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
- dependencies:
- wrappy "1"
-
-path-is-absolute@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
- integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-semver@^7.3.7:
- version "7.7.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
- integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
-
-supports-color@^7.1.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
- integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
- dependencies:
- has-flag "^4.0.0"
-
-wrappy@1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
- integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==