From fd1f0cc303814b68c0a60026dab4dcec9bc26ed7 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sat, 1 Oct 2022 21:09:31 +0800 Subject: [PATCH] fix: fix globby match problem in windows --- client/web/.ministarrc.js | 7 ++++++- client/web/package.json | 1 + .../com.msgbyte.snapdrop/manifest.json | 1 - pnpm-lock.yaml | 19 ++++++++++++++++--- server/package.json | 1 - 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/client/web/.ministarrc.js b/client/web/.ministarrc.js index f6a40cfc..c67cbffc 100644 --- a/client/web/.ministarrc.js +++ b/client/web/.ministarrc.js @@ -2,6 +2,7 @@ const copy = require('rollup-plugin-copy'); const replace = require('rollup-plugin-replace'); const sourceRef = require('rollup-plugin-source-ref').default; const path = require('path'); +const normalize = require('normalize-path'); const isDev = process.env.NODE_ENV === 'development'; @@ -37,7 +38,11 @@ module.exports = { ), dest: path.resolve(__dirname, `./dist/plugins/${pluginName}/`), }, - ], + ].map((item) => ({ + // For windows + src: normalize(item.src), + dest: normalize(item.dest, false), + })), }), replace({ 'process.env.NODE_ENV': JSON.stringify('production'), diff --git a/client/web/package.json b/client/web/package.json index ecbaad45..5d71e503 100644 --- a/client/web/package.json +++ b/client/web/package.json @@ -107,6 +107,7 @@ "less": "^4.1.1", "less-loader": "^10.0.0", "mini-css-extract-plugin": "^1.6.2", + "normalize-path": "^3.0.0", "postcss": "^8.3.5", "postcss-loader": "^6.1.0", "rimraf": "^3.0.2", diff --git a/client/web/plugins/com.msgbyte.snapdrop/manifest.json b/client/web/plugins/com.msgbyte.snapdrop/manifest.json index 2b344337..ff1bd9f6 100644 --- a/client/web/plugins/com.msgbyte.snapdrop/manifest.json +++ b/client/web/plugins/com.msgbyte.snapdrop/manifest.json @@ -5,6 +5,5 @@ "version": "0.0.0", "author": "msgbyte", "description": "隔空投送 —— 在同一网络发送文件与消息", - "documentUrl": "/plugins/com.msgbyte.webview/README.md", "requireRestart": false } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cefe3e06..907af192 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -317,6 +317,7 @@ importers: mini-css-extract-plugin: ^1.6.2 mini-star: ^1.3.1 minimatch: ^5.1.0 + normalize-path: ^3.0.0 p-min-delay: ^4.0.0 postcss: ^8.3.5 postcss-loader: ^6.1.0 @@ -446,6 +447,7 @@ importers: less: 4.1.3 less-loader: 10.2.0_less@4.1.3+webpack@5.73.0 mini-css-extract-plugin: 1.6.2_webpack@5.73.0 + normalize-path: 3.0.0 postcss: 8.4.16 postcss-loader: 6.2.1_n6opzohgnqlahvvvueerfwobwq rimraf: 3.0.2 @@ -499,6 +501,18 @@ importers: '@types/react-canvas-draw': 1.2.0 react: 18.2.0 + client/web/plugins/com.msgbyte.filepizza: + specifiers: + react: 18.2.0 + devDependencies: + react: 18.2.0 + + client/web/plugins/com.msgbyte.filesfm: + specifiers: + react: 18.2.0 + devDependencies: + react: 18.2.0 + client/web/plugins/com.msgbyte.genshin: specifiers: genshin-gacha-kit: ^1.1.0 @@ -598,7 +612,6 @@ importers: moleculer: 0.14.23 moleculer-cli: ^0.7.1 moleculer-minio: ^2.0.0 - moleculer-repl: ^0.6.5 moleculer-web: ^0.10.4 moment: ^2.29.1 mongodb: 4.2.1 @@ -690,7 +703,6 @@ importers: mini-star: 1.3.1 moleculer: 0.14.23_v2nojfag4zngjtjfzx3xixwhsy moleculer-cli: 0.7.1_aq42ly5xd6eunvb7egqihu226a - moleculer-repl: 0.6.6 neo-blessed: 0.2.0 ora: 5.4.1 prettier: 2.7.1 @@ -15318,7 +15330,7 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1_t4lrjbt3sxauai4t5o275zsepa + ts-node: 10.9.1_bqee57coj3oib6dw4m24wknwqe transitivePeerDependencies: - bufferutil - canvas @@ -24048,6 +24060,7 @@ packages: typescript: 4.7.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: false /ts-pnp/1.2.0_typescript@4.7.4: resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==} diff --git a/server/package.json b/server/package.json index 37d658f1..be84747c 100644 --- a/server/package.json +++ b/server/package.json @@ -101,7 +101,6 @@ "mini-star": "^1.2.8", "moleculer": "0.14.23", "moleculer-cli": "^0.7.1", - "moleculer-repl": "^0.6.5", "neo-blessed": "^0.2.0", "ora": "5", "prettier": "^2.3.2",