chore(deps): update dependency electron to v22 [security]

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -6,12 +6,13 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
+          registry-url: 'https://registry.npmjs.org'
 
       - run: npm install
       - run: npm run build
@@ -124,7 +125,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install
         run: npm install --build-from-source
@@ -143,6 +144,8 @@ jobs:
         run: npm run deps
 
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
       - uses: actions/upload-artifact@v3
         with:
@@ -158,7 +161,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - run: npm install
       - run: npm run hoist
@@ -174,6 +177,8 @@ jobs:
         run: npm run deps
       
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
       - uses: actions/upload-artifact@v3
         with:
@@ -189,7 +194,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
       - run: npm install
       - run: npm run hoist
       - run: npm run build
@@ -205,6 +210,8 @@ jobs:
         run: npm run deps
 
       - run: npm run build:app
+      - working-directory: electron/app/dist
+        run: ls -R
 
       - uses: actions/upload-artifact@v3
         with:
@@ -223,7 +230,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - uses: actions/download-artifact@v3
         with:

electron/app/package.json

@@ -2,7 +2,7 @@
   "name": "wxmp",
   "description": "微信公众号 Markdown 编辑器",
   "homepage": "https://github.com/jaywcjlove/wxmp.git",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "main": "main.js",
   "author": "Kenny Wong <398188662@qq.com>",
   "private": true,
@@ -18,13 +18,13 @@
     "build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json"
   },
   "dependencies": {
-    "@wcj/wxmp-main": "2.3.1"
+    "@wcj/wxmp-main": "2.3.3"
   },
   "devDependencies": {
-    "@wcj/wxmp-preload": "2.3.1",
-    "cpy-cli": "4.2.0",
-    "electron": "19.0.5",
+    "@wcj/wxmp-preload": "2.3.3",
+    "cpy-cli": "^5.0.0",
+    "electron": "22.3.25",
     "electron-builder": "23.3.3",
-    "website": "2.3.1"
+    "website": "2.3.3"
   }
 }

electron/main/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@wcj/wxmp-main",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "main": "./lib/index.js",
   "private": true,
   "scripts": {
-    "build": "tsbb build --disable-babel --file-names src/index.ts",
-    "watch": "tsbb watch --disable-babel --file-names src/index.ts"
+    "build": "tsbb build",
+    "watch": "tsbb watch"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
-    "electron": "19.0.5"
+    "electron": "22.3.25"
   }
 }

electron/preload/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@wcj/wxmp-preload",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "main": "./lib/index.js",
   "private": true,
   "scripts": {
-    "build": "tsbb build --disable-babel --file-names src/index.ts",
-    "watch": "tsbb watch --disable-babel --file-names src/index.ts"
+    "build": "tsbb build",
+    "watch": "tsbb watch"
   },
   "files": [
     "lib"
   ],
   "devDependencies": {
-    "electron": "19.0.5"
+    "electron": "22.3.25"
   }
 }

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "2.3.1",
+  "version": "2.3.3",
   "packages": ["website", "electron/*"]
 }

package.json

@@ -9,18 +9,17 @@
     "version": "lerna version --exact --force-publish --no-push --no-git-tag-version",
     "prepare": "husky install",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "pretty-quick": "pretty-quick --staged",
     "hoist": "lerna bootstrap --hoist",
     "clean": "lerna clean --yes"
   },
   "license": "MIT",
   "devDependencies": {
+    "@lerna/legacy-package-management": "^7.1.5",
     "cross-env": "^7.0.3",
     "husky": "^8.0.1",
-    "lerna": "5.5.1",
-    "prettier": "^2.7.1",
-    "pretty-quick": "~3.1.3",
-    "tsbb": "^3.7.5"
+    "lerna": "^7.1.5",
+    "prettier": "^3.0.2",
+    "tsbb": "~4.1.0"
   },
   "workspaces": {
     "packages": [

website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "private": true,
   "scripts": {
     "start": "kkt start",
@@ -25,11 +25,10 @@
     "@uiw/codemirror-theme-xcode": "^4.11.6",
     "@uiw/react-back-to-top": "^1.2.0",
     "@uiw/react-github-corners": "^1.5.15",
-    "@uiw/react-markdown-editor": "^5.7.0",
+    "@uiw/react-markdown-editor": "^5.11.2",
     "@wcj/dark-mode": "^1.0.15",
     "css-tree": "^2.2.1",
     "react": "^18.2.0",
-    "react-code-preview-layout": "^2.0.4",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.3.0",
     "react-router-dom": "^6.3.0",
@@ -41,17 +40,16 @@
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
-    "styled-components": "^5.3.5",
+    "styled-components": "~6.0.7",
     "unified": "^10.1.2"
   },
   "devDependencies": {
     "@kkt/less-modules": "^7.2.0",
     "@kkt/raw-modules": "^7.2.0",
     "@kkt/scope-plugin-options": "^7.2.0",
-    "@types/css-tree": "^1.0.7",
+    "@types/css-tree": "^2.3.1",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
-    "@types/styled-components": "^5.1.25",
     "kkt": "^7.2.0",
     "markdown-react-code-preview-loader": "^2.1.2"
   },

website/src/commands/css.tsx

@@ -4,7 +4,7 @@ import styled from 'styled-components';
 
 const Link = styled(NavLink)`
   font-size: 0.8rem;
-  line-height: 0.8rem;
+  line-height: 0.7rem;
   text-decoration: none;
   padding: 0.18rem 0.3rem;
   &:hover {

website/src/commands/theme.tsx

@@ -12,7 +12,7 @@ const Select = styled.select`
   padding: 0 0.2rem 0 0.2rem;
   margin: 0;
   font-family: inherit;
-  font-size: 0.8rem;
+  font-size: 0.7rem;
   outline: none;
   height: 1.15rem;
   cursor: inherit;

website/src/themes/base.md.css

@@ -5,7 +5,7 @@ a {
 
 h1 {
   color: inherit;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
 }
 
@@ -32,7 +32,7 @@ h4 {
 
 p {
   color: initial;
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5em;
 }
 

website/src/themes/default.md.css

@@ -11,7 +11,7 @@ h1 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em;
@@ -63,7 +63,7 @@ li {
 }
 
 p {
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5em;
   padding: 0.5em 0 !important;
   margin-bottom: 0 !important;

website/src/themes/simple.md.css

@@ -11,7 +11,7 @@ h1 {
   line-height: 1.75;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em;
@@ -63,7 +63,7 @@ li {
 }
 
 p {
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5em;
   padding: 0.5em 0 !important;
   margin-bottom: 0 !important;

website/src/themes/underscore.md.css

@@ -11,7 +11,7 @@ h1 {
   line-height: 1.15;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   margin: 2em auto 1em;
   padding: 0 1em 0.3em 1em;
@@ -37,7 +37,7 @@ h3 {
   line-height: 1.2;
   font-family: -apple-system-font, BlinkMacSystemFont, 'Helvetica Neue', 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei UI', 'Microsoft YaHei', Arial, sans-serif;
-  font-size: 1.1em;
+  font-size: 14px;
   font-weight: bold;
   margin: 2em 8px 0.75em 0;
   padding-left: 8px;
@@ -59,7 +59,7 @@ li {
 }
 
 p {
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5em;
   padding: 0.5em 0 !important;
   margin-bottom: 0 !important;

website/src/utils/markdownToHTML.ts

@@ -32,7 +32,9 @@ export function markdownToHTML(md: string, css: string, opts: MarkdownToHTMLOpti
     .use(remarkParse)
     .use(remarkGfm)
     .use(remarkRehype, { allowDangerousHtml: true })
-    .use(rehypePrism)
+    .use(rehypePrism, {
+      ignoreMissing: true,
+    })
     .use(rehypeRaw)
     .use(rehypeIgnore, {})
     .use(rehypeAttrs, { properties: 'attr' })