@modern-js/prod-server 1.21.6 → 2.0.0-alpha.0

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.6",
+  "version": "2.0.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,26 +25,45 @@
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
+    },
+    "./worker": {
+      "node": {
+        "jsnext:source": "./src/worker-server.ts",
+        "import": "./dist/js/modern/worker-server.js",
+        "require": "./dist/js/node/worker-server.js"
+      },
+      "default": "./dist/js/treeshaking/worker-server.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      ".": [
+        "./dist/types/index.d.ts"
+      ],
+      "worker": [
+        "./dist/types/worker-server.d.ts"
+      ]
     }
   },
   "dependencies": {
-    "@babel/compat-data": "^7.17.10",
+    "@modern-js/utils": "2.0.0-beta.4",
+    "@modern-js/server-core": "2.0.0-beta.4",
     "axios": "^0.24.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
-    "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
     "http-proxy-middleware": "^2.0.1",
     "ignore-styles": "^5.0.1",
     "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
-    "serve-static": "^1.14.1",
-    "ua-parser-js": "^0.7.28",
-    "@modern-js/utils": "1.21.6",
-    "@modern-js/server-core": "1.21.6"
+    "serve-static": "^1.14.1"
   },
   "devDependencies": {
+    "@modern-js/types": "2.0.0-beta.4",
+    "@modern-js/server-core": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",
@@ -53,53 +72,20 @@
     "@types/etag": "^1.8.1",
     "@types/fresh": "^0.5.0",
     "@types/serve-static": "^1.13.10",
-    "@types/ua-parser-js": "^0.7.36",
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4",
-    "@modern-js/types": "1.21.6",
-    "@modern-js/core": "1.21.6",
-    "@scripts/jest-config": "1.21.6",
-    "@scripts/build": "1.21.6"
+    "typescript": "^4"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
-    "new": "modern new",
-    "build": "wireit",
-    "dev": "modern build --watch",
-    "test": "wireit"
+    "new": "modern-lib new",
+    "build": "modern-lib build",
+    "dev": "modern-lib build --watch",
+    "test": "jest"
   }
 }

package/dist/js/modern/libs/render/modern/browser-list.js

@@ -1,7 +0,0 @@
-export const NativeModuleNameMap = {
-  Chrome: 'chrome',
-  'Mobile Safari': 'ios_saf',
-  Safari: 'safari',
-  Edge: 'edge',
-  Firefox: 'firefox'
-};

package/dist/js/modern/libs/render/modern/index.js

@@ -1,48 +0,0 @@
-import Parser from 'ua-parser-js';
-import compareVersions from 'compare-versions';
-import { NativeModuleNameMap } from "./browser-list";
-
-const nativeModules = require('@babel/compat-data/native-modules');
-
-export const supportModern = context => {
-  var _context$query;
-
-  if ((_context$query = context.query) !== null && _context$query !== void 0 && _context$query.modern_es6) {
-    return true;
-  } // no ua in request headers
-
-
-  const userAgent = context.headers['user-agent'];
-
-  if (!userAgent || typeof userAgent !== 'string') {
-    return false;
-  }
-
-  const parsedUA = Parser(userAgent);
-  const browserName = parsedUA.browser.name;
-  const browserVersion = parsedUA.browser.version;
-
-  if (!browserName || !browserVersion) {
-    return false;
-  }
-
-  const nativeUAName = NativeModuleNameMap[browserName];
-
-  if (!nativeUAName) {
-    return false;
-  }
-
-  const version = nativeModules['es6.module'][nativeUAName];
-
-  if (!version) {
-    return false;
-  }
-
-  try {
-    const result = compareVersions(browserVersion, version);
-    return result >= 0;
-  } catch (err) {
-    return false;
-  }
-};
-export const getModernEntry = filepath => filepath.replace(/\.html$/, '-es6.html');

package/dist/js/node/libs/render/modern/browser-list.js

@@ -1,14 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NativeModuleNameMap = void 0;
-const NativeModuleNameMap = {
-  Chrome: 'chrome',
-  'Mobile Safari': 'ios_saf',
-  Safari: 'safari',
-  Edge: 'edge',
-  Firefox: 'firefox'
-};
-exports.NativeModuleNameMap = NativeModuleNameMap;

package/dist/js/node/libs/render/modern/index.js

@@ -1,64 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.supportModern = exports.getModernEntry = void 0;
-
-var _uaParserJs = _interopRequireDefault(require("ua-parser-js"));
-
-var _compareVersions = _interopRequireDefault(require("compare-versions"));
-
-var _browserList = require("./browser-list");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const nativeModules = require('@babel/compat-data/native-modules');
-
-const supportModern = context => {
-  var _context$query;
-
-  if ((_context$query = context.query) !== null && _context$query !== void 0 && _context$query.modern_es6) {
-    return true;
-  } // no ua in request headers
-
-
-  const userAgent = context.headers['user-agent'];
-
-  if (!userAgent || typeof userAgent !== 'string') {
-    return false;
-  }
-
-  const parsedUA = (0, _uaParserJs.default)(userAgent);
-  const browserName = parsedUA.browser.name;
-  const browserVersion = parsedUA.browser.version;
-
-  if (!browserName || !browserVersion) {
-    return false;
-  }
-
-  const nativeUAName = _browserList.NativeModuleNameMap[browserName];
-
-  if (!nativeUAName) {
-    return false;
-  }
-
-  const version = nativeModules['es6.module'][nativeUAName];
-
-  if (!version) {
-    return false;
-  }
-
-  try {
-    const result = (0, _compareVersions.default)(browserVersion, version);
-    return result >= 0;
-  } catch (err) {
-    return false;
-  }
-};
-
-exports.supportModern = supportModern;
-
-const getModernEntry = filepath => filepath.replace(/\.html$/, '-es6.html');
-
-exports.getModernEntry = getModernEntry;

package/dist/types/libs/render/modern/browser-list.d.ts

@@ -1 +0,0 @@
-export declare const NativeModuleNameMap: Record<string, string>;

package/dist/types/libs/render/modern/index.d.ts

@@ -1,3 +0,0 @@
-import { ModernServerContext } from '@modern-js/types';
-export declare const supportModern: (context: ModernServerContext) => boolean;
-export declare const getModernEntry: (filepath: string) => string;