@modern-js/server-core 1.3.4 → 1.4.0-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @modern-js/server-plugin
 
+## 1.4.0-alpha.0
+
+### Minor Changes
+
+- 77a8e9e1b: feat: support bff operators
+
+### Patch Changes
+
+- f29e9bacf: feat: simplify context usage, no longer depend on containers
+- a90bc96bd: perf(babel): skip babel-plugin-import if package not installed
+- Updated dependencies [9cd364e06]
+- Updated dependencies [f29e9bacf]
+- Updated dependencies [a90bc96bd]
+  - @modern-js/utils@1.7.9-alpha.0
+  - @modern-js/plugin@1.4.0-alpha.0
+
+## 1.3.5
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- Updated dependencies [d5913bd96]
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/plugin@1.3.4
+  - @modern-js/utils@1.7.3
+
 ## 1.3.4
 
 ### Patch Changes

package/dist/js/modern/loadPlugins.js

@@ -4,28 +4,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { compatRequire } from '@modern-js/utils';
+import { compatRequire, tryResolve } from '@modern-js/utils';
 import { createPlugin } from "./plugin";
-
-const tryResolve = (name, appDirectory) => {
-  let filePath = '';
-
-  try {
-    filePath = require.resolve(name, {
-      paths: [appDirectory]
-    });
-    delete require.cache[filePath];
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      throw new Error(`Can not find plugin ${name}.`);
-    }
-
-    throw err;
-  }
-
-  return filePath;
-};
-
 export const loadPlugins = (plugins, appDirectory) => {
   const resolvePlugin = p => {
     const isPluginInstance = typeof p !== 'string' && !Array.isArray(p);

package/dist/js/modern/plugin.js

@@ -1,7 +1,5 @@
 import { createContext, createAsyncManager, createAsyncPipeline, createAsyncWaterfall, createParallelWorkflow, createWaterfall } from '@modern-js/plugin';
-import { enable } from '@modern-js/plugin/node';
-enable(); // collect all middleware register in server plugins
-
+// collect all middleware register in server plugins
 const gather = createParallelWorkflow();
 // config
 const config = createWaterfall();
@@ -35,6 +33,7 @@ const beforeSend = createAsyncPipeline();
 const afterSend = createParallelWorkflow();
 const reset = createParallelWorkflow();
 export const AppContext = createContext({});
+export const setAppContext = value => AppContext.set(value);
 export const ConfigContext = createContext({});
 /**
  * Get original content of user config.
@@ -48,7 +47,8 @@ export const useConfigContext = () => ConfigContext.use().value;
 export const useAppContext = () => AppContext.use().value;
 const pluginAPI = {
   useAppContext,
-  useConfigContext
+  useConfigContext,
+  setAppContext
 };
 const serverHooks = {
   // server hook

package/dist/js/node/loadPlugins.js

@@ -15,25 +15,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const tryResolve = (name, appDirectory) => {
-  let filePath = '';
-
-  try {
-    filePath = require.resolve(name, {
-      paths: [appDirectory]
-    });
-    delete require.cache[filePath];
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') {
-      throw new Error(`Can not find plugin ${name}.`);
-    }
-
-    throw err;
-  }
-
-  return filePath;
-};
-
 const loadPlugins = (plugins, appDirectory) => {
   const resolvePlugin = p => {
     const isPluginInstance = typeof p !== 'string' && !Array.isArray(p);
@@ -45,7 +26,7 @@ const loadPlugins = (plugins, appDirectory) => {
     }
 
     const [pkg, options] = typeof p === 'string' ? [p, undefined] : p;
-    const pluginPath = tryResolve(pkg, appDirectory);
+    const pluginPath = (0, _utils.tryResolve)(pkg, appDirectory);
     let module = (0, _utils.compatRequire)(pluginPath);
     const useNewSyntax = typeof module === 'function';
 

package/dist/js/node/plugin.js

@@ -3,14 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useConfigContext = exports.useAppContext = exports.serverManager = exports.createServerManager = exports.createPlugin = exports.ConfigContext = exports.AppContext = void 0;
+exports.useConfigContext = exports.useAppContext = exports.setAppContext = exports.serverManager = exports.createServerManager = exports.createPlugin = exports.ConfigContext = exports.AppContext = void 0;
 
 var _plugin = require("@modern-js/plugin");
 
-var _node = require("@modern-js/plugin/node");
-
-(0, _node.enable)(); // collect all middleware register in server plugins
-
+// collect all middleware register in server plugins
 const gather = (0, _plugin.createParallelWorkflow)();
 // config
 const config = (0, _plugin.createWaterfall)();
@@ -45,6 +42,10 @@ const afterSend = (0, _plugin.createParallelWorkflow)();
 const reset = (0, _plugin.createParallelWorkflow)();
 const AppContext = (0, _plugin.createContext)({});
 exports.AppContext = AppContext;
+
+const setAppContext = value => AppContext.set(value);
+
+exports.setAppContext = setAppContext;
 const ConfigContext = (0, _plugin.createContext)({});
 /**
  * Get original content of user config.
@@ -65,7 +66,8 @@ const useAppContext = () => AppContext.use().value;
 exports.useAppContext = useAppContext;
 const pluginAPI = {
   useAppContext,
-  useConfigContext
+  useConfigContext,
+  setAppContext
 };
 const serverHooks = {
   // server hook

package/dist/types/plugin.d.ts

@@ -34,6 +34,7 @@ export declare type RequestResult = {
 export declare type SSRServerContext = Record<string, unknown>;
 export declare type RenderContext = Record<string, unknown>;
 export declare const AppContext: import("@modern-js/plugin").Context<ISAppContext>;
+export declare const setAppContext: (value: ISAppContext) => void;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
 /**
  * Get original content of user config.
@@ -48,6 +49,7 @@ export declare const useAppContext: () => ISAppContext;
 declare const pluginAPI: {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 };
 declare const serverHooks: {
   gather: import("@modern-js/plugin").ParallelWorkflow<{
@@ -170,6 +172,7 @@ export declare const createServerManager: () => import("@modern-js/plugin").Asyn
 }, {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 }>;
 export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
@@ -228,6 +231,7 @@ export declare const serverManager: import("@modern-js/plugin").AsyncManager<{
 }, {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 }>;
 /** Plugin options of a server plugin. */
 
@@ -295,6 +299,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
 }, {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 }> | undefined, options?: PluginOptions<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
     addWebMiddleware: (_input: any) => void;
@@ -406,6 +411,7 @@ export declare const createPlugin: (setup?: AsyncSetup<{
 }, {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 }>> | undefined) => import("@modern-js/plugin").AsyncPlugin<{
   gather: import("@modern-js/plugin").ParallelWorkflow<{
     addWebMiddleware: (_input: any) => void;
@@ -463,5 +469,6 @@ export declare const createPlugin: (setup?: AsyncSetup<{
 }, {
   useAppContext: () => ISAppContext;
   useConfigContext: () => UserConfig;
+  setAppContext: (value: ISAppContext) => void;
 }>;
 export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.4",
+  "version": "1.4.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,15 +28,15 @@
     }
   },
   "dependencies": {
-    "@modern-js/plugin": "^1.3.3",
-    "@modern-js/utils": "^1.7.2"
+    "@modern-js/plugin": "^1.4.0-alpha.0",
+    "@modern-js/utils": "^1.7.9-alpha.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.10.1",
-    "@modern-js/types": "1.5.2",
+    "@modern-js/core": "1.12.2-alpha.0",
+    "@modern-js/types": "1.5.5-alpha.0",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
-    "@types/jest": "^26",
+    "@types/jest": "^27",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
@@ -55,10 +55,33 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "wireit": {
+    "build": {
+      "command": "modern build",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest --passWithNoTests",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json",
+        "tests/**/*"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
-    "test": "jest --passWithNoTests"
+    "build": "wireit",
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,2 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {},
-    "types": ["node", "jest"]
-  },
-  "include": ["src"]
-}