@modern-js/prod-server 1.1.0 → 1.1.1

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modern-js/prod-server
 
+## 1.1.1
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/server-core@1.3.1
+
 ## 1.1.0
 
 ### Minor Changes

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.0",
+  "version": "1.1.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.4.0",
+    "@modern-js/utils": "^1.5.0",
     "@babel/compat-data": "^7.17.0",
-    "@modern-js/server-core": "^1.3.0",
+    "@modern-js/server-core": "^1.3.1",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -45,8 +45,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "^1.4.0",
-    "@modern-js/core": "1.7.0",
+    "@modern-js/types": "^1.5.0",
+    "@modern-js/core": "1.8.0",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",

package/tests/.eslintrc.js

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

package/tests/context.test.ts

@@ -1,52 +0,0 @@
-import EventEmitter from 'events';
-import { Readable } from 'stream';
-import httpMocks from 'node-mocks-http';
-import { createContext } from '../src/libs/context';
-
-describe('test server context', () => {
-  test('should route api work correctly', () => {
-    const req = httpMocks.createRequest({
-      url: '/pathname?foo=baz',
-      headers: {
-        host: 'modernjs.com',
-      },
-      eventEmitter: Readable,
-      method: 'GET',
-    });
-    const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
-    const context = createContext(req, res);
-    const {
-      method,
-      url,
-      origin,
-      host,
-      path,
-      href,
-      query,
-      querystring,
-      protocol,
-      params,
-    } = context;
-
-    expect(method).toBe('GET');
-    expect(url).toBe('/pathname?foo=baz');
-    expect(origin).toBe('http://modernjs.com');
-    expect(host).toBe('modernjs.com');
-    expect(path).toBe('/pathname');
-    expect(href).toBe('http://modernjs.com/pathname?foo=baz');
-    expect(query).toEqual({ foo: 'baz' });
-    expect(querystring).toBe('foo=baz');
-    expect(protocol).toBe('http');
-    expect(params).toEqual({});
-
-    expect(context.serverData).toEqual({});
-    context.setServerData('foo', {
-      name: 'foo',
-    });
-    expect(context.serverData).toEqual({
-      foo: {
-        name: 'foo',
-      },
-    });
-  });
-});

package/tests/fixtures/hosting-files/static/index.js

@@ -1 +0,0 @@
-console.info('index.js');

package/tests/fixtures/pure/modern.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  server: {
-    ssr: true,
-  },
-};

package/tests/fixtures/pure/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "prod-server-pure",
-  "version": "0.1.0",
-  "scripts": {
-    "reset": "del-cli node_modules",
-    "dev": "modern dev",
-    "build": "modern build",
-    "start": "modern start",
-    "new": "modern new",
-    "lint": "modern lint",
-    "deploy": "modern deploy"
-  },
-  "dependencies": {},
-  "devDependencies": {},
-  "modernConfig": {
-    "runtime": {
-      "router": true,
-      "state": true
-    }
-  }
-}

package/tests/fixtures/pure/src/App.css

@@ -1,119 +0,0 @@
-html,
-body {
-  padding: 0;
-  margin: 0;
-  font-family: nunito_for_arco, Helvetica Neue, Helvetica, PingFang SC,
-    Hiragino Sans GB, Microsoft YaHei, 微软雅黑, Arial, sans-serif;
-}
-
-* {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  box-sizing: border-box;
-}
-
-.container {
-  min-height: 100vh;
-  max-width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-main {
-  padding: 5rem 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer {
-  width: 100%;
-  height: 80px;
-  border-top: 1px solid #eaeaea;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: #470000;
-}
-
-.footer a {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-grow: 1;
-  color: #f4f4f4;
-  text-decoration: none;
-  font-size: 1.1rem;
-}
-
-.logo {
-  margin-bottom: 2rem;
-}
-
-.logo svg {
-  width: 450px;
-  height: 132px;
-}
-
-.description {
-  text-align: center;
-  line-height: 1.5;
-  font-size: 1.5rem;
-}
-
-.code {
-  background: #fafafa;
-  border-radius: 5px;
-  padding: 0.75rem;
-  font-size: 1.1rem;
-  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Courier New, monospace;
-}
-
-@media (max-width: 600px) {
-  .grid {
-    width: 100%;
-    flex-direction: column;
-  }
-}
-
-.grid {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-wrap: wrap;
-  width: 800px;
-  margin-top: 3rem;
-}
-
-.card {
-  margin: 1rem;
-  padding: 1.5rem;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100px;
-  color: inherit;
-  text-decoration: none;
-  border: 1px solid #470000;
-  color: #470000;
-  transition: color 0.15s ease, border-color 0.15s ease;
-  width: 45%;
-}
-
-.card:hover,
-.card:focus,
-.card:active {
-  transform: scale(1.05);
-  transition: 0.1s ease-in-out;
-}
-
-.card h2 {
-  font-size: 1.5rem;
-  margin: 0;
-  padding: 0;
-}

package/tests/fixtures/pure/src/App.tsx

@@ -1,43 +0,0 @@
-import './App.css';
-
-const App = () => (
-  <div className="container">
-    <main>
-      <div className="logo">
-        <img
-          src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png"
-          width="300"
-          alt="Modern.js Logo"
-        />
-      </div>
-      <p className="description">
-        Get started by editing <code className="code">src/home/App.tsx</code>
-      </p>
-      <div className="grid">
-        <a href="https://modernjs.dev/docs/start" className="card">
-          <h2>Quick Start Tencent</h2>
-        </a>
-        <a href="https://modernjs.dev/docs/guides" className="card">
-          <h2>Handbook</h2>
-        </a>
-        <a href="https://modernjs.dev/docs/apis" className="card">
-          <h2>API Reference </h2>
-        </a>
-        <a
-          href="https://modernjs.dev/coming-soon"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="card">
-          <h2>Community </h2>
-        </a>
-      </div>
-    </main>
-    <footer className="footer">
-      <a href="https://modernjs.dev" target="_blank" rel="noopener noreferrer">
-        Powered by Modern.js
-      </a>
-    </footer>
-  </div>
-);
-
-export default App;

package/tests/fixtures/pure/test-dist/bundles/main.js

@@ -1,5 +0,0 @@
-const { SERVER_RENDER_FUNCTION_NAME } = require('@modern-js/utils');
-
-module.exports = {
-  [SERVER_RENDER_FUNCTION_NAME]: () => '<div>Modern.js</div>',
-};

package/tests/fixtures/pure/test-dist/html/main/index.html

@@ -1,36 +0,0 @@
-
-<!DOCTYPE html>
-<html>
-<head>
-  
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-<meta http-equiv="x-ua-compatible" content="ie=edge">
-<meta name="renderer" content="webkit">
-<meta name="layoutmode" content="standard">
-<meta name="imagemode" content="force">
-<meta name="wap-font-scale" content="no">
-<meta name="format-detection" content="telephone=no">
-  <title></title>
-
-  
-
-  <script>
-    window.__assetPrefix__ = '';
-  </script>
-  
-<script defer src="/static/js/runtime-main.js"></script><script defer src="/static/js/vendors-node_modules_pnpm_babel_runtime_7_16_7_node_modules_babel_runtime_regenerator_index_j-7f9278.js"></script><script defer src="/static/js/main.js"></script></head>
-
-<body>
-  <!--<?- chunksMap.css ?>-->
-  <noscript>
-    We're sorry but react app doesn't work properly without JavaScript enabled. Please enable it to continue.
-  </noscript>
-  <div id="root"><!--<?- html ?>--></div>
-  
-  <!--<?- chunksMap.js ?>-->
-  <!--<?- SSRDataScript ?>-->
-  
-</body>
-
-</html>

package/tests/fixtures/pure/test-dist/route.json

@@ -1,31 +0,0 @@
-{
-  "routes": [
-    {
-      "urlPath": "/",
-      "entryName": "main",
-      "entryPath": "html/main/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/main.js"
-    },
-    {
-      "urlPath": "/500",
-      "entryName": "500",
-      "entryPath": "html/main/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/main.js"
-    },
-    {
-      "urlPath": "/404",
-      "entryName": "500",
-      "entryPath": "html/main/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/main.js"
-    }
-  ]
-}

package/tests/fixtures/pure/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "paths": {
-      "@shared/*": ["./shared/*"]
-    }
-  },
-  "include": ["src", "shared", "config"]
-}

package/tests/fixtures/reader/index.ts

@@ -1,3 +0,0 @@
-export default {
-  name: 'modern',
-};

package/tests/fixtures/route-spec/dynamic.json

@@ -1,13 +0,0 @@
-{
-  "routes": [
-    {
-      "urlPath": "/entry/:id",
-      "entryName": "entry",
-      "entryPath": "html/entry/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/entry.js"
-    }
-  ]
-}

package/tests/fixtures/route-spec/index.json

@@ -1,29 +0,0 @@
-{
-  "routes": [
-    {
-      "urlPath": "/entry",
-      "entryName": "entry",
-      "entryPath": "html/entry/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/entry.js"
-    },
-    {
-      "urlPath": "/home",
-      "entryName": "home",
-      "entryPath": "html/home/index.html",
-      "isSPA": true,
-      "isSSR": true,
-      "enableModernMode": false,
-      "bundle": "bundles/home.js"
-    },
-    {
-      "urlPath": "/api",
-      "isApi": true,
-      "entryPath": "",
-      "isSPA": false,
-      "isSSR": false
-    }
-  ]
-}

package/tests/fixtures/ssr/bundle-error.js

@@ -1,3 +0,0 @@
-module.exports = {
-  error: () => '<div>Modern.js</div>',
-};

package/tests/fixtures/ssr/bundle.js

@@ -1,5 +0,0 @@
-const { SERVER_RENDER_FUNCTION_NAME } = require('@modern-js/utils');
-
-module.exports = {
-  [SERVER_RENDER_FUNCTION_NAME]: () => '<div>Modern.js</div>',
-};

package/tests/fixtures/ssr/tpl.html

@@ -1,11 +0,0 @@
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-</head>
-<body>
-  <div>csr</div>
-</body>
-</html>

package/tests/fixtures/static-dir/bar.html

@@ -1,11 +0,0 @@
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>bar</title>
-</head>
-<body>
-
-</body>
-</html>

package/tests/fixtures/static-dir/baz/index.html

@@ -1,11 +0,0 @@
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>baz</title>
-</head>
-<body>
-
-</body>
-</html>

package/tests/fixtures/static-dir/foo/index.html

@@ -1,11 +0,0 @@
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>foo</title>
-</head>
-<body>
-
-</body>
-</html>

package/tests/helper.ts

@@ -1,8 +0,0 @@
-export const createDoc = () => `<html>
-  <head>
-    <title>mock</title>
-  </head>
-  <body>
-    <div>hello</div>
-  </body>
-  </html>`;

package/tests/hook.test.ts

@@ -1,44 +0,0 @@
-import { createRouteAPI } from '../src/libs/hook-api/route';
-import { createTemplateAPI } from '../src/libs/hook-api/template';
-import { RouteMatchManager } from '../src/libs/route';
-import { createDoc } from './helper';
-import spec from './fixtures/route-spec/index.json';
-
-describe('test hook api', () => {
-  test('should route api work correctly', () => {
-    const manager = new RouteMatchManager();
-    manager.reset(spec.routes);
-    const matcher = manager.match('/home');
-
-    const routeAPI = createRouteAPI(matcher!, manager, '');
-    expect(routeAPI.cur().entryName).toBe('home');
-    expect(routeAPI.get('entry')?.entryPath).toBe('html/entry/index.html');
-
-    expect(routeAPI.use('home')).toBeTruthy();
-    expect(routeAPI.cur().entryName).toBe('home');
-  });
-
-  test('should template api work correctly', () => {
-    const content = createDoc();
-    const templateAPI = createTemplateAPI(content);
-
-    expect(templateAPI.get()).toMatch(content);
-
-    templateAPI.replace('mock', 'replace');
-    expect(templateAPI.get()).toMatch('replace');
-
-    templateAPI.appendBody('after body');
-    templateAPI.prependBody('before body');
-    templateAPI.appendHead('after head');
-    templateAPI.prependHead('before head');
-
-    const newContent = templateAPI.get();
-    expect(newContent).toMatch('<head>before head');
-    expect(newContent).toMatch('<body>before body');
-    expect(newContent).toMatch('after head</head>');
-    expect(newContent).toMatch('after body</body>');
-
-    templateAPI.set('<div>empty</div>');
-    expect(templateAPI.get()).toBe('<div>empty</div>');
-  });
-});

package/tests/loadConfig.test.ts

@@ -1,65 +0,0 @@
-import * as path from 'path';
-import type { NormalizedConfig } from '@modern-js/core';
-import { DEFAULT_SERVER_CONFIG } from '@modern-js/utils';
-import mergeDeep from 'merge-deep';
-import { getServerConfigPath } from '../src/libs/loadConfig';
-
-describe('test loadConfig', () => {
-  test('should merge CliConfig and ServerConfig correctly', () => {
-    const cliConfig = {
-      bff: {
-        prefix: '/bff',
-      },
-      source: {
-        envVars: ['VERSION'],
-      },
-    };
-
-    const serverConfig = {
-      bff: {
-        proxy: {
-          '/api': {
-            target: 'https://cnodejs.org',
-            pathRewrite: { '/api/topics': '/api/v1/topics' },
-            changeOrigin: true,
-          },
-        },
-      },
-    };
-
-    const config = mergeDeep(
-      cliConfig as unknown as NormalizedConfig,
-      serverConfig,
-    );
-
-    expect(config).toEqual({
-      bff: {
-        prefix: '/bff',
-        proxy: {
-          '/api': {
-            target: 'https://cnodejs.org',
-            pathRewrite: { '/api/topics': '/api/v1/topics' },
-            changeOrigin: true,
-          },
-        },
-      },
-      source: {
-        envVars: ['VERSION'],
-      },
-    });
-  });
-
-  test('should get server config path correctly', () => {
-    const distDirectory = path.normalize(
-      '/Users/user/project/local-test-project/dist',
-    );
-    const serverConfigFile = DEFAULT_SERVER_CONFIG;
-    const serverConfigPath = path.normalize(
-      `/Users/user/project/local-test-project/dist/${DEFAULT_SERVER_CONFIG}.js`,
-    );
-
-    expect(getServerConfigPath(distDirectory, serverConfigFile)).toEqual(
-      serverConfigPath,
-    );
-  });
-});