@modern-js/plugin-garfish 1.4.6 → 1.4.7

package/dist/js/modern/cli/index.js

@@ -71,6 +71,11 @@ export default (({
             }
           },
           tools: {
+            devServer: {
+              headers: {
+                'Access-Control-Allow-Origin': '*'
+              }
+            },
             webpack: (webpackConfig, {
               chain,
               webpack,
@@ -82,9 +87,6 @@ export default (({
                 var _resolveOptions$serve, _resolveOptions$deplo2, _resolveOptions$deplo3;
 
                 chain.output.libraryTarget('umd');
-                chain.devServer.headers({
-                  'Access-Control-Allow-Origin': '*'
-                });
 
                 if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$serve = resolveOptions.server) !== null && _resolveOptions$serve !== void 0 && _resolveOptions$serve.port) {
                   chain.output.publicPath(_env === 'development' ? `//localhost:${resolveOptions.server.port}/` : webpackConfig.output.publicPath);

package/dist/js/modern/runtime/utils/apps.js

@@ -37,6 +37,7 @@ function getAppInstance(options, appInfo, manifest) {
         appInstance: null,
         domId: generateSubAppContainerKey(appInfo)
       };
+      this.unregisterHistoryListener = void 0;
     }
 
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -114,7 +115,7 @@ function getAppInstance(options, appInfo, manifest) {
           await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
         }
 
-        history === null || history === void 0 ? void 0 : history.listen(() => {
+        this.unregisterHistoryListener = history === null || history === void 0 ? void 0 : history.listen(() => {
           if (locationHref !== history.location.pathname) {
             locationHref = history.location.pathname;
             const popStateEvent = new PopStateEvent('popstate');
@@ -134,6 +135,7 @@ function getAppInstance(options, appInfo, manifest) {
       const {
         appInstance
       } = this.state;
+      this.unregisterHistoryListener();
 
       if (appInstance) {
         const {

package/dist/js/modern/util.js

@@ -1,5 +1,8 @@
-import { createDebugger } from '@modern-js/utils';
-export const logger = createDebugger('plugin-garfish');
+/**
+ * Tips: this package will be bundled and running in the browser, do not import from `@modern-js/utils`.
+ */
+import createDebug from 'debug';
+export const logger = createDebug('modern-js:plugin-garfish');
 export const SUBMODULE_APP_COMPONENT_KEY = 'SubModuleComponent';
 export function generateSubAppContainerKey(moduleInfo) {
   return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.name)}` : 'modern_sub_app_container';

package/dist/js/node/cli/index.js

@@ -86,6 +86,11 @@ var _default = ({
             }
           },
           tools: {
+            devServer: {
+              headers: {
+                'Access-Control-Allow-Origin': '*'
+              }
+            },
             webpack: (webpackConfig, {
               chain,
               webpack,
@@ -97,9 +102,6 @@ var _default = ({
                 var _resolveOptions$serve, _resolveOptions$deplo2, _resolveOptions$deplo3;
 
                 chain.output.libraryTarget('umd');
-                chain.devServer.headers({
-                  'Access-Control-Allow-Origin': '*'
-                });
 
                 if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$serve = resolveOptions.server) !== null && _resolveOptions$serve !== void 0 && _resolveOptions$serve.port) {
                   chain.output.publicPath(_env === 'development' ? `//localhost:${resolveOptions.server.port}/` : webpackConfig.output.publicPath);

package/dist/js/node/runtime/utils/apps.js

@@ -43,6 +43,7 @@ function getAppInstance(options, appInfo, manifest) {
         appInstance: null,
         domId: (0, _util.generateSubAppContainerKey)(appInfo)
       };
+      this.unregisterHistoryListener = void 0;
     }
 
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -120,7 +121,7 @@ function getAppInstance(options, appInfo, manifest) {
           await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
         }
 
-        history === null || history === void 0 ? void 0 : history.listen(() => {
+        this.unregisterHistoryListener = history === null || history === void 0 ? void 0 : history.listen(() => {
           if (locationHref !== history.location.pathname) {
             locationHref = history.location.pathname;
             const popStateEvent = new PopStateEvent('popstate');
@@ -140,6 +141,7 @@ function getAppInstance(options, appInfo, manifest) {
       const {
         appInstance
       } = this.state;
+      this.unregisterHistoryListener();
 
       if (appInstance) {
         const {

package/dist/js/node/util.js

@@ -7,9 +7,14 @@ exports.SUBMODULE_APP_COMPONENT_KEY = void 0;
 exports.generateSubAppContainerKey = generateSubAppContainerKey;
 exports.logger = void 0;
 
-var _utils = require("@modern-js/utils");
+var _debug = _interopRequireDefault(require("debug"));
 
-const logger = (0, _utils.createDebugger)('plugin-garfish');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Tips: this package will be bundled and running in the browser, do not import from `@modern-js/utils`.
+ */
+const logger = (0, _debug.default)('modern-js:plugin-garfish');
 exports.logger = logger;
 const SUBMODULE_APP_COMPONENT_KEY = 'SubModuleComponent';
 exports.SUBMODULE_APP_COMPONENT_KEY = SUBMODULE_APP_COMPONENT_KEY;

package/dist/js/treeshaking/cli/index.js

@@ -94,6 +94,11 @@ export default (function () {
               }
             },
             tools: {
+              devServer: {
+                headers: {
+                  'Access-Control-Allow-Origin': '*'
+                }
+              },
               webpack: function webpack(webpackConfig, _ref3) {
                 var _resolveOptions$deplo, _resolveWebpackConfig;
 
@@ -106,9 +111,6 @@ export default (function () {
                   var _resolveOptions$serve, _resolveOptions$deplo2, _resolveOptions$deplo3;
 
                   chain.output.libraryTarget('umd');
-                  chain.devServer.headers({
-                    'Access-Control-Allow-Origin': '*'
-                  });
 
                   if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$serve = resolveOptions.server) !== null && _resolveOptions$serve !== void 0 && _resolveOptions$serve.port) {
                     chain.output.publicPath(env === 'development' ? "//localhost:".concat(resolveOptions.server.port, "/") : webpackConfig.output.publicPath);

package/dist/js/treeshaking/runtime/utils/apps.js

@@ -76,6 +76,7 @@ function getAppInstance(options, appInfo, manifest) {
         appInstance: null,
         domId: generateSubAppContainerKey(appInfo)
       };
+      _this.unregisterHistoryListener = void 0;
       return _this;
     }
 
@@ -174,7 +175,7 @@ function getAppInstance(options, appInfo, manifest) {
                   return appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount();
 
                 case 22:
-                  history === null || history === void 0 ? void 0 : history.listen(function () {
+                  this.unregisterHistoryListener = history === null || history === void 0 ? void 0 : history.listen(function () {
                     if (locationHref !== history.location.pathname) {
                       locationHref = history.location.pathname;
                       var popStateEvent = new PopStateEvent('popstate');
@@ -218,6 +219,7 @@ function getAppInstance(options, appInfo, manifest) {
               switch (_context2.prev = _context2.next) {
                 case 0:
                   appInstance = this.state.appInstance;
+                  this.unregisterHistoryListener();
 
                   if (appInstance) {
                     _appInfo = appInstance.appInfo;
@@ -231,7 +233,7 @@ function getAppInstance(options, appInfo, manifest) {
                     }
                   }
 
-                case 2:
+                case 3:
                 case "end":
                   return _context2.stop();
               }

package/dist/js/treeshaking/util.js

@@ -1,5 +1,8 @@
-import { createDebugger } from '@modern-js/utils';
-export var logger = createDebugger('plugin-garfish');
+/**
+ * Tips: this package will be bundled and running in the browser, do not import from `@modern-js/utils`.
+ */
+import createDebug from 'debug';
+export var logger = createDebug('modern-js:plugin-garfish');
 export var SUBMODULE_APP_COMPONENT_KEY = 'SubModuleComponent';
 export function generateSubAppContainerKey(moduleInfo) {
   return moduleInfo ? "modern_sub_app_container_".concat(decodeURIComponent(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.name)) : 'modern_sub_app_container';

package/dist/types/runtime/useModuleApps.d.ts

@@ -28,10 +28,11 @@ export declare type ModernGarfishConfig = {
 };
 export declare type MicroComponentProps = {
   loadable?: LoadableConfig;
+  [index: string]: any;
 };
 export declare type Config = Partial<Options> & ModernGarfishConfig;
-export declare type UseModuleApps = { [index in 'apps' | string]: index extends 'apps' ? ModulesInfo : React.FC<any> } & {
-  readonly MApp: React.FC<any>;
+export declare type UseModuleApps = { [index in 'apps' | string]: index extends 'apps' ? ModulesInfo : React.FC<MicroComponentProps> } & {
+  readonly MApp: React.FC<MicroComponentProps>;
   readonly apps: ModulesInfo;
 };
 export declare function useModuleApps(): UseModuleApps;

package/dist/types/runtime/utils/apps.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import Garfish from 'garfish';
-import { Manifest, ModulesInfo } from '../useModuleApps';
+import { Manifest, MicroComponentProps, ModulesInfo } from '../useModuleApps';
 export interface AppMap {
-  [key: string]: React.FC<any>;
+  [key: string]: React.FC<MicroComponentProps>;
 }
 export declare function generateApps(options: typeof Garfish.options, manifest?: Manifest): {
   apps: AppMap;

package/dist/types/util.d.ts

@@ -1,4 +1,8 @@
+/**
+ * Tips: this package will be bundled and running in the browser, do not import from `@modern-js/utils`.
+ */
+import createDebug from 'debug';
 import { ModuleInfo } from './runtime';
-export declare const logger: import("@modern-js/utils/compiled/debug").Debugger;
+export declare const logger: createDebug.Debugger;
 export declare const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
 export declare function generateSubAppContainerKey(moduleInfo?: ModuleInfo): string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.6",
+  "version": "1.4.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -50,14 +50,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.4.0",
+    "@modern-js/utils": "^1.4.1",
+    "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
+    "debug": "^4.3.2",
     "garfish": "^1.3.3",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.7.0",
+    "@modern-js/core": "1.7.1",
     "@modern-js/plugin-router": "^1.2.9",
     "@modern-js/runtime-core": "1.4.1",
     "@modern-js/types": "^1.4.0",

package/tests/__snapshots__/cli.test.tsx.snap

@@ -51,11 +51,6 @@ Object {
 
 exports[`plugin-garfish cli webpack config close external and use js entry 1`] = `
 Object {
-  "devServer": Object {
-    "headers": Object {
-      "Access-Control-Allow-Origin": "*",
-    },
-  },
   "externals": Object {
     "react": "react",
     "react-dom": "react-dom",
@@ -76,11 +71,6 @@ Object {
 
 exports[`plugin-garfish cli webpack config default micro config 1`] = `
 Object {
-  "devServer": Object {
-    "headers": Object {
-      "Access-Control-Allow-Origin": "*",
-    },
-  },
   "output": Object {
     "libraryTarget": "umd",
     "publicPath": "//localhost:8080/",

package/tests/cli.test.tsx

@@ -207,6 +207,12 @@ describe('plugin-garfish cli', () => {
     });
 
     const generateConfig = webpackConfig.toConfig();
+    expect(config[0].tools.devServer).toMatchObject({
+      headers: {
+        'Access-Control-Allow-Origin': '*',
+      },
+    });
+
     expect(generateConfig).toMatchSnapshot();
     expect(generateConfig).toMatchObject({
       output: {
@@ -231,7 +237,7 @@ describe('plugin-garfish cli', () => {
         internalDirectory: 'test'
       }),
     } as any);
-    
+
     lifecycle && lifecycle.config();
     lifecycle && lifecycle.addRuntimeExports()
     expect(addExportList).toMatchSnapshot();