@modern-js/plugin-polyfill 1.2.0 → 1.2.3

package/.eslintrc.js

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

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/plugin-polyfill
 
+## 1.2.3
+
+### Patch Changes
+
+- c7dc7f54: migrate to new plugin style
+- 2008fdbd: convert two packages server part, support server load plugin itself
+
+## 1.2.2
+
+### Patch Changes
+
+- 272cab15: refactor server plugin manager
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [272cab15]
+  - @modern-js/core@1.4.0
+  - @modern-js/server-core@1.2.2
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+  - @modern-js/core@1.3.2
+  - @modern-js/server-plugin@1.2.1
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/modern/cli.js

@@ -1,23 +1,22 @@
-import { createPlugin, useResolvedConfigContext } from '@modern-js/core';
 import { defaultPolyfill } from "./const";
-export default createPlugin(() => ({
-  htmlPartials({
-    entrypoint,
-    partials
-  }) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const resolvedConfig = useResolvedConfigContext();
+export default (() => ({
+  name: '@modern-js/plugin-polyfill',
+  setup: api => ({
+    htmlPartials({
+      entrypoint,
+      partials
+    }) {
+      const resolvedConfig = api.useResolvedConfigContext();
 
-    if (resolvedConfig.output.polyfill === 'ua') {
-      partials.top.push(`<script src="${defaultPolyfill}" crossorigin></script>`);
-    }
+      if (resolvedConfig.output.polyfill === 'ua') {
+        partials.top.push(`<script src="${defaultPolyfill}" crossorigin></script>`);
+      }
 
-    return {
-      partials,
-      entrypoint
-    };
-  }
+      return {
+        partials,
+        entrypoint
+      };
+    }
 
-}), {
-  name: '@modern-js/plugin-polyfill'
-});
+  })
+}));

package/dist/js/modern/index.js

@@ -1,56 +1,56 @@
-import { createPlugin } from '@modern-js/server-plugin';
 import { getPolyfillString } from '@modern-js/polyfill-lib';
 import mime from 'mime-types';
 import Parser from 'ua-parser-js';
 import { defaultFeatures, defaultPolyfill } from "./const";
 import PolyfillCache, { generateCacheKey } from "./libs/cache";
-export default createPlugin(() => ({
-  preServerInit(_) {
-    const cache = new PolyfillCache();
-    const route = defaultPolyfill;
-    const features = defaultFeatures;
-    const minify = process.env.NODE_ENV === 'production';
-    const featureDig = Object.keys(features).map(name => {
-      const {
-        flags = ['gated']
-      } = features[name];
-      const flagStr = flags.join(',');
-      return `${name}-${flagStr}`;
-    }).join(',');
-    return async (context, next) => {
-      if (context.url !== route) {
-        return next();
-      }
+export default (() => ({
+  name: '@modern-js/plugin-polyfill',
+  setup: () => ({
+    preServerInit(_) {
+      const cache = new PolyfillCache();
+      const route = defaultPolyfill;
+      const features = defaultFeatures;
+      const minify = process.env.NODE_ENV === 'production';
+      const featureDig = Object.keys(features).map(name => {
+        const {
+          flags = ['gated']
+        } = features[name];
+        const flagStr = flags.join(',');
+        return `${name}-${flagStr}`;
+      }).join(',');
+      return async (context, next) => {
+        if (context.url !== route) {
+          return next();
+        }
 
-      const parsedUA = Parser(context.headers['user-agent']);
-      const {
-        name = '',
-        version = ''
-      } = parsedUA.browser;
-      const cacheKey = generateCacheKey({
-        name,
-        version,
-        features: featureDig,
-        minify
-      });
-      const matched = cache.get(cacheKey);
+        const parsedUA = Parser(context.headers['user-agent']);
+        const {
+          name = '',
+          version = ''
+        } = parsedUA.browser;
+        const cacheKey = generateCacheKey({
+          name,
+          version,
+          features: featureDig,
+          minify
+        });
+        const matched = cache.get(cacheKey);
 
-      if (matched) {
-        context.res.setHeader('content-type', mime.contentType('js'));
-        return context.res.end(matched);
-      }
+        if (matched) {
+          context.res.setHeader('content-type', mime.contentType('js'));
+          return context.res.end(matched);
+        }
 
-      const polyfill = await getPolyfillString({
-        uaString: context.headers['user-agent'],
-        minify,
-        features
-      });
-      cache.set(cacheKey, polyfill);
-      context.res.setHeader('content-type', mime.contentType('js'));
-      return context.res.end(polyfill);
-    };
-  }
+        const polyfill = await getPolyfillString({
+          uaString: context.headers['user-agent'],
+          minify,
+          features
+        });
+        cache.set(cacheKey, polyfill);
+        context.res.setHeader('content-type', mime.contentType('js'));
+        return context.res.end(polyfill);
+      };
+    }
 
-}), {
-  name: '@modern-js/plugin-polyfill'
-});
+  })
+}));

package/dist/js/node/cli.js

@@ -5,30 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _core = require("@modern-js/core");
-
 var _const = require("./const");
 
-var _default = (0, _core.createPlugin)(() => ({
-  htmlPartials({
-    entrypoint,
-    partials
-  }) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const resolvedConfig = (0, _core.useResolvedConfigContext)();
-
-    if (resolvedConfig.output.polyfill === 'ua') {
-      partials.top.push(`<script src="${_const.defaultPolyfill}" crossorigin></script>`);
+var _default = () => ({
+  name: '@modern-js/plugin-polyfill',
+  setup: api => ({
+    htmlPartials({
+      entrypoint,
+      partials
+    }) {
+      const resolvedConfig = api.useResolvedConfigContext();
+
+      if (resolvedConfig.output.polyfill === 'ua') {
+        partials.top.push(`<script src="${_const.defaultPolyfill}" crossorigin></script>`);
+      }
+
+      return {
+        partials,
+        entrypoint
+      };
     }
 
-    return {
-      partials,
-      entrypoint
-    };
-  }
-
-}), {
-  name: '@modern-js/plugin-polyfill'
+  })
 });
 
 exports.default = _default;

package/dist/js/node/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _serverPlugin = require("@modern-js/server-plugin");
-
 var _polyfillLib = require("@modern-js/polyfill-lib");
 
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
@@ -23,55 +21,56 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _serverPlugin.createPlugin)(() => ({
-  preServerInit(_) {
-    const cache = new _cache.default();
-    const route = _const.defaultPolyfill;
-    const features = _const.defaultFeatures;
-    const minify = process.env.NODE_ENV === 'production';
-    const featureDig = Object.keys(features).map(name => {
-      const {
-        flags = ['gated']
-      } = features[name];
-      const flagStr = flags.join(',');
-      return `${name}-${flagStr}`;
-    }).join(',');
-    return async (context, next) => {
-      if (context.url !== route) {
-        return next();
-      }
-
-      const parsedUA = (0, _uaParserJs.default)(context.headers['user-agent']);
-      const {
-        name = '',
-        version = ''
-      } = parsedUA.browser;
-      const cacheKey = (0, _cache.generateCacheKey)({
-        name,
-        version,
-        features: featureDig,
-        minify
-      });
-      const matched = cache.get(cacheKey);
-
-      if (matched) {
+var _default = () => ({
+  name: '@modern-js/plugin-polyfill',
+  setup: () => ({
+    preServerInit(_) {
+      const cache = new _cache.default();
+      const route = _const.defaultPolyfill;
+      const features = _const.defaultFeatures;
+      const minify = process.env.NODE_ENV === 'production';
+      const featureDig = Object.keys(features).map(name => {
+        const {
+          flags = ['gated']
+        } = features[name];
+        const flagStr = flags.join(',');
+        return `${name}-${flagStr}`;
+      }).join(',');
+      return async (context, next) => {
+        if (context.url !== route) {
+          return next();
+        }
+
+        const parsedUA = (0, _uaParserJs.default)(context.headers['user-agent']);
+        const {
+          name = '',
+          version = ''
+        } = parsedUA.browser;
+        const cacheKey = (0, _cache.generateCacheKey)({
+          name,
+          version,
+          features: featureDig,
+          minify
+        });
+        const matched = cache.get(cacheKey);
+
+        if (matched) {
+          context.res.setHeader('content-type', _mimeTypes.default.contentType('js'));
+          return context.res.end(matched);
+        }
+
+        const polyfill = await (0, _polyfillLib.getPolyfillString)({
+          uaString: context.headers['user-agent'],
+          minify,
+          features
+        });
+        cache.set(cacheKey, polyfill);
         context.res.setHeader('content-type', _mimeTypes.default.contentType('js'));
-        return context.res.end(matched);
-      }
-
-      const polyfill = await (0, _polyfillLib.getPolyfillString)({
-        uaString: context.headers['user-agent'],
-        minify,
-        features
-      });
-      cache.set(cacheKey, polyfill);
-      context.res.setHeader('content-type', _mimeTypes.default.contentType('js'));
-      return context.res.end(polyfill);
-    };
-  }
+        return context.res.end(polyfill);
+      };
+    }
 
-}), {
-  name: '@modern-js/plugin-polyfill'
+  })
 });
 
 exports.default = _default;

package/dist/types/cli.d.ts

@@ -1,18 +1,5 @@
-declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
-  config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
-    resolved: import("@modern-js/core").NormalizedConfig;
-  }>;
-  validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
-  commands: import("@modern-js/core").AsyncWorkflow<{
-    program: import("commander").Command;
-  }, void>;
-  watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  fileChange: import("@modern-js/core").AsyncWorkflow<{
-    filename: string;
-  }, void>;
-  beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
-} & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
+import type { CliPlugin } from '@modern-js/core';
+
+declare const _default: () => CliPlugin;
 
 export default _default;

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
-declare const _default: any;
+import type { ServerPlugin } from '@modern-js/server-core';
+
+declare const _default: () => ServerPlugin;
 
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.2.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -38,13 +38,13 @@
   "dependencies": {
     "@babel/runtime": "^7",
     "@modern-js/polyfill-lib": "^1.0.0",
-    "@modern-js/server-plugin": "^1.2.0",
     "lru-cache": "^6.0.0",
     "mime-types": "^2.1.32",
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "^1.2.0",
+    "@modern-js/server-core": "^1.2.3",
+    "@modern-js/types": "^1.3.5",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.1",
@@ -53,14 +53,11 @@
     "@types/react-dom": "^17",
     "@types/ua-parser-js": "^0.7.36",
     "typescript": "^4",
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/core": "^1.5.0",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
   },
-  "peerDependencies": {
-    "@modern-js/core": "^1.3.0"
-  },
   "sideEffects": false,
   "modernConfig": {
     "output": {
@@ -69,8 +66,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/.eslintrc.js

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

package/tests/index.test.ts

@@ -0,0 +1,53 @@
+import type { NormalizedConfig } from '@modern-js/core';
+import cliPugin from '../src/cli';
+import serverPlugin from '../src';
+import { defaultPolyfill } from '../src/const';
+
+describe('plugin-static-hosting', () => {
+  it('cli', () => {
+    expect(cliPugin).toBeDefined();
+    const instance = cliPugin();
+    expect(instance.name).toBe('@modern-js/plugin-polyfill');
+
+    const hooks: any = instance.setup?.({
+      useResolvedConfigContext: () => {
+        return {
+          output: {},
+        } as NormalizedConfig;
+      },
+    } as any);
+
+    const params = { entrypoint: [], partials: [] };
+    expect(hooks.htmlPartials(params)).toEqual(params);
+  });
+
+  it('server', async () => {
+    expect(serverPlugin).toBeDefined();
+    const instance = serverPlugin();
+    expect(instance.name).toBe('@modern-js/plugin-polyfill');
+
+    const hooks: any = instance.setup?.({} as any);
+    const fn = hooks.preServerInit();
+    expect(typeof fn).toBe('function');
+
+    const errorContext = { url: '' };
+    expect(await fn(errorContext, () => false)).toBeFalsy();
+
+    const context = {
+      url: defaultPolyfill,
+      res: {
+        setHeader: () => false,
+        end: (result: string) => result,
+      },
+      headers: {
+        'user-agent':
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36',
+      },
+    };
+
+    const res = await fn(context);
+    expect(res).toMatch('modern polyfill');
+    const res1 = await fn(context);
+    expect(res1).toMatch('modern polyfill');
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": false,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "isolatedModules": true
+  }
+}

package/tsconfig.json

@@ -4,7 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {}
+    "isolatedModules": true
   },
   "include": ["src"]
 }

package/src/cli.ts

@@ -1,20 +0,0 @@
-import { createPlugin, useResolvedConfigContext } from '@modern-js/core';
-import { defaultPolyfill } from './const';
-
-export default createPlugin(
-  () =>
-    ({
-      htmlPartials({ entrypoint, partials }: any) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const resolvedConfig = useResolvedConfigContext();
-        if (resolvedConfig.output.polyfill === 'ua') {
-          partials.top.push(
-            `<script src="${defaultPolyfill}" crossorigin></script>`,
-          );
-        }
-
-        return { partials, entrypoint };
-      },
-    } as any),
-  { name: '@modern-js/plugin-polyfill' },
-);

package/src/const.ts

@@ -1,5 +0,0 @@
-export const defaultPolyfill = '/__polyfill__';
-
-export const defaultFeatures: Record<string, { flags: string[] }> = {
-  es6: { flags: ['gated'] },
-};

package/src/global.d.ts

@@ -1,7 +0,0 @@
-declare module '@modern-js/polyfill-lib' {
-  export const getPolyfillString: (options: {
-    uaString: string;
-    minify: boolean;
-    features: Record<string, { flags: string[] }>;
-  }) => Promise<string>;
-}

package/src/index.ts

@@ -1,66 +0,0 @@
-import { createPlugin } from '@modern-js/server-plugin';
-import { NextFunction, ModernServerContext } from '@modern-js/types/server';
-import type { NormalizedConfig } from '@modern-js/core';
-import { getPolyfillString } from '@modern-js/polyfill-lib';
-import mime from 'mime-types';
-import Parser from 'ua-parser-js';
-import { defaultFeatures, defaultPolyfill } from './const';
-import PolyfillCache, { generateCacheKey } from './libs/cache';
-
-export default createPlugin(
-  () => ({
-    preServerInit(_: NormalizedConfig) {
-      const cache = new PolyfillCache();
-      const route = defaultPolyfill;
-      const features = defaultFeatures;
-      const minify = process.env.NODE_ENV === 'production';
-
-      const featureDig = Object.keys(features)
-        .map(name => {
-          const { flags = ['gated'] } = features[name];
-          const flagStr = flags.join(',');
-
-          return `${name}-${flagStr}`;
-        })
-        .join(',');
-
-      return async (context: ModernServerContext, next: NextFunction) => {
-        if (context.url !== route) {
-          return next();
-        }
-
-        const parsedUA = Parser(context.headers['user-agent']);
-        const { name = '', version = '' } = parsedUA.browser;
-
-        const cacheKey = generateCacheKey({
-          name,
-          version,
-          features: featureDig,
-          minify,
-        });
-        const matched = cache.get(cacheKey);
-        if (matched) {
-          context.res.setHeader(
-            'content-type',
-            mime.contentType('js') as string,
-          );
-          return context.res.end(matched);
-        }
-
-        const polyfill = await getPolyfillString({
-          uaString: context.headers['user-agent'] as string,
-          minify,
-          features,
-        });
-
-        cache.set(cacheKey, polyfill);
-
-        context.res.setHeader('content-type', mime.contentType('js') as string);
-        return context.res.end(polyfill);
-      };
-    },
-  }),
-  {
-    name: '@modern-js/plugin-polyfill',
-  },
-) as any;

package/src/libs/cache.ts

@@ -1,49 +0,0 @@
-import crypto from 'crypto';
-import LRUCache from 'lru-cache';
-
-type CacheQueryOptions = {
-  features: string;
-  minify: boolean;
-  name: string;
-  version: string;
-};
-
-const KB = 1024;
-const MB = 1024 * KB;
-
-const keyCache = new LRUCache<string, string>(10000);
-export const generateCacheKey = (options: CacheQueryOptions) => {
-  const { name, version, features, minify } = options;
-
-  const str = `${name}-${version}-${Number(minify)}-${features}`;
-  const matched = keyCache.get(str);
-  if (matched) {
-    return matched;
-  }
-
-  const hash = crypto
-    .createHmac('sha256', '^polyfill$')
-    .update(str)
-    .digest('hex');
-  keyCache.set(str, hash);
-  return hash;
-};
-
-export default class Cache {
-  private readonly caches: LRUCache<string, string>;
-
-  constructor() {
-    this.caches = new LRUCache({
-      max: 200 * MB,
-      length: v => v.length,
-    });
-  }
-
-  public get(hash: string) {
-    return this.caches.get(hash);
-  }
-
-  public set(hash: string, content: string) {
-    this.caches.set(hash, content);
-  }
-}

package/src/type.ts

@@ -1,7 +0,0 @@
-export type ServerPolyfill = {
-  polyfill: {
-    route: string;
-    features: Record<string, { flags: string[] }>;
-    minify: boolean;
-  };
-};