Release: 2.7.3 (#561)

* fix: 🐛 simply copy callable functions extra properties (#557)
* fix: 🐛 append missing styles (#560)
* fix: 🐛 empty value or undefined in activePath array should be ignored (#559)

Author: maoxiaoke

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 See [https://github.com/ice-lab/icestark/releases](https://github.com/ice-lab/icestark/releases) for what has changed in each version of icestark.
 
+## 2.7.3
+
+- [fix] empty value or `undefined` in `activePath` array will be ignored. ([#558](https://github.com/ice-lab/icestark/issues/558))
+- [fix] append missing styles in vite developing mode. ([#555](https://github.com/ice-lab/icestark/issues/555))
+
 ## 2.7.2
 
 - [fix] set actual basename when `activePath` is an array. ([#526](https://github.com/ice-lab/icestark/issues/526))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "icestark-monorepo",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": true,
   "description": "Icestark is a JavaScript library for multiple projects, Ice workbench solution.",
   "scripts": {

packages/icestark/__tests__/AppRouter.spec.tsx

@@ -121,7 +121,6 @@ describe('AppRouter', () => {
     unmount();
   })
 
-
   test('app-multi-paths', async () => {
     (fetch as FetchMock).mockResponseOnce(umdSourceWithSetLibrary.toString());
     const { container, unmount } = render(

packages/icestark/__tests__/checkActive.spec.tsx

@@ -97,5 +97,17 @@ describe('checkActive', () => {
     // matched idx
     checkFnc = findActivePath(formatPath(['/test', '/seller'], {}));
     expect(checkFnc('/seller')).toEqual('/seller');
+
+    // undefined array
+    checkFnc = findActivePath(formatPath([undefined, '/seller'], {}));
+    expect(checkFnc('/')).toBeFalsy();
+
+    // nuallable array
+    checkFnc = findActivePath(formatPath([null, '/seller'], {}));
+    expect(checkFnc('/')).toBeFalsy();
+
+    // empty array
+    checkFnc = findActivePath(formatPath(['', '/seller'], {}));
+    expect(checkFnc('/')).toBeFalsy();
   })
 });

packages/icestark/__tests__/index.spec.tsx

@@ -149,6 +149,7 @@ describe('AppRouter', () => {
     expect(container.innerHTML).toContain('test render b');
     unmount();
   });
+
   test('test for AppRoute entry -> success', done => {
     window.history.pushState({}, 'test', '/fetch-entry');
 

packages/icestark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/stark",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "Icestark is a JavaScript library for multiple projects, Ice workbench solution.",
   "scripts": {
     "build": "rm -rf lib && tsc",

packages/icestark/src/AppRouter.tsx

@@ -231,7 +231,6 @@ export default class AppRouter extends React.Component<AppRouterProps, AppRouter
       }
     });
 
-
     if (match) {
       const { name, activePath, path } = element.props as AppRouteProps;
 

packages/icestark/src/apps.ts

@@ -301,6 +301,7 @@ async function loadApp(app: MicroApp) {
     }
   } catch (err) {
     configuration.onError(err);
+    log.error(err);
     updateAppConfig(name, { status: LOAD_ERROR });
   }
   if (lifeCycle.mount) {
@@ -380,7 +381,15 @@ export async function createMicroApp(
       break;
     case UNMOUNTED:
       if (!appConfig.cached) {
-        await loadAndAppendCssAssets(appConfig?.appAssets?.cssList || [], {
+        const appendAssets = [
+          ...(appConfig?.appAssets?.cssList || []),
+          // In vite development mode, styles are inserted into DOM manually.
+          // While es module natively imported twice may never excute twice.
+          // https://github.com/ice-lab/icestark/issues/555
+          ...(appConfig?.loadScriptMode === 'import' ? filterRemovedAssets(importCachedAssets[appConfig.name] ?? [], ['LINK', 'STYLE']) : []),
+        ];
+
+        await loadAndAppendCssAssets(appendAssets, {
           cacheCss: shouldCacheCss(appConfig.loadScriptMode),
           fetch,
         });

packages/icestark/src/util/checkActive.ts

@@ -1,6 +1,7 @@
 import pathToRegexp from 'path-to-regexp';
 import urlParse from 'url-parse';
-import { isFunction, toArray, isObject, addLeadingSlash } from './helpers';
+import { ErrorCode, formatErrMessage } from './error';
+import { isFunction, toArray, isObject, addLeadingSlash, log, isDev } from './helpers';
 
 /**
  * "slash" - hashes like #/ and #/sunshine/lollipops
@@ -97,7 +98,18 @@ const findActivePath = (activePath?: PathData[] | ActiveFn): (url?: string) => s
     let matchedPath;
     const isActive = activePath.some((path) => {
       matchedPath = path?.value;
-      return matchPath(url, path);
+
+      if (!matchedPath && isDev) {
+        log.warn(
+          formatErrMessage(
+            ErrorCode.ACTIVE_PATH_ITEM_CAN_NOT_BE_EMPTY,
+            `Each item of activePath must be string、object、array or a function. Received ${matchedPath?.toString()}`,
+          ),
+        );
+      }
+
+      // Escape when path is empty or undefined
+      return matchedPath ? matchPath(url, path) : false;
     });
 
     return isActive ? matchedPath : false;

packages/icestark/src/util/error.ts

@@ -5,6 +5,7 @@ export enum ErrorCode {
   'CANNOT_FIND_APP' = 4,
   'JS_LOAD_ERROR' = 5,
   'CSS_LOAD_ERROR' = 6,
+  'ACTIVE_PATH_ITEM_CAN_NOT_BE_EMPTY' = 7,
 }
 
 export function normalizeMsg(msg: string, args: string[]) {