xs-dev 1.8.1 → 1.9.0

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xs-dev",
-    "version": "1.8.1",
+    "version": "1.9.0",
     "description": "CLI for automating the setup and usage of Moddable XS tools",
     "type": "module",
     "types": "build/types/types.d.ts",
@@ -20,9 +20,9 @@
     },
     "scripts": {
         "xs-dev": "tsx src/cli.ts",
-        "xs-dev:debug": "DEBUG=* tsx --trace-deprecation src/cli.ts",
-        "format": "prettier --write **/*.{js,ts,json}",
-        "lint": "eslint src/",
+        "xs-dev:debug": "NODE_DEBUG=xs-dev* tsx --trace-deprecation src/cli.ts",
+        "format": "vp fmt **/**/*.{js,ts,json}",
+        "lint": "vp lint src/",
         "clean-build": "rm -rf ./build",
         "compile": "tsc -p .",
         "build": "pnpm run format && pnpm run lint && pnpm run clean-build && pnpm run compile",
@@ -70,7 +70,7 @@
         "node-liblzma": "^4.0.1"
     },
     "devDependencies": {
-        "@astrojs/starlight": "^0.37.7",
+        "@astrojs/starlight": "^0.38.2",
         "@auto-it/all-contributors": "^11.2.1",
         "@auto-it/conventional-commits": "^11.2.1",
         "@auto-it/first-time-contributor": "^11.2.1",
@@ -82,37 +82,33 @@
         "@types/serve-handler": "^6.1.1",
         "@types/tar-fs": "^2.0.1",
         "@types/unzip-stream": "^0.3.1",
-        "@typescript-eslint/eslint-plugin": "^8.1.0",
-        "@typescript-eslint/parser": "^8.1.0",
+        "@typescript-eslint/eslint-plugin": "^8.57.2",
+        "@typescript-eslint/parser": "^8.57.2",
         "all-contributors-cli": "^6.26.1",
-        "astro": "5.18.0",
+        "astro": "6.0.8",
         "auto": "^11.2.1",
-        "eslint": "^8.57.0",
-        "eslint-config-love": "^62.0.0",
-        "eslint-config-prettier": "^8.3.0",
+        "eslint-config-love": "^151.0.0",
+        "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-promise": "^7.1.0",
-        "prettier": "^3.3.3",
-        "rollup": "^2.78.1",
         "solid-js": "^1.4.3",
         "tailwindcss": "^3.0.24",
         "ts-node": "^10.9.2",
         "tsx": "^4.19.2",
         "typescript": "^5.5.4",
-        "typescript-eslint": "^8.1.0"
-    },
-    "prettier": {
-        "semi": false,
-        "singleQuote": true
+        "typescript-eslint": "^8.57.2",
+        "vite-plus": "latest"
     },
     "pnpm": {
         "overrides": {
             "semver@>=7.0.0 <7.5.2": ">=7.5.2",
             "ejs@<3.1.7": ">=3.1.7",
             "axios@>=0.8.1 <1.6.0": ">=1.6.0",
-            "minimatch@<3.0.5": ">=3.0.5"
+            "minimatch@<3.0.5": ">=3.0.5",
+            "vite": "npm:@voidzero-dev/vite-plus-core@latest",
+            "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
         },
         "onlyBuiltDependencies": [
             "@serialport/bindings-cpp",

package/build/src/commands/build.js

@@ -11,7 +11,7 @@ const command = buildCommand({
         brief: 'Build project for release to target device',
     },
     async func(flags, 
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    // oxlint-disable-next-line @typescript-eslint/no-inferrable-types
     projectPath = '.') {
         const currentPlatform = platformType().toLowerCase();
         const { device = currentPlatform, deploy = false, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, mode = process.env.NODE_ENV ?? 'development', output, port, config = [], } = flags;

package/build/src/commands/clean.js

@@ -11,7 +11,7 @@ const command = buildCommand({
         brief: 'Remove build artifacts for project',
     },
     async func(flags, 
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    // oxlint-disable-next-line @typescript-eslint/no-inferrable-types
     projectPath = '.') {
         const currentPlatform = platformType().toLowerCase();
         const { device = currentPlatform, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, mode = process.env.NODE_ENV ?? 'development', output, config = [], } = flags;

package/build/src/commands/debug.js

@@ -11,7 +11,7 @@ const command = buildCommand({
         brief: 'Connect to running debugging session on target device or simulator',
     },
     async func(flags, 
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    // oxlint-disable-next-line @typescript-eslint/no-inferrable-types
     projectPath = '.') {
         const currentPlatform = platformType().toLowerCase();
         const { device = currentPlatform, port, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, log = false, mode = process.env.NODE_ENV ?? 'development', output, } = flags;

package/build/src/commands/run.js

@@ -10,7 +10,7 @@ const command = buildCommand({
     docs: {
         brief: 'Build and launch project on target device or simulator',
     },
-    // eslint-disable-next-line @typescript-eslint/no-inferrable-types
+    // oxlint-disable-next-line @typescript-eslint/no-inferrable-types
     async func(flags, projectPath = '.') {
         const currentPlatform = platformType().toLowerCase();
         const { device = currentPlatform, example, 'list-examples': listExamples = false, 'list-devices': listDevices = false, log = false, mode = process.env.NODE_ENV ?? 'development', output, port, config = [], } = flags;

package/build/src/toolbox/scan/parse.js

@@ -16,7 +16,7 @@ function parseEsptoolLines(lines) {
                 state = 'deviceFound';
             }
             if (line.includes('failed to connect') && currentPort !== null) {
-                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+                // oxlint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete result[currentPort];
                 currentPort = null;
                 state = 'searching';

package/build/src/toolbox/toolchains/pico.js

@@ -1,4 +1,4 @@
-import { mkdir, readdir, rm } from 'node:fs/promises';
+import { chmod, mkdir, readdir, rm, symlink } from 'node:fs/promises';
 import { resolve, join } from 'node:path';
 import { debuglog } from 'node:util';
 import { execaCommand } from 'execa';
@@ -8,6 +8,8 @@ import { sourceEnvironment, which, execWithSudo } from '../system/exec.js';
 import { ensureHomebrew, formulaeExists } from '../setup/homebrew.js';
 import { isFailure } from '../system/errors.js';
 import { exists } from '../system/filesystem.js';
+import { Octokit } from '@octokit/rest';
+import { downloadReleaseTools } from '../setup/moddable.js';
 const debug = debuglog('xs-dev:toolchains:pico');
 async function* installMacDeps(prompter) {
     try {
@@ -84,26 +86,41 @@ async function* installLinuxDeps(_prompter) {
         };
     }
 }
+const PICO_VERSION = '2.0.0';
+const repos = {
+    PICO_SDK: {
+        branch: PICO_VERSION,
+        url: 'https://github.com/raspberrypi/pico-sdk',
+    },
+    PICO_EXTRAS: {
+        branch: `sdk-${PICO_VERSION}`,
+        url: 'https://github.com/raspberrypi/pico-extras',
+    },
+    PICO_EXAMPLES: {
+        branch: `sdk-${PICO_VERSION}`,
+        url: 'https://github.com/raspberrypi/pico-examples',
+    },
+    PICOTOOL: {
+        branch: PICO_VERSION,
+        url: 'https://github.com/raspberrypi/picotool',
+    },
+    PICO_SDK_TOOLS: {
+        branch: 'v2.0.0-5',
+        url: 'https://github.com/raspberrypi/pico-sdk-tools',
+    },
+};
 export const picoToolchain = {
     name: 'pico',
-    platforms: ['mac', 'lin', 'win'],
+    platforms: ['mac', 'lin'],
     async *install(ctx, prompter) {
         yield { type: 'step:start', message: 'Starting pico tooling setup' };
-        const PICO_BRANCH = '2.0.0';
-        const PICO_SDK_REPO = 'https://github.com/raspberrypi/pico-sdk';
-        const PICO_EXTRAS_REPO = 'https://github.com/raspberrypi/pico-extras';
-        const PICO_EXAMPLES_REPO = 'https://github.com/raspberrypi/pico-examples';
-        const PICOTOOL_REPO = 'https://github.com/raspberrypi/picotool';
         const PICO_ROOT = process.env.PICO_ROOT ?? resolve(INSTALL_DIR, 'pico');
         const PICO_SDK_DIR = resolve(PICO_ROOT, 'pico-sdk');
         const PICO_EXTRAS_DIR = resolve(PICO_ROOT, 'pico-extras');
         const PICO_EXAMPLES_PATH = resolve(PICO_ROOT, 'pico-examples');
         const PICOTOOL_PATH = resolve(PICO_ROOT, 'picotool');
         const PICOTOOL_BUILD_DIR = resolve(PICOTOOL_PATH, 'build');
-        const PICO_SDK_BUILD_DIR = resolve(PICO_SDK_DIR, 'build');
-        const PIOASM_TOOL_PATH = resolve(PICO_SDK_DIR, 'tools', 'pioasm');
-        const PIOASM_BUILD_PATH = resolve(PICO_SDK_BUILD_DIR, 'pioasm');
-        const PIOASM_PATH = resolve(PIOASM_BUILD_PATH, 'pioasm');
+        const PIOASM_PATH = resolve(PICO_ROOT, 'pioasm', 'pioasm');
         await sourceEnvironment();
         try {
             debug('Ensuring pico directory');
@@ -154,18 +171,9 @@ export const picoToolchain = {
         }
         // 2. Install the pico sdk, extras, examples, and picotool:
         const gitDeps = [
-            { branch: PICO_BRANCH, url: PICO_SDK_REPO, dest: PICO_SDK_DIR },
-            {
-                branch: `sdk-${PICO_BRANCH}`,
-                url: PICO_EXTRAS_REPO,
-                dest: PICO_EXTRAS_DIR,
-            },
-            {
-                branch: `sdk-${PICO_BRANCH}`,
-                url: PICO_EXAMPLES_REPO,
-                dest: PICO_EXAMPLES_PATH,
-            },
-            { branch: PICO_BRANCH, url: PICOTOOL_REPO, dest: PICOTOOL_PATH },
+            { ...repos.PICO_SDK, dest: PICO_SDK_DIR },
+            { ...repos.PICO_EXTRAS, dest: PICO_EXTRAS_DIR },
+            { ...repos.PICO_EXAMPLES, dest: PICO_EXAMPLES_PATH },
         ];
         const clone = async ({ branch, url, dest, }) => {
             if (await exists(dest))
@@ -186,6 +194,63 @@ export const picoToolchain = {
             };
             return;
         }
+        // download pico-sdk-tools release
+        const octokit = new Octokit();
+        const { data: taggedRelease } = await octokit.rest.repos.getReleaseByTag({
+            owner: 'raspberrypi',
+            repo: 'pico-sdk-tools',
+            tag: repos.PICO_SDK_TOOLS.branch,
+        });
+        const assets = [
+            `pico-sdk-tools-${PICO_VERSION}`,
+            `picotool-${PICO_VERSION}`,
+        ].map((asset) => {
+            switch (ctx.platform) {
+                case 'mac':
+                    return `${asset}-mac.zip`;
+                case 'win':
+                    return `${asset}-x64-win.zip`;
+                case 'lin': {
+                    if (ctx.arch === 'arm64')
+                        return `${asset}-aarch64-lin.tar.gz`;
+                    return `${asset}-x86_64-lin.tar.gz`;
+                }
+                default:
+                    return 'N/A';
+            }
+        });
+        try {
+            debug('Downloading pico-sdk-tools');
+            await Promise.all(assets.map((assetName) => downloadReleaseTools({
+                writePath: PICO_ROOT,
+                assetName,
+                release: taggedRelease,
+            })));
+            debug('Downloaded pico-sdk-tools to PICO_ROOT');
+            const toolPaths = [
+                resolve(PICO_ROOT, 'pioasm', 'pioasm'),
+                resolve(PICO_ROOT, 'picotool', 'picotool'),
+            ];
+            await Promise.all(toolPaths.map((toolPath) => chmod(toolPath, 0o751)));
+            debug('Set executable permissions on tool binaries');
+            const symlinkDir = resolve(PICO_SDK_DIR, 'build', '_deps', 'picotool');
+            const symlinkPath = resolve(symlinkDir, 'picotool');
+            await mkdir(symlinkDir, { recursive: true });
+            await rm(symlinkPath, { force: true });
+            await symlink(resolve(PICO_ROOT, 'picotool', 'picotool'), symlinkPath);
+            debug('Created picotool compatibility symlink for Moddable make.pico.mk');
+            yield {
+                type: 'step:done',
+                message: 'Ending earlier to investigate results',
+            };
+        }
+        catch (error) {
+            yield {
+                type: 'step:fail',
+                message: `Unable to download pico-sdk-tools release assets: ${error instanceof Error ? error.message : 'Unknown'}`,
+            };
+            return;
+        }
         // 3. Set the PICO_SDK_PATH and related environment variables
         try {
             if (process.env.PICO_SDK_DIR === undefined) {
@@ -220,41 +285,6 @@ export const picoToolchain = {
             };
             return;
         }
-        // 4. Build some pico tools:
-        try {
-            const shouldBuildPico = !(await exists(PICO_SDK_BUILD_DIR)) ||
-                (await readdir(PICO_SDK_BUILD_DIR).catch(() => [])).length === 0;
-            if (shouldBuildPico) {
-                debug('Build some pico tools');
-                await mkdir(PICO_SDK_BUILD_DIR, { recursive: true });
-                await execaCommand('cmake ..', {
-                    shell: process.env.SHELL ?? '/bin/bash',
-                    cwd: PICO_SDK_BUILD_DIR,
-                });
-                await execaCommand('make', {
-                    shell: process.env.SHELL ?? '/bin/bash',
-                    cwd: PICO_SDK_BUILD_DIR,
-                });
-                // Build pioasm
-                await mkdir(PIOASM_BUILD_PATH, { recursive: true });
-                await execaCommand(`cmake ${PIOASM_TOOL_PATH}`, {
-                    shell: process.env.SHELL ?? '/bin/bash',
-                    cwd: PIOASM_BUILD_PATH,
-                });
-                await execaCommand('make', {
-                    shell: process.env.SHELL ?? '/bin/bash',
-                    cwd: PIOASM_BUILD_PATH,
-                });
-                debug('Pico tools built successfully');
-            }
-        }
-        catch (error) {
-            yield {
-                type: 'step:fail',
-                message: `Error building pico tools: ${String(error)}`,
-            };
-            return;
-        }
         // 5. Build _the_ picotool
         try {
             if (process.env.PICO_SDK_PATH === undefined) {
@@ -273,8 +303,9 @@ export const picoToolchain = {
             else {
                 debug(`Using existing $PIOASM: ${process.env.PIOASM}`);
             }
-            const shouldBuildPicotool = !(await exists(PICOTOOL_BUILD_DIR)) ||
-                (await readdir(PICOTOOL_BUILD_DIR).catch(() => [])).length === 0;
+            const shouldBuildPicotool = !(await exists(PICOTOOL_PATH)) ||
+                (await readdir(PICOTOOL_PATH).catch(() => [])).length === 0;
+            await upsert(EXPORTS_FILE_PATH, `export PATH="${PICOTOOL_PATH}:$PATH"`);
             if (shouldBuildPicotool) {
                 debug('Build the picotool CLI');
                 await mkdir(PICOTOOL_BUILD_DIR, { recursive: true });
@@ -286,7 +317,6 @@ export const picoToolchain = {
                     shell: process.env.SHELL ?? '/bin/bash',
                     cwd: PICOTOOL_BUILD_DIR,
                 });
-                await upsert(EXPORTS_FILE_PATH, `export PATH="${PICOTOOL_BUILD_DIR}:$PATH"`);
                 debug('picotool CLI built successfully');
             }
         }
@@ -305,14 +335,11 @@ Then run: xs-dev run --example helloworld --device pico`,
         };
     },
     async *update(ctx, prompter) {
-        const PICO_BRANCH = '2.0.0';
         const PICO_ROOT = process.env.PICO_ROOT ?? resolve(INSTALL_DIR, 'pico');
         const PICO_SDK_DIR = resolve(PICO_ROOT, 'pico-sdk');
         const PICO_EXTRAS_DIR = resolve(PICO_ROOT, 'pico-extras');
         const PICO_EXAMPLES_PATH = resolve(PICO_ROOT, 'pico-examples');
         const PICOTOOL_PATH = resolve(PICO_ROOT, 'picotool');
-        const PICOTOOL_BUILD_DIR = resolve(PICOTOOL_PATH, 'build');
-        const PICO_SDK_BUILD_DIR = resolve(PICO_SDK_DIR, 'build');
         await sourceEnvironment();
         yield { type: 'step:start', message: 'Starting pico tooling update' };
         debug('Ensuring pico toolchain directory');
@@ -366,7 +393,9 @@ Then run: xs-dev run --example helloworld --device pico`,
             if (await exists(PICO_SDK_DIR)) {
                 debug('Updating pico-sdk repo');
                 await execaCommand('git fetch --all --tags', { cwd: PICO_SDK_DIR });
-                await execaCommand(`git checkout ${PICO_BRANCH}`, { cwd: PICO_SDK_DIR });
+                await execaCommand(`git checkout ${PICO_VERSION}`, {
+                    cwd: PICO_SDK_DIR,
+                });
                 await execaCommand('git submodule update --init --recursive', {
                     cwd: PICO_SDK_DIR,
                 });
@@ -375,7 +404,7 @@ Then run: xs-dev run --example helloworld --device pico`,
             if (await exists(PICO_EXTRAS_DIR)) {
                 debug('Updating pico-extras repo');
                 await execaCommand('git fetch --all --tags', { cwd: PICO_EXTRAS_DIR });
-                await execaCommand(`git checkout sdk-${PICO_BRANCH}`, {
+                await execaCommand(`git checkout sdk-${PICO_VERSION}`, {
                     cwd: PICO_EXTRAS_DIR,
                 });
                 debug('pico-extras repo updates');
@@ -385,41 +414,69 @@ Then run: xs-dev run --example helloworld --device pico`,
                 await execaCommand('git fetch --all --tags', {
                     cwd: PICO_EXAMPLES_PATH,
                 });
-                await execaCommand(`git checkout sdk-${PICO_BRANCH}`, {
+                await execaCommand(`git checkout sdk-${PICO_VERSION}`, {
                     cwd: PICO_EXAMPLES_PATH,
                 });
                 debug('pico-examples repo updated');
             }
-            if (await exists(PICOTOOL_PATH)) {
-                debug('Updating picotool repo');
-                await execaCommand('git fetch --all --tags', { cwd: PICOTOOL_PATH });
-                await execaCommand('git checkout master', { cwd: PICOTOOL_PATH });
-                debug('picotool repo updated');
-            }
-            // Build some pico tools:
-            debug('Building pico tools');
-            await mkdir(PICO_SDK_BUILD_DIR, { recursive: true });
-            await execaCommand('cmake ..', {
-                shell: process.env.SHELL,
-                cwd: PICO_SDK_BUILD_DIR,
-            });
-            await execaCommand('make', {
-                shell: process.env.SHELL,
-                cwd: PICO_SDK_BUILD_DIR,
+            const octokit = new Octokit();
+            const { data: taggedRelease } = await octokit.rest.repos.getReleaseByTag({
+                owner: 'raspberrypi',
+                repo: 'pico-sdk-tools',
+                tag: repos.PICO_SDK_TOOLS.branch,
             });
-            debug('pico tools rebuilt successfully');
-            // Build _the_ picotool
-            debug('Building the picotool CLI');
-            await mkdir(PICOTOOL_BUILD_DIR, { recursive: true });
-            await execaCommand('cmake ..', {
-                shell: process.env.SHELL,
-                cwd: PICOTOOL_BUILD_DIR,
-            });
-            await execaCommand('make', {
-                shell: process.env.SHELL,
-                cwd: PICOTOOL_BUILD_DIR,
+            const assets = [
+                `pico-sdk-tools-${PICO_VERSION}`,
+                `picotool-${PICO_VERSION}`,
+            ].map((asset) => {
+                switch (ctx.platform) {
+                    case 'mac':
+                        return `${asset}-mac.zip`;
+                    case 'win':
+                        return `${asset}-x64-win.zip`;
+                    case 'lin': {
+                        if (ctx.arch === 'arm64')
+                            return `${asset}-aarch64-lin.tar.gz`;
+                        return `${asset}-x86_64-lin.tar.gz`;
+                    }
+                    default:
+                        return 'N/A';
+                }
             });
-            debug('picotool CLI rebuilt successfully');
+            try {
+                debug('Downloading pico-sdk-tools');
+                // oxlint-disable-next-line @typescript-eslint/promise-function-async
+                await Promise.all(assets.map((assetName) => downloadReleaseTools({
+                    writePath: PICO_ROOT,
+                    assetName,
+                    release: taggedRelease,
+                })));
+                debug('Downloaded pico-sdk-tools to PICO_ROOT');
+                const toolPaths = [
+                    resolve(PICO_ROOT, 'pioasm', 'pioasm'),
+                    resolve(PICO_ROOT, 'picotool', 'picotool'),
+                ];
+                // oxlint-disable-next-line @typescript-eslint/promise-function-async
+                await Promise.all(toolPaths.map((toolPath) => chmod(toolPath, 0o751)));
+                debug('Set executable permissions on tool binaries');
+                const symlinkDir = resolve(PICO_SDK_DIR, 'build', '_deps', 'picotool');
+                const symlinkPath = resolve(symlinkDir, 'picotool');
+                await mkdir(symlinkDir, { recursive: true });
+                await rm(symlinkPath, { force: true });
+                await symlink(resolve(PICO_ROOT, 'picotool', 'picotool'), symlinkPath);
+                debug('Created picotool compatibility symlink for Moddable make.pico.mk');
+                yield {
+                    type: 'step:done',
+                    message: 'Ending earlier to investigate results',
+                };
+            }
+            catch (error) {
+                yield {
+                    type: 'step:fail',
+                    message: `Unable to download pico-sdk-tools release assets: ${error instanceof Error ? error.message : 'Unknown'}`,
+                };
+                return;
+            }
             yield {
                 type: 'step:done',
                 message: `Successfully updated pico platform support for Moddable!
@@ -476,9 +533,10 @@ Then run: xs-dev run --example helloworld --device pico`,
             PICO_ROOT: resolve(INSTALL_DIR, 'pico'),
             PICO_SDK_PATH: resolve(INSTALL_DIR, 'pico', 'pico-sdk'),
             PICO_SDK_DIR: resolve(INSTALL_DIR, 'pico', 'pico-sdk'),
-            PIOASM: resolve(INSTALL_DIR, 'pico', 'pico-sdk', 'build', 'pioasm', 'pioasm'),
+            PIOASM: resolve(INSTALL_DIR, 'pico', 'pioasm', 'pioasm'),
+            UF2CONV: resolve(INSTALL_DIR, 'pico', 'picotool', 'picotool'),
             PICO_GCC_ROOT: process.env.PICO_GCC_ROOT ?? defaultGccRoot,
         };
     },
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pico.js","sourceRoot":"","sources":["../../../../src/toolbox/toolchains/pico.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pico.js","sourceRoot":"","sources":["../../../../src/toolbox/toolchains/pico.ts"],"names":[],"mappings":"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"}

package/docs/src/content.config.ts

@@ -0,0 +1,9 @@
+import { defineCollection } from 'astro:content'
+import { glob } from 'astro/loaders'
+import { docsLoader, i18nLoader } from '@astrojs/starlight/loaders'
+import { docsSchema, i18nSchema } from '@astrojs/starlight/schema'
+
+export const collections = {
+  docs: defineCollection({ loader: docsLoader(), schema: docsSchema() }),
+  i18n: defineCollection({ loader: i18nLoader(), schema: i18nSchema() }),
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-dev",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "CLI for automating the setup and usage of Moddable XS tools",
   "type": "module",
   "types": "build/types/types.d.ts",
@@ -20,9 +20,9 @@
   },
   "scripts": {
     "xs-dev": "tsx src/cli.ts",
-    "xs-dev:debug": "DEBUG=* tsx --trace-deprecation src/cli.ts",
-    "format": "prettier --write **/*.{js,ts,json}",
-    "lint": "eslint src/",
+    "xs-dev:debug": "NODE_DEBUG=xs-dev* tsx --trace-deprecation src/cli.ts",
+    "format": "vp fmt **/**/*.{js,ts,json}",
+    "lint": "vp lint src/",
     "clean-build": "rm -rf ./build",
     "compile": "tsc -p .",
     "build": "pnpm run format && pnpm run lint && pnpm run clean-build && pnpm run compile",
@@ -70,7 +70,7 @@
     "node-liblzma": "^4.0.1"
   },
   "devDependencies": {
-    "@astrojs/starlight": "^0.37.7",
+    "@astrojs/starlight": "^0.38.2",
     "@auto-it/all-contributors": "^11.2.1",
     "@auto-it/conventional-commits": "^11.2.1",
     "@auto-it/first-time-contributor": "^11.2.1",
@@ -82,37 +82,33 @@
     "@types/serve-handler": "^6.1.1",
     "@types/tar-fs": "^2.0.1",
     "@types/unzip-stream": "^0.3.1",
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.2",
+    "@typescript-eslint/parser": "^8.57.2",
     "all-contributors-cli": "^6.26.1",
-    "astro": "5.18.0",
+    "astro": "6.0.8",
     "auto": "^11.2.1",
-    "eslint": "^8.57.0",
-    "eslint-config-love": "^62.0.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-love": "^151.0.0",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-promise": "^7.1.0",
-    "prettier": "^3.3.3",
-    "rollup": "^2.78.1",
     "solid-js": "^1.4.3",
     "tailwindcss": "^3.0.24",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^8.1.0"
-  },
-  "prettier": {
-    "semi": false,
-    "singleQuote": true
+    "typescript-eslint": "^8.57.2",
+    "vite-plus": "latest"
   },
   "pnpm": {
     "overrides": {
       "semver@>=7.0.0 <7.5.2": ">=7.5.2",
       "ejs@<3.1.7": ">=3.1.7",
       "axios@>=0.8.1 <1.6.0": ">=1.6.0",
-      "minimatch@<3.0.5": ">=3.0.5"
+      "minimatch@<3.0.5": ">=3.0.5",
+      "vite": "npm:@voidzero-dev/vite-plus-core@latest",
+      "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
     },
     "onlyBuiltDependencies": [
       "@serialport/bindings-cpp",

package/docs/src/content/config.ts

@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content'
-import { docsSchema, i18nSchema } from '@astrojs/starlight/schema'
-
-export const collections = {
-  docs: defineCollection({ schema: docsSchema() }),
-  i18n: defineCollection({ type: 'data', schema: i18nSchema() }),
-}