fix ice dependency issue, #421 and #420

anobaka · Aug 7, 2023 · 3b022f7 · 3b022f7
1 parent a70c7cc
commit 3b022f7
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 22 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -8,9 +8,7 @@ Inside World 是一款离线媒体管理库，用于本地媒体快速搜寻、
 
 目前支持动画、漫画、音声、本子、电影、图集等媒体的管理，老司机食用效果更加哦~
 
-本人自用软件，目前提供公开测试版本供大家使用，喜欢本软件的话请右上角star，并大力推荐给自己的朋友，感谢大家的支持。
-
-本软件可能富含bug，如需帮助请移步至[如何参与](#如何参与)
+本项目源自于本人自用软件，喜欢本软件的话请右上角star，并大力推荐给自己的朋友，感谢大家的支持。
 
 <ul>
 {% for item in site.data.homemenu %}
@@ -94,10 +92,8 @@ Inside World 是一款离线媒体管理库，用于本地媒体快速搜寻、
 
 ## 如何参与
 
-欢迎大家积极参与到本项目中，目前可以从Github提交Issue/加入微信/QQ群进行互动。
-
-**本项目初期因为代码混乱，暂不支持研发参与，稳定后会将源码转移至本Repo。**
+本软件可能富含bug，欢迎大家通过提交Issue、加入Q群、[参与开发](/dev)等方式参与本项目。
 
 ### QQ群
 
-![InsideWorld群聊二维码](https://user-images.githubusercontent.com/2888789/146117768-7d92af78-37ca-426e-a820-97b896b591eb.png)
+![InsideWorld群聊二维码](https://user-images.githubusercontent.com/2888789/146117768-7d92af78-37ca-426e-a820-97b896b591eb.png)
diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/.run/start.run.xml b/src/Bakabase.InsideWorld.App.Core/ClientApp/.run/start.run.xml
@@ -6,7 +6,9 @@
       <script value="start" />
     </scripts>
     <node-interpreter value="project" />
-    <envs />
+    <envs>
+      <env name="DEBUG_TAG" value="server-compiler" />
+    </envs>
     <method v="2" />
   </configuration>
 </component>
diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/ice.config.mts b/src/Bakabase.InsideWorld.App.Core/ClientApp/ice.config.mts
@@ -11,12 +11,12 @@ export default defineConfig(() => ({
   ],
   routes: {
     // 忽略所有约定式规则
+    // ignoreFiles: ['**/components/**'],
     ignoreFiles: ['**'],
     defineRoutes: (route) => {
-      route('/welcome', '../layouts/BlankLayout/index.tsx', () => {
-        route('/welcome', 'Welcome/index.tsx');
-      })
+
       route('/', '../layouts/BasicLayout/index.tsx', () => {
+        // todo: nested '/' route is not working after upgrading @ice/runtime to 1.2.7. Maybe we should switch ice framework to another.
         route('/', 'Dashboard/index.tsx');
         route('/tools', 'Tools/index.tsx');
         route('/alias', 'Alias/index.tsx');
@@ -36,6 +36,9 @@ export default defineConfig(() => ({
         route('/favorites', 'Favorites/index.tsx');
         route('/downloader', 'Downloader/index.tsx');
       });
+      route('/welcome', '../layouts/BlankLayout/index.tsx', () => {
+        route('/welcome', 'Welcome/index.tsx');
+      })
     },
   },
   // webpack: (webpackConfig) => {

diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/package.json b/src/Bakabase.InsideWorld.App.Core/ClientApp/package.json
@@ -2,8 +2,9 @@
   "name": "bxb",
   "version": "1.0.0",
   "dependencies": {
-    "@alifd/next": "^1.26.12",
-    "@alifd/theme-design-pro": "^0.8.1",
+    "@alifd/next": "1.26.15",
+    "@alifd/theme-design-pro": "0.8.1",
+    "@ice/runtime": "1.1.4",
     "@antv/data-set": "^0.11.8",
     "@dnd-kit/core": "^6.0.7",
     "@dnd-kit/sortable": "^7.0.2",
@@ -77,17 +78,25 @@
     "video.js": "^7.19.2"
   },
   "devDependencies": {
-    "@ice/app": "3.1.2",
-    "@ice/runtime": "1.1.3",
     "@applint/spec": "1.2.3",
+    "@ice/app": "3.1.4",
     "@ice/plugin-store": "1.0.3",
-    "@types/node": "^20.3.1",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "eslint": "^8.34.0",
+    "@types/node": "^18.11.17",
+    "eslint": "^8.35.0",
+    "stylelint": "^15.2.0",
+    "typescript": "^4.8.4",
     "swagger-typescript-api": "^12.0.2",
-    "swagger-vue": "^1.0.3",
-    "typescript": "^4.8.4"
+    "swagger-vue": "^1.0.3"
+  },
+  "overrides": {
+    "@ice/app": {
+      "@ice/runtime": "$@ice/runtime"
+    }
+  },
+  "resolutions": {
+    "@ice/app/@ice/runtime": "1.1.4"
   },
   "scripts": {
     "start": "ice start --port 4444",

diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/src/components/Resource/index.tsx b/src/Bakabase.InsideWorld.App.Core/ClientApp/src/components/Resource/index.tsx
@@ -469,7 +469,7 @@ const Resource = React.forwardRef((props: Props, ref) => {
                       })
                         .then(t => {
                           if (!t.code) {
-                            reload(AbortSignal.prototype);
+                            reload(new AbortController().signal);
                           }
                         }),
                     });

diff --git a/src/Bakabase.InsideWorld.App.Core/ClientApp/src/layouts/BasicLayout/index.tsx b/src/Bakabase.InsideWorld.App.Core/ClientApp/src/layouts/BasicLayout/index.tsx
@@ -4,7 +4,7 @@ import { Link, history, useLocation, Outlet } from 'ice';
 import { Button, Dialog } from '@alifd/next';
 import i18n from 'i18next';
 import { useNavigate } from '@ice/runtime/router';
-import PageNav from '@/layouts/BasicLayout/components/PageNav';
+import PageNav from './components/PageNav';
 import { CheckAppInitialized } from '@/sdk/apis';
 import { InitializationContentType } from '@/sdk/constants';
 import FloatingAssistant from '@/components/FloatingAssistant';

diff --git a/src/Bakabase.InsideWorld.Business/Services/MediaLibraryService.cs b/src/Bakabase.InsideWorld.Business/Services/MediaLibraryService.cs
@@ -446,7 +446,7 @@ await LogService.Log(SyncTaskBackgroundTaskName, LogLevel.Error, "CategoryValida
                     {
                         // Remove resources belonged to unknown libraries
                         await ResourceService.RemoveByMediaLibraryIdsNotIn(librariesMap.Keys.ToArray());
-                        var prevResources = await ResourceService.GetAll(ResourceAdditionalItem.None);
+                        var prevResources = await ResourceService.GetAll(ResourceAdditionalItem.All);
 
                         var prevRawFullnameResourcesList = prevResources
                             .GroupBy(a => a.RawFullname.StandardizePath(), StringComparer.OrdinalIgnoreCase)