@modern-js/runtime 1.16.0 → 1.16.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/runtime
 
+## 1.16.1
+
+### Patch Changes
+
+- fix: runtime type
+
+  fix: 修复 runtime 类型定义
+
 ## 1.16.0
 
 ### Minor Changes

package/dist/js/modern/core/compatible.js

@@ -13,8 +13,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React, { useContext, useMemo } from 'react';
 import defaultReactDOM from 'react-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
+import { RuntimeReactContext } from "../runtime-context";
 import { runtime } from "./plugin";
-import { RuntimeReactContext } from "./runtime-context";
 import { createLoaderManager } from "./loader/loaderManager";
 import { jsx as _jsx } from "react/jsx-runtime";
 const IS_REACT18 = process.env.IS_REACT18 === 'true';

package/dist/js/modern/core/index.js

@@ -2,6 +2,6 @@ export { createPlugin, createRuntime, runtime, registerInit, registerPrefetch }
 export { defineConfig, getConfig } from "./app-config";
 // compatible
 export * from "./compatible";
-export { RuntimeReactContext } from "./runtime-context";
+export { RuntimeReactContext } from "../runtime-context";
 export * from "./loader";
 export * from '@modern-js/plugin';

package/dist/js/modern/core/loader/useLoader.js

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { useContext, useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import invariant from 'invariant';
-import { RuntimeReactContext } from "../runtime-context";
+import { RuntimeReactContext } from "../../runtime-context";
 import { LoaderStatus } from "./loaderManager";
 
 const useLoader = (loaderFn, options = {

package/dist/js/modern/ssr/index.node.js

@@ -28,7 +28,9 @@ const plugin = () => ({
         }
 
         if (!isBrowser()) {
-          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : context.ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
+          var _context$ssrContext;
+
+          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : (_context$ssrContext = context.ssrContext) === null || _context$ssrContext === void 0 ? void 0 : _context$ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
           return html;
         }
 
@@ -51,6 +53,7 @@ const plugin = () => ({
         context,
         pickedContext
       }, next) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
         const {
           request,
           response

package/dist/js/modern/ssr/serverRender/index.js

@@ -1,5 +1,4 @@
 import { run } from '@modern-js/utils/ssr';
-import { RuntimeContext } from "../../core";
 import { PreRender } from "../react/prerender";
 import SSREntry from "./entry";
 import { time } from "./measure";

package/dist/js/node/core/compatible.js

@@ -11,9 +11,9 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 
 var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
 
-var _plugin = require("./plugin");
+var _runtimeContext = require("../runtime-context");
 
-var _runtimeContext = require("./runtime-context");
+var _plugin = require("./plugin");
 
 var _loaderManager = require("./loader/loaderManager");
 

package/dist/js/node/core/index.js

@@ -80,7 +80,7 @@ Object.keys(_compatible).forEach(function (key) {
   });
 });
 
-var _runtimeContext = require("./runtime-context");
+var _runtimeContext = require("../runtime-context");
 
 var _loader = require("./loader");
 

package/dist/js/node/core/loader/useLoader.js

@@ -9,7 +9,7 @@ var _react = require("react");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _runtimeContext = require("../runtime-context");
+var _runtimeContext = require("../../runtime-context");
 
 var _loaderManager = require("./loaderManager");
 

package/dist/js/node/ssr/index.node.js

@@ -54,7 +54,9 @@ const plugin = () => ({
         }
 
         if (!(0, _common.isBrowser)()) {
-          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : context.ssrContext.distDir) || _path.default.join(process.cwd(), 'dist'), App);
+          var _context$ssrContext;
+
+          const html = await require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : (_context$ssrContext = context.ssrContext) === null || _context$ssrContext === void 0 ? void 0 : _context$ssrContext.distDir) || _path.default.join(process.cwd(), 'dist'), App);
           return html;
         }
 
@@ -77,6 +79,7 @@ const plugin = () => ({
         context,
         pickedContext
       }, next) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
         const {
           request,
           response

package/dist/js/node/ssr/serverRender/index.js

@@ -7,8 +7,6 @@ exports.render = void 0;
 
 var _ssr = require("@modern-js/utils/ssr");
 
-var _core = require("../../core");
-
 var _prerender = require("../react/prerender");
 
 var _entry = _interopRequireDefault(require("./entry"));

package/dist/js/treeshaking/core/compatible.js

@@ -7,8 +7,8 @@ var _excluded = ["context"];
 import React, { useContext, useMemo } from 'react';
 import defaultReactDOM from 'react-dom';
 import hoistNonReactStatics from 'hoist-non-react-statics';
+import { RuntimeReactContext } from "../runtime-context";
 import { runtime } from "./plugin";
-import { RuntimeReactContext } from "./runtime-context";
 import { createLoaderManager } from "./loader/loaderManager";
 import { jsx as _jsx } from "react/jsx-runtime";
 var IS_REACT18 = process.env.IS_REACT18 === 'true';

package/dist/js/treeshaking/core/index.js

@@ -2,6 +2,6 @@ export { createPlugin, createRuntime, runtime, registerInit, registerPrefetch }
 export { defineConfig, getConfig } from "./app-config";
 // compatible
 export * from "./compatible";
-export { RuntimeReactContext } from "./runtime-context";
+export { RuntimeReactContext } from "../runtime-context";
 export * from "./loader";
 export * from '@modern-js/plugin';

package/dist/js/treeshaking/core/loader/useLoader.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { useContext, useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import invariant from 'invariant';
-import { RuntimeReactContext } from "../runtime-context";
+import { RuntimeReactContext } from "../../runtime-context";
 import { LoaderStatus } from "./loaderManager";
 
 var useLoader = function useLoader(loaderFn) {

package/dist/js/treeshaking/ssr/index.node.js

@@ -19,7 +19,8 @@ var plugin = function plugin() {
       return {
         server: function () {
           var _server = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-            var App, context, html;
+            var App, context, _context$ssrContext, html;
+
             return _regeneratorRuntime().wrap(function _callee$(_context2) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
@@ -39,7 +40,7 @@ var plugin = function plugin() {
                     }
 
                     _context2.next = 5;
-                    return require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : context.ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
+                    return require("./serverRender").render(context, (context === null || context === void 0 ? void 0 : (_context$ssrContext = context.ssrContext) === null || _context$ssrContext === void 0 ? void 0 : _context$ssrContext.distDir) || path.join(process.cwd(), 'dist'), App);
 
                   case 5:
                     html = _context2.sent;
@@ -64,19 +65,21 @@ var plugin = function plugin() {
         }(),
         init: function init(_ref2, next) {
           var context = _ref2.context;
-          var request = context.ssrContext.request;
+          var _ref3 = context.ssrContext,
+              request = _ref3.request;
           context.ssrContext.request = formatServer(request);
           return next({
             context: context
           });
         },
-        pickContext: function pickContext(_ref3, next) {
-          var context = _ref3.context,
-              pickedContext = _ref3.pickedContext;
+        pickContext: function pickContext(_ref4, next) {
+          var context = _ref4.context,
+              pickedContext = _ref4.pickedContext;
 
-          var _context$ssrContext = context === null || context === void 0 ? void 0 : context.ssrContext,
-              request = _context$ssrContext.request,
-              response = _context$ssrContext.response;
+          // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
+          var _ref5 = context === null || context === void 0 ? void 0 : context.ssrContext,
+              request = _ref5.request,
+              response = _ref5.response;
 
           var initialData = context.initialData;
           return next({

package/dist/js/treeshaking/ssr/serverRender/index.js

@@ -1,7 +1,6 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { run } from '@modern-js/utils/ssr';
-import { RuntimeContext } from "../../core";
 import { PreRender } from "../react/prerender";
 import SSREntry from "./entry";
 import { time } from "./measure";

package/dist/types/core/compatible.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
+import { TRuntimeContext } from '../runtime-context';
 import { Plugin } from './plugin';
-import { TRuntimeContext } from './runtime-context';
 export declare type CreateAppOptions = {
   plugins: Plugin[];
 };

package/dist/types/core/index.d.ts

@@ -3,7 +3,7 @@ export type { Plugin } from './plugin';
 export { defineConfig, getConfig } from './app-config';
 export type { AppConfig } from './app-config';
 export * from './compatible';
-export type { TRuntimeContext, RuntimeContext } from './runtime-context';
-export { RuntimeReactContext } from './runtime-context';
+export type { TRuntimeContext, RuntimeContext } from '../runtime-context';
+export { RuntimeReactContext } from '../runtime-context';
 export * from './loader';
 export * from '@modern-js/plugin';

package/dist/types/core/plugin.d.ts

@@ -1,6 +1,6 @@
 import type React from 'react';
 import { Setup, ToThreads, CommonAPI, PluginOptions } from '@modern-js/plugin';
-import type { RuntimeContext, TRuntimeContext } from './runtime-context';
+import type { RuntimeContext, TRuntimeContext } from '../runtime-context';
 export interface AppProps {}
 declare const runtimeHooks: {
   hoc: import("@modern-js/plugin").Pipeline<{

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import type { StateConfig } from './state';
 import type { RouterConfig } from './router';
-export type { Plugin, RuntimeContext, TRuntimeContext, AppConfig } from './core';
+export type { Plugin, AppConfig } from './core';
+export type { BaseRuntimeContext, RuntimeContext, BaseTRuntimeContext, TRuntimeContext } from './runtime-context';
 export { createApp, createPlugin, useLoader, bootstrap, RuntimeReactContext, registerPrefetch, defineConfig, registerInit, useRuntimeContext } from './core';
 export { StateConfig, RouterConfig };
 declare module './core' {

package/dist/types/runtime-context.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="react" />
+import { Store } from '@modern-js-reduck/store';
+import { createLoaderManager } from './core/loader/loaderManager';
+import { runtime } from './core/plugin';
+import { SSRServerContext } from './ssr/serverRender/type';
+export interface BaseRuntimeContext {
+  loaderManager: ReturnType<typeof createLoaderManager>;
+  runner: ReturnType<typeof runtime.init>;
+  ssrContext?: SSRServerContext;
+  store?: Store;
+}
+export interface RuntimeContext extends BaseRuntimeContext {
+  [key: string]: any;
+}
+export declare const RuntimeReactContext: import("react").Context<RuntimeContext>;
+export interface BaseTRuntimeContext {
+  initialData?: Record<string, unknown>;
+  request?: SSRServerContext['request'];
+  response?: SSRServerContext['response'];
+  store?: Store;
+}
+export interface TRuntimeContext extends BaseTRuntimeContext {
+  [key: string]: any;
+}

package/dist/types/ssr/index.d.ts

@@ -1,13 +1,6 @@
 import type { Plugin } from '../core';
 import { RenderLevel, SSRServerContext } from './serverRender/type';
 declare module '../core' {
-  interface RuntimeContext {
-    ssrContext: SSRServerContext;
-  }
-  interface TRuntimeContext {
-    request: SSRServerContext['request'];
-    response: SSRServerContext['response'];
-  }
   interface SSRContainer {
     renderLevel: RenderLevel;
     context?: SSRServerContext;

package/dist/types/ssr/serverRender/index.d.ts

@@ -1,8 +1,3 @@
 import { RuntimeContext } from '../../core';
 import { ModernSSRReactComponent } from './type';
-declare module '@modern-js/runtime' {
-  interface RuntimeContext {
-    ssrContext?: any;
-  }
-}
 export declare const render: (ctx: RuntimeContext, _: string | undefined, App: ModernSSRReactComponent) => Promise<string>;

package/dist/types/state/runtime/plugin.d.ts

@@ -1,12 +1,6 @@
-import { createStore, Store } from '@modern-js-reduck/store';
+import { createStore } from '@modern-js-reduck/store';
 import type { Plugin } from '../../core';
 declare module '../../core' {
-  interface RuntimeContext {
-    store: Store;
-  }
-  interface TRuntimeContext {
-    store: Store;
-  }
   interface SSRData {
     storeState: any;
   }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.16.0",
+  "version": "1.16.1",
   "jsnext:source": "./src/index.ts",
   "types": "./type.d.ts",
   "main": "./dist/js/node/index.js",

package/dist/types/core/runtime-context.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="react" />
-import { createLoaderManager } from './loader/loaderManager';
-import { runtime } from './plugin';
-export interface RuntimeContext {
-  loaderManager: ReturnType<typeof createLoaderManager>;
-  runner: ReturnType<typeof runtime.init>;
-  [key: string]: any;
-}
-export declare const RuntimeReactContext: import("react").Context<RuntimeContext>;
-export interface TRuntimeContext {
-  initialData?: Record<string, unknown>;
-  [key: string]: any;
-}