Skip to content

Commit 6096a1b

Browse files
committed
Attempt to prevent prettier from breakin lines, more importantly: sent md output
1 parent 0db35db commit 6096a1b

File tree

6 files changed

+44
-18
lines changed

6 files changed

+44
-18
lines changed

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"tabWidth": 2,
3+
"useTabs": false,
4+
"printWidth": 140,
5+
"experimentalTernaries": false
6+
}

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"files.watcherExclude": {
1212
"**/deploy": true
13-
}
13+
},
14+
"prettier.prettierPath": "editor/node_modules/prettier/"
1415

1516
}

docker-compose.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: "2.4"
22

33
services:
4-
54
worker:
65
build:
76
context: ./worker
@@ -72,25 +71,23 @@ services:
7271

7372
traefik:
7473
image: "traefik:v2.10.7"
75-
container_name: "traefik-connect-metaframe-js"
74+
container_name: "traefik-connect-metaframe-mdv2"
7675
labels:
77-
- "traefik.enable=true"
78-
- "traefik.http.routers.traefik=true"
76+
- "traefik.enable=true"
77+
- "traefik.http.routers.traefik=true"
7978
ports:
8079
# HTTPS / SSL port
8180
- "${APP_PORT:-443}:443"
8281
# The Traefik Web UI port (enabled by api:insecure: true in traefik.yml)
8382
- "${TRAEFIK_WEB_UI_PORT:-8080}:8080"
8483
volumes:
85-
- ./.traefik/traefik.yml:/etc/traefik/traefik.yml:ro
86-
- ./.traefik/config.yml:/etc/traefik/config.yml:ro
87-
- ./.traefik/certs:/etc/certs:ro
88-
- /var/run/docker.sock:/var/run/docker.sock:ro
84+
- ./.traefik/traefik.yml:/etc/traefik/traefik.yml:ro
85+
- ./.traefik/config.yml:/etc/traefik/config.yml:ro
86+
- ./.traefik/certs:/etc/certs:ro
87+
- /var/run/docker.sock:/var/run/docker.sock:ro
8988

9089
volumes:
9190
deno:
9291
driver: local
9392
node_modules:
9493
driver: local
95-
96-

editor/package-lock.json

Lines changed: 19 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"name": "@metapages/metaframe-js",
2+
"name": "@metapages/metaframe-markdownv2",
33
"version": "0.1.32",
44
"repository": {
55
"type": "git",
6-
"url": "https://github.com/metapages/metaframe-js"
6+
"url": "https://github.com/metapages/metaframe-markdownv2"
77
},
88
"files": [
99
"dist/**/*"
1010
],
1111
"type": "module",
1212
"types": "dist/index.d.ts",
1313
"main": "dist/index.js",
14-
"homepage": "https://github.com/metapages/metaframe-js/tree/main/docs#readme",
14+
"homepage": "https://github.com/metapages/metaframe-markdownv2/tree/main/docs#readme",
1515
"scripts": {
1616
"preinstall": "npm set progress=false && npm set audit false && npm config set fund false",
1717
"start": "vite",
@@ -47,12 +47,13 @@
4747
"@types/react": "^18.2.0",
4848
"@types/react-dom": "^18.2.0",
4949
"@vitejs/plugin-react": "^4.2.1",
50+
"prettier": "^3.5.3",
5051
"typescript": "^4.9.5",
5152
"vite": "^4.5.1",
5253
"vite-tsconfig-paths": "^4.2.1"
5354
},
5455
"engines": {
55-
"node": ">=18.x"
56+
"node": ">=20.x"
5657
},
5758
"browserslist": {
5859
"production": [

worker/index.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,11 @@
408408

409409
if (mdContent) {
410410

411+
const metaframe = globalThis.metaframe;
412+
// prettier-ignore
413+
metaframe
414+
?.setOutput("md", mdContent);
415+
411416
const MD = markdownit({html: true, linkify: true, typographer: true});
412417
MD.use(MermaidPlugIn);
413418
MD.use(SingleScreenPlugin, options || {});
@@ -430,7 +435,6 @@
430435
};
431436

432437
try {
433-
434438
var result = MD.render(mdContent);
435439
root.innerHTML = result;
436440
Mermaid.run();

0 commit comments

Comments
 (0)