diff --git a/app/package.json b/app/package.json index 6994804c7..f0e978afb 100644 --- a/app/package.json +++ b/app/package.json @@ -63,7 +63,7 @@ "html-webpack-plugin": "^5.5.0", "iconv-lite": "^0.6.3", "ifdef-loader": "^2.3.2", - "mini-css-extract-plugin": "2.3.0", + "mini-css-extract-plugin": "2.7.6", "path-browserify": "^1.0.1", "safer-buffer": "^2.1.2", "sass": "^1.53.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 96aaba7f4..dd56aea7d 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -58,8 +58,8 @@ devDependencies: specifier: ^2.3.2 version: 2.3.2 mini-css-extract-plugin: - specifier: 2.3.0 - version: 2.3.0(webpack@5.73.0) + specifier: 2.7.6 + version: 2.7.6(webpack@5.73.0) path-browserify: specifier: ^1.0.1 version: 1.0.1 @@ -885,6 +885,17 @@ packages: - supports-color dev: true + /ajv-formats@2.1.1(ajv@8.12.0): + resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + dependencies: + ajv: 8.12.0 + dev: true + /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: @@ -893,6 +904,15 @@ packages: ajv: 6.12.6 dev: true + /ajv-keywords@5.1.0(ajv@8.12.0): + resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} + peerDependencies: + ajv: ^8.8.2 + dependencies: + ajv: 8.12.0 + fast-deep-equal: 3.1.3 + dev: true + /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -902,6 +922,15 @@ packages: uri-js: 4.4.1 dev: true + /ajv@8.12.0: + resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} + dependencies: + fast-deep-equal: 3.1.3 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 + uri-js: 4.4.1 + dev: true + /ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -2555,6 +2584,10 @@ packages: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} dev: true + /json-schema-traverse@1.0.0: + resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} + dev: true + /json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} dev: true @@ -2729,13 +2762,13 @@ packages: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} - /mini-css-extract-plugin@2.3.0(webpack@5.73.0): - resolution: {integrity: sha512-uzWaOwC+gJrnKbr23J1ZRWx/Wd9W9Ce1mKPlsBGBV/r8zG7/G7oKMxGmxbI65pVGbae2cR7CUx9Ulk0HQt8BfQ==} + /mini-css-extract-plugin@2.7.6(webpack@5.73.0): + resolution: {integrity: sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: - schema-utils: 3.1.1 + schema-utils: 4.2.0 webpack: 5.73.0(webpack-cli@4.10.0) dev: true @@ -3165,6 +3198,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /require-from-string@2.0.2: + resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} + engines: {node: '>=0.10.0'} + dev: true + /resolve-alpn@1.2.1: resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==} @@ -3298,6 +3336,16 @@ packages: ajv-keywords: 3.5.2(ajv@6.12.6) dev: true + /schema-utils@4.2.0: + resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} + engines: {node: '>= 12.13.0'} + dependencies: + '@types/json-schema': 7.0.11 + ajv: 8.12.0 + ajv-formats: 2.1.1(ajv@8.12.0) + ajv-keywords: 5.1.0(ajv@8.12.0) + dev: true + /semver-compare@1.0.0: resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==} optional: true diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index 0798cc20f..2eadfd982 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -56,7 +56,7 @@ export const exportImage = (id: string) => { (exportDialog.element.querySelector(".b3-dialog__container") as HTMLElement).style.height = ""; setStorageVal(Constants.LOCAL_EXPORTIMG, window.siyuan.storage[Constants.LOCAL_EXPORTIMG]); setTimeout(() => { - addScript("stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { + addScript("/stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { window.html2canvas(previewElement.parentElement, {useCORS: true}).then((canvas) => { canvas.toBlob((blob: Blob) => { const formData = new FormData(); diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts index f6612a122..ee413d0a8 100644 --- a/app/src/protyle/toolbar/index.ts +++ b/app/src/protyle/toolbar/index.ts @@ -995,7 +995,7 @@ export class Toolbar { return; } setTimeout(() => { - addScript("stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { + addScript("/stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { window.html2canvas(renderElement, {useCORS: true}).then((canvas) => { canvas.toBlob((blob: Blob) => { const formData = new FormData(); diff --git a/app/webpack.desktop.js b/app/webpack.desktop.js index 286c5ff6c..9d29ed83c 100644 --- a/app/webpack.desktop.js +++ b/app/webpack.desktop.js @@ -13,7 +13,7 @@ module.exports = (env, argv) => { watch: argv.mode !== "production", devtool: argv.mode !== "production" ? "eval" : false, output: { - publicPath: "auto", + publicPath: "/stage/build/desktop/", filename: "[name].[chunkhash].js", path: path.resolve(__dirname, "stage/build/desktop"), }, diff --git a/app/webpack.mobile.js b/app/webpack.mobile.js index 1bd890c2a..858c723e3 100644 --- a/app/webpack.mobile.js +++ b/app/webpack.mobile.js @@ -13,7 +13,8 @@ module.exports = (env, argv) => { watch: argv.mode !== "production", devtool: argv.mode !== "production" ? "eval" : false, output: { - publicPath: "auto", + // 不能使用 auto，否则 ios 导出图片获取不到 css。 https://github.com/siyuan-note/siyuan/issues/8532 + publicPath: "/stage/build/mobile/", filename: "[name].[chunkhash].js", path: path.resolve(__dirname, "stage/build/mobile"), },