Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/loopar/core/controller/workspace-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import AuthController from "./auth-controller.js";
import { loopar, fileManager } from "loopar";
import { pathToFileURL } from 'url';
import fs from 'fs';

export default class WorkspaceController extends AuthController {
Expand Down Expand Up @@ -42,7 +43,7 @@ export default class WorkspaceController extends AuthController {
if (checkAuth) {
await this.beforeAction();
}

global.File = class SimulatedFile {
constructor(buffer, fileName, options = {}) {
this.buffer = Buffer.from(buffer);
Expand All @@ -57,9 +58,9 @@ export default class WorkspaceController extends AuthController {
let HTML, template;

const _p = (path) => loopar.makePath(loopar.pathRoot, path);

if(isProduction) {
const { render } = await import(_p("dist/server/entry-server.js"));
const { render } = await import(pathToFileURL(_p("dist/server/entry-server.js")).href);
HTML = await render(url, __META__, this.req, this.res);
template = fs.readFileSync("dist/client/main.html", 'utf-8');
}else{
Expand All @@ -68,7 +69,7 @@ export default class WorkspaceController extends AuthController {
HTML = await render(url, __META__, this.req, this.res);
template = await vite.transformIndexHtml(url, fs.readFileSync(_p("main.html"), 'utf-8'));
}

let html = template.replace(`<!--ssr-outlet-->`, HTML.HTML);
html = html.replace('${THEME}', loopar.cookie.get('vite-ui-theme') || 'dark');

Expand Down Expand Up @@ -120,4 +121,4 @@ export default class WorkspaceController extends AuthController {
async actionSidebar() {
return { sidebarData: await WorkspaceController.sidebarData() }
}
}
}
5 changes: 3 additions & 2 deletions packages/markdown/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import path from 'pathe';
import { pathToFileURL } from 'url';
import fs from 'fs';
import { build } from 'vite';

Expand All @@ -22,6 +23,6 @@ if (!fs.existsSync(distPath)) {
});
}

const { renderMarkdown } = await import(path.resolve(selfRoute, "dist/ssr/markdown-render.js"));
const { renderMarkdown } = await import(pathToFileURL(path.resolve(selfRoute, "dist/ssr/markdown-render.js")).href);

export const markdownRenderer = (markdown) => renderMarkdown(markdown);
export const markdownRenderer = (markdown) => renderMarkdown(markdown);
33 changes: 15 additions & 18 deletions packages/markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,27 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@uiw/react-markdown-preview": "5.1.5",
"quill": "2.0.3",
"@codemirror/lang-json": "6.0.2",
"@codemirror/view": "6.39.9",
"@mdx-js/mdx": "3.1.0",
"@mdx-js/react": "3.1.0",
"@mdxeditor/editor": "3.52.3",

"@uiw/react-markdown-editor": "6.1.4",
"@uiw/codemirror-extensions-basic-setup": "4.25.4",
"@uiw/react-codemirror": "4.25.4",
"@uiw/codemirror-theme-vscode": "4.25.4",
"@codemirror/lang-json": "6.0.2",
"@codemirror/view": "6.39.9",
"@uiw/react-codemirror": "4.25.4",
"@uiw/react-markdown-editor": "6.1.4",
"@uiw/react-markdown-preview": "5.1.5",
"@uiw/react-textarea-code-editor": "3.1.1",
"prism-react-renderer": "2.4.1",

"quill": "2.0.3",
"react-simplemde-editor": "5.2.0",
"@mdx-js/mdx": "3.1.0",
"@mdx-js/react": "3.1.0",

"unified": "^11.0.4",
"remark-parse": "^11.0.0",
"remark-gfm": "^4.0.0",
"remark-rehype": "^11.1.0",
"rehype-raw": "^7.0.0",
"rehype-sanitize": "^6.0.0",
"rehype-stringify": "^10.0.0",

"@uiw/react-textarea-code-editor":"3.1.1"
}
"remark-gfm": "^4.0.0",
"remark-parse": "^11.0.0",
"remark-rehype": "^11.1.0",
"unified": "^11.0.4"
},
"main": "./index.js"
}