1
0

Monorepo with yarn workspaces requires yarn 3.2

This commit is contained in:
Zef Hemel 2022-04-21 14:16:40 +02:00
parent 68d110a081
commit 3a135d1a5c
13 changed files with 16 additions and 15 deletions

View File

@ -2,8 +2,8 @@ import * as plugos from "../plugos/types";
import { EndpointHookT } from "../plugos/hooks/endpoint"; import { EndpointHookT } from "../plugos/hooks/endpoint";
import { CronHookT } from "../plugos/hooks/node_cron"; import { CronHookT } from "../plugos/hooks/node_cron";
import { EventHookT } from "../plugos/hooks/event"; import { EventHookT } from "../plugos/hooks/event";
import { CommandHookT } from "../silverbullet-webapp/hooks/command"; import { CommandHookT } from "@silverbulletmd/web/hooks/command";
import { SlashCommandHookT } from "../silverbullet-webapp/hooks/slash_command"; import { SlashCommandHookT } from "@silverbulletmd/web/hooks/slash_command";
export type SilverBulletHooks = CommandHookT & export type SilverBulletHooks = CommandHookT &
SlashCommandHookT & SlashCommandHookT &

View File

@ -1,10 +1,10 @@
import { SpacePrimitives } from "./space_primitives"; import { SpacePrimitives } from "./space_primitives";
import { safeRun } from "@silverbulletmd/web/util";
import { PageMeta } from "../types"; import { PageMeta } from "../types";
import { EventEmitter } from "../event"; import { EventEmitter } from "../event";
import { Plug } from "../../plugos/plug"; import { Plug } from "../../plugos/plug";
import { Manifest } from "../manifest"; import { Manifest } from "../manifest";
import { plugPrefix, trashPrefix } from "./constants"; import { plugPrefix, trashPrefix } from "./constants";
import { safeRun } from "../util";
const pageWatchInterval = 2000; const pageWatchInterval = 2000;

View File

@ -9,7 +9,7 @@ import {
renderToText, renderToText,
replaceNodesMatching replaceNodesMatching
} from "./tree"; } from "./tree";
import wikiMarkdownLang from "../silverbullet-webapp/parser"; import wikiMarkdownLang from "@silverbulletmd/web/parser";
const mdTest1 = ` const mdTest1 = `
# Heading # Heading

View File

@ -17,7 +17,7 @@ import { NodeCronHook } from "@silverbulletmd/plugos/hooks/node_cron";
import { markdownSyscalls } from "@silverbulletmd/common/syscalls/markdown"; import { markdownSyscalls } from "@silverbulletmd/common/syscalls/markdown";
import { EventedSpacePrimitives } from "@silverbulletmd/common/spaces/evented_space_primitives"; import { EventedSpacePrimitives } from "@silverbulletmd/common/spaces/evented_space_primitives";
import { Space } from "@silverbulletmd/common/spaces/space"; import { Space } from "@silverbulletmd/common/spaces/space";
import { safeRun, throttle } from "@silverbulletmd/web/util"; import { safeRun, throttle } from "@silverbulletmd/common/util";
import { createSandbox } from "@silverbulletmd/plugos/environments/node_sandbox"; import { createSandbox } from "@silverbulletmd/plugos/environments/node_sandbox";
import { jwtSyscalls } from "@silverbulletmd/plugos/syscalls/jwt"; import { jwtSyscalls } from "@silverbulletmd/plugos/syscalls/jwt";
import { fetchSyscalls } from "@silverbulletmd/plugos/syscalls/fetch.node"; import { fetchSyscalls } from "@silverbulletmd/plugos/syscalls/fetch.node";

View File

@ -1,6 +1,6 @@
import { PageMeta } from "../../common/types"; import { PageMeta } from "@silverbulletmd/common/types";
import { SysCallMapping } from "../../plugos/system"; import { SysCallMapping } from "@silverbulletmd/plugos/system";
import { Space } from "../../common/spaces/space"; import { Space } from "@silverbulletmd/common/spaces/space";
export default (space: Space): SysCallMapping => { export default (space: Space): SysCallMapping => {
return { return {

View File

@ -1,5 +1,5 @@
import { Editor } from "./editor"; import { Editor } from "./editor";
import { safeRun } from "./util"; import { safeRun } from "../silverbullet-common/util";
import { Space } from "@silverbulletmd/common/spaces/space"; import { Space } from "@silverbulletmd/common/spaces/space";
import { HttpSpacePrimitives } from "@silverbulletmd/common/spaces/http_space_primitives"; import { HttpSpacePrimitives } from "@silverbulletmd/common/spaces/http_space_primitives";

View File

@ -1,4 +1,4 @@
import { isMacLike } from "../util"; import { isMacLike } from "../../silverbullet-common/util";
import { FilterList } from "./filter"; import { FilterList } from "./filter";
import { faPersonRunning } from "@fortawesome/free-solid-svg-icons"; import { faPersonRunning } from "@fortawesome/free-solid-svg-icons";
import { AppCommand } from "../hooks/command"; import { AppCommand } from "../hooks/command";

View File

@ -1,5 +1,5 @@
import { EditorView } from "@codemirror/view"; import { EditorView } from "@codemirror/view";
import * as util from "../util"; import * as util from "../../silverbullet-common/util";
export function StatusBar({ editorView }: { editorView?: EditorView }) { export function StatusBar({ editorView }: { editorView?: EditorView }) {
let wordCount = 0, let wordCount = 0,

View File

@ -37,7 +37,7 @@ import { indexerSyscalls } from "./syscalls";
import { spaceSyscalls } from "./syscalls/space"; import { spaceSyscalls } from "./syscalls/space";
import { Action, AppViewState, initialViewState } from "./types"; import { Action, AppViewState, initialViewState } from "./types";
import { SilverBulletHooks } from "@silverbulletmd/common/manifest"; import { SilverBulletHooks } from "@silverbulletmd/common/manifest";
import { safeRun, throttle } from "./util"; import { safeRun, throttle } from "../silverbullet-common/util";
import { System } from "../plugos/system"; import { System } from "../plugos/system";
import { EventHook } from "../plugos/hooks/event"; import { EventHook } from "../plugos/hooks/event";
import { systemSyscalls } from "./syscalls/system"; import { systemSyscalls } from "./syscalls/system";

View File

@ -2,7 +2,7 @@ import { Hook, Manifest } from "../../plugos/types";
import { System } from "../../plugos/system"; import { System } from "../../plugos/system";
import { Completion, CompletionContext, CompletionResult } from "@codemirror/autocomplete"; import { Completion, CompletionContext, CompletionResult } from "@codemirror/autocomplete";
import { slashCommandRegexp } from "../types"; import { slashCommandRegexp } from "../types";
import { safeRun } from "../util"; import { safeRun } from "../../silverbullet-common/util";
import { Editor } from "../editor"; import { Editor } from "../editor";
export type SlashCommandDef = { export type SlashCommandDef = {

View File

@ -1,4 +1,4 @@
import { safeRun } from "./util"; import { safeRun } from "../silverbullet-common/util";
function encodePageUrl(name: string): string { function encodePageUrl(name: string): string {
return name.replaceAll(" ", "_"); return name.replaceAll(" ", "_");

View File

@ -1,10 +1,11 @@
{ {
"include": ["webapp/**/*", "server/**/*", "plugos/**/*", "plugs/**/*", "common/**/*"], "include": ["packages/**/*"],
"compilerOptions": { "compilerOptions": {
"target": "esnext", "target": "esnext",
"strict": true, "strict": true,
"moduleResolution": "node", "moduleResolution": "node",
"module": "esnext", "module": "esnext",
"skipLibCheck": true,
"esModuleInterop": true, "esModuleInterop": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"resolveJsonModule": true, "resolveJsonModule": true,