Moving deps files around

.nvmrc

@@ -1 +0,0 @@
-18

.parcelrc

@@ -1,6 +0,0 @@
-{
-  "extends": "@parcel/config-default",
-  "validators": {
-    "*.{ts,tsx}": ["@parcel/validator-typescript"]
-  }
-}

common/base64.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../test_dep.ts";
+import { assertEquals } from "../test_deps.ts";
 import { base64Decode } from "./base64.ts";
 import { base64Encode } from "./base64.ts";
 

common/customtags.ts

@@ -1,4 +1,4 @@
-import { Tag } from "../dep_common.ts";
+import { Tag } from "./deps.ts";
 
 export const WikiLinkTag = Tag.define();
 export const WikiLinkPageTag = Tag.define();

common/markdown_ext.ts

@@ -1,5 +1,5 @@
-import { Tag } from "../dep_common.ts";
-import type { MarkdownConfig } from "../dep_common.ts";
+import { Tag } from "./deps.ts";
+import type { MarkdownConfig } from "./deps.ts";
 import { System } from "../plugos/system.ts";
 import { Manifest } from "./manifest.ts";
 

common/parse_tree.ts

@@ -1,7 +1,7 @@
 import { ParseTree } from "./tree.ts";
 
-import type { SyntaxNode } from "../dep_common.ts";
-import type { Language } from "../dep_common.ts";
+import type { SyntaxNode } from "./deps.ts";
+import type { Language } from "./deps.ts";
 export function lezerToParseTree(
   text: string,
   n: SyntaxNode,

common/parser.ts

@@ -12,7 +12,7 @@ import {
   Table,
   tags as t,
   TaskList,
-} from "../dep_common.ts";
+} from "./deps.ts";
 import * as ct from "./customtags.ts";
 import {
   MDExt,

common/spaces/disk_space_primitives.ts

@@ -1,6 +1,6 @@
 // import { mkdir, readdir, readFile, stat, unlink, writeFile } from "fs/promises";
-import { path } from "../../dep_common.ts";
-import { readAll } from "../../dep_common.ts";
+import { path } from "../deps.ts";
+import { readAll } from "../deps.ts";
 import { FileMeta } from "../types.ts";
 import { FileData, FileEncoding, SpacePrimitives } from "./space_primitives.ts";
 import { Plug } from "../../plugos/plug.ts";

common/syscalls/markdown.ts

@@ -1,6 +1,6 @@
 import { SysCallMapping } from "../../plugos/system.ts";
 import { parse } from "../parse_tree.ts";
-import { Language } from "../../dep_common.ts";
+import { Language } from "../deps.ts";
 import type { ParseTree } from "../tree.ts";
 
 export function markdownSyscalls(lang: Language): SysCallMapping {

common/tree.test.ts

@@ -9,7 +9,7 @@ import {
   replaceNodesMatching,
 } from "./tree.ts";
 import wikiMarkdownLang from "./parser.ts";
-import { assertEquals, assertNotEquals } from "../test_dep.ts";
+import { assertEquals, assertNotEquals } from "../test_deps.ts";
 
 const mdTest1 = `
 # Heading

common/util.ts

@@ -1,4 +1,4 @@
-import { YAML } from "../dep_common.ts";
+import { YAML } from "./deps.ts";
 
 export function safeRun(fn: () => Promise<void>) {
   fn().catch((e) => {

plugos/bin/plugos-bundle.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env deno
 
 import { Manifest } from "../types.ts";
-import { YAML } from "../../dep_common.ts";
+import { YAML } from "../../common/deps.ts";
 import { compile, esbuild, sandboxCompileModule } from "../compile.ts";
-import { path } from "../../dep_server.ts";
+import { path } from "../../server/deps.ts";
 
 import * as flags from "https://deno.land/std@0.158.0/flags/mod.ts";
 

plugos/compile.ts

@@ -6,7 +6,7 @@ export const esbuild: typeof esbuildWasm = Deno.run === undefined
   ? esbuildWasm
   : esbuildNative;
 
-import { path } from "../dep_server.ts";
+import { path } from "../server/deps.ts";
 import { denoPlugin } from "../esbuild_deno_loader/mod.ts";
 import { patchDenoLibJS } from "../common/hack.ts";
 

plugos/hooks/endpoint.test.ts

@@ -3,8 +3,8 @@ import { Manifest } from "../types.ts";
 import { EndpointHook, EndpointHookT } from "./endpoint.ts";
 import { System } from "../system.ts";
 
-import { Application } from "../../dep_server.ts";
-import { assertEquals } from "../../test_dep.ts";
+import { Application } from "../../server/deps.ts";
+import { assertEquals } from "../../test_deps.ts";
 
 Deno.test("Run a plugos endpoint server", async () => {
   let system = new System<EndpointHookT>("server");

plugos/hooks/endpoint.ts

@@ -1,6 +1,6 @@
 import { Hook, Manifest } from "../types.ts";
 import { System } from "../system.ts";
-import { Application } from "../../dep_server.ts";
+import { Application } from "../../server/deps.ts";
 
 export type EndpointRequest = {
   method: string;

plugos/syscalls/fs.deno.ts

@@ -1,5 +1,5 @@
 import type { SysCallMapping } from "../system.ts";
-import { path } from "../../dep_server.ts";
+import { path } from "../../server/deps.ts";
 import { base64Decode, base64Encode } from "../../common/base64.ts";
 export type FileMeta = {
   name: string;

plugos/syscalls/fulltext.knex_sqlite.ts

@@ -1,4 +1,4 @@
-import { SQLite } from "../../dep_server.ts";
+import { SQLite } from "../../server/deps.ts";
 import { SysCallMapping } from "../system.ts";
 import { asyncExecute, asyncQuery } from "./store.deno.ts";
 

plugos/syscalls/store.deno.test.ts

@@ -1,5 +1,5 @@
-import { assertEquals } from "../../test_dep.ts";
-import { SQLite } from "../../dep_server.ts";
+import { assertEquals } from "../../test_deps.ts";
+import { SQLite } from "../../server/deps.ts";
 import { createSandbox } from "../environments/deno_sandbox.ts";
 import { System } from "../system.ts";
 import { ensureTable, storeSyscalls } from "./store.deno.ts";

plugos/syscalls/store.deno.ts

@@ -1,4 +1,4 @@
-import { SQLite } from "../../dep_server.ts";
+import { SQLite } from "../../server/deps.ts";
 import { SysCallMapping } from "../system.ts";
 
 export type Item = {

plugs/query/engine.test.ts

@@ -1,4 +1,4 @@
-import { assertEquals } from "../../test_dep.ts";
+import { assertEquals } from "../../test_deps.ts";
 import { applyQuery } from "./engine.ts";
 import { parseQuery } from "./parser.ts";
 

server/deps.ts

@@ -1,4 +1,4 @@
-export * from "./dep_common.ts";
+export * from "../common/deps.ts";
 export { Database as SQLite } from "https://deno.land/x/sqlite3@0.6.1/mod.ts";
 export { Application, Router } from "https://deno.land/x/oak@v11.1.0/mod.ts";
 

server/express_server.ts

@@ -1,4 +1,4 @@
-import { Application, mime, path, Router, SQLite } from "../dep_server.ts";
+import { Application, mime, path, Router, SQLite } from "./deps.ts";
 import {
   assetReadFileSync,
   assetReadTextFileSync,

server/syscalls/index.ts

@@ -6,7 +6,7 @@ import {
   Query,
   queryToSql,
 } from "../../plugos/syscalls/store.deno.ts";
-import { SQLite } from "../../dep_server.ts";
+import { SQLite } from "../deps.ts";
 
 type Item = {
   page: string;

web/components/command_palette.tsx

@@ -4,7 +4,7 @@ import { faPersonRunning } from "https://esm.sh/@fortawesome/free-solid-svg-icon
 import { AppCommand } from "../hooks/command.ts";
 import { FilterOption } from "../../common/types.ts";
 
-import {React} from "../../dep_web.ts"
+import {React} from "../deps.ts"
 
 
 export function CommandPalette({

web/components/filter.tsx

@@ -1,4 +1,4 @@
-import { React, useEffect, useRef, useState } from "../../dep_web.ts";
+import { React, useEffect, useRef, useState } from "../deps.ts";
 import { FontAwesomeIcon } from "https://esm.sh/@fortawesome/react-fontawesome@0.2.0";
 import { IconDefinition } from "https://esm.sh/@fortawesome/free-solid-svg-icons@6.2.0";
 import { FilterOption } from "../../common/types.ts";

web/components/page_navigator.tsx

@@ -1,7 +1,7 @@
 import { FilterList } from "./filter.tsx";
 import { FilterOption, PageMeta } from "../../common/types.ts";
 
-import {React} from "../../dep_web.ts"
+import {React} from "../deps.ts"
 
 
 export function PageNavigator({

web/components/panel.tsx

@@ -1,8 +1,8 @@
-import { useEffect, useRef } from "../../dep_web.ts";
+import { useEffect, useRef } from "../deps.ts";
 import { Editor } from "../editor.tsx";
 import { PanelConfig } from "../types.ts";
 
-import {React} from "../../dep_web.ts";
+import {React} from "../deps.ts";
 
 const panelHtml = `<!DOCTYPE html>
 <html lang="en">

web/components/top_bar.tsx

@@ -5,10 +5,10 @@ import {
   faSun,
 } from "https://esm.sh/@fortawesome/free-solid-svg-icons@6.2.0";
 import { FontAwesomeIcon } from "https://esm.sh/@fortawesome/react-fontawesome@0.2.0";
-import { useState } from "../../dep_web.ts";
+import { useState } from "../deps.ts";
 import { Notification } from "../types.ts";
 import { isMacLike } from "../../common/util.ts";
-import { React } from "../../dep_web.ts";
+import { React } from "../deps.ts";
 
 function prettyName(s: string | undefined): string {
   if (!s) {

web/deps.ts

@@ -1,4 +1,4 @@
-export * from "./dep_common.ts";
+export * from "../common/deps.ts";
 
 export {
   default as React,

web/editor.tsx

@@ -32,10 +32,10 @@ import {
   ViewPlugin,
   ViewUpdate,
   yamlLanguage,
-} from "../dep_common.ts";
+} from "../common/deps.ts";
 import { SilverBulletHooks } from "../common/manifest.ts";
 // import { markdown } from "../common/_markdown/index.ts";
-import { markdown } from "../dep_common.ts";
+import { markdown } from "../common/deps.ts";
 
 import { loadMarkdownExtensions, MDExt } from "../common/markdown_ext.ts";
 import buildMarkdown from "../common/parser.ts";

web/editor_paste.ts

@@ -1,4 +1,4 @@
-import { EditorView, ViewPlugin, ViewUpdate } from "../dep_web.ts";
+import { EditorView, ViewPlugin, ViewUpdate } from "./deps.ts";
 import { safeRun } from "../plugos/util.ts";
 import { maximumAttachmentSize } from "../common/types.ts";
 import { Editor } from "./editor.tsx";

web/hooks/slash_command.ts

@@ -4,10 +4,10 @@ import {
   Completion,
   CompletionContext,
   CompletionResult,
-} from "../../dep_web.ts";
+} from "../deps.ts";
 import { safeRun } from "../../common/util.ts";
 import { Editor } from "../editor.tsx";
-import { syntaxTree } from "../../dep_web.ts";
+import { syntaxTree } from "../deps.ts";
 
 export type SlashCommandDef = {
   name: string;

web/inline_image.ts

@@ -1,5 +1,5 @@
-import { syntaxTree } from "../dep_web.ts";
-import { Range } from "../dep_web.ts";
+import { syntaxTree } from "./deps.ts";
+import { Range } from "./deps.ts";
 import {
   Decoration,
   DecorationSet,
@@ -7,7 +7,7 @@ import {
   ViewPlugin,
   ViewUpdate,
   WidgetType,
-} from "../dep_web.ts";
+} from "./deps.ts";
 
 class InlineImageWidget extends WidgetType {
   constructor(readonly url: string, readonly title: string) {

web/line_wrapper.ts

@@ -1,13 +1,13 @@
-import { syntaxTree } from "../dep_common.ts";
+import { syntaxTree } from "../common/deps.ts";
 import {
   Decoration,
   DecorationSet,
   EditorView,
   ViewPlugin,
   ViewUpdate,
-} from "../dep_common.ts";
+} from "../common/deps.ts";
 
-import { Range } from "../dep_web.ts";
+import { Range } from "./deps.ts";
 
 interface WrapElement {
   selector: string;

web/smart_quotes.ts

@@ -1,5 +1,5 @@
-import { KeyBinding } from "../dep_web.ts";
-import { syntaxTree } from "../dep_common.ts";
+import { KeyBinding } from "./deps.ts";
+import { syntaxTree } from "../common/deps.ts";
 
 const straightQuoteContexts = ["CommentBlock", "FencedCode", "InlineCode"];
 

web/style.ts

@@ -1,5 +1,5 @@
-import { HighlightStyle } from "../dep_common.ts";
-import { tagHighlighter, tags as t } from "../dep_web.ts";
+import { HighlightStyle } from "../common/deps.ts";
+import { tagHighlighter, tags as t } from "./deps.ts";
 import * as ct from "../common/customtags.ts";
 import { MDExt } from "../common/markdown_ext.ts";
 

web/syscalls/editor.ts

@@ -1,5 +1,5 @@
 import { Editor } from "../editor.tsx";
-import { Transaction } from "../../dep_web.ts";
+import { Transaction } from "../deps.ts";
 import { SysCallMapping } from "../../plugos/system.ts";
 import { FilterOption } from "../../common/types.ts";