@modern-js/plugin-server-build 1.2.0 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/plugin-server-build
 
+## 1.2.3
+
+### Patch Changes
+
+- 61e3f623: feat: convert to new plugin
+- 681a1ff9: feat: remove unnecessary peerDependencies
+- Updated dependencies [c2046f37]
+  - @modern-js/utils@1.3.6
+
+## 1.2.2
+
+### Patch Changes
+
+- 55e18278: chore: remove unused dependencies and devDependencies
+- Updated dependencies [969f172f]
+- Updated dependencies [4c792f68]
+- Updated dependencies [4b5d4bf4]
+- Updated dependencies [62f5b8c8]
+- Updated dependencies [55e18278]
+- Updated dependencies [4499a674]
+- Updated dependencies [403f5169]
+- Updated dependencies [a7f42f48]
+  - @modern-js/core@1.4.4
+  - @modern-js/utils@1.3.3
+  - @modern-js/babel-compiler@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-utils@1.2.1
+  - @modern-js/babel-compiler@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/modern/index.js

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { compiler } from '@modern-js/babel-compiler';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 const SERVER_DIR = './server';
@@ -37,48 +36,43 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   });
 };
 
-export default createPlugin(() => ({
-  config() {
-    return {};
-  },
+export default (() => ({
+  name: '@modern-js/plugin-server-build',
+  setup: api => ({
+    async afterBuild() {
+      const {
+        appDirectory,
+        distDirectory
+      } = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
+      const distDir = path.resolve(distDirectory);
+      const serverDir = path.resolve(appDirectory, SERVER_DIR);
+      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const patterns = [];
 
-  async afterBuild() {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const {
-      appDirectory,
-      distDirectory
-    } = useAppContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const modernConfig = useResolvedConfigContext();
-    const distDir = path.resolve(distDirectory);
-    const serverDir = path.resolve(appDirectory, SERVER_DIR);
-    const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-    const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-    const patterns = [];
+      if (fs.existsSync(serverDir)) {
+        patterns.push({
+          from: serverDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-    if (fs.existsSync(serverDir)) {
-      patterns.push({
-        from: serverDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
-
-    if (fs.existsSync(sharedDir)) {
-      patterns.push({
-        from: sharedDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
+      if (fs.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
 
-    if (patterns.length > 0) {
-      await compile(appDirectory, modernConfig, {
-        patterns
-      });
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
+      }
     }
-  }
 
-}), {
-  name: '@modern-js/plugin-server-build'
-});
+  })
+}));

package/dist/js/node/index.js

@@ -9,8 +9,6 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _core = require("@modern-js/core");
-
 var _babelCompiler = require("@modern-js/babel-compiler");
 
 var _serverUtils = require("@modern-js/server-utils");
@@ -51,55 +49,50 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   });
 };
 
-var _default = (0, _core.createPlugin)(() => ({
-  config() {
-    return {};
-  },
-
-  async afterBuild() {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const {
-      appDirectory,
-      distDirectory
-    } = (0, _core.useAppContext)(); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const modernConfig = (0, _core.useResolvedConfigContext)();
-
-    const distDir = _path.default.resolve(distDirectory);
-
-    const serverDir = _path.default.resolve(appDirectory, SERVER_DIR);
-
-    const sharedDir = _path.default.resolve(appDirectory, SHARED_DIR);
-
-    const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-
-    const patterns = [];
-
-    if (_fs.default.existsSync(serverDir)) {
-      patterns.push({
-        from: serverDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
-
-    if (_fs.default.existsSync(sharedDir)) {
-      patterns.push({
-        from: sharedDir,
-        to: distDir,
-        tsconfigPath
-      });
-    }
-
-    if (patterns.length > 0) {
-      await compile(appDirectory, modernConfig, {
-        patterns
-      });
+var _default = () => ({
+  name: '@modern-js/plugin-server-build',
+  setup: api => ({
+    async afterBuild() {
+      const {
+        appDirectory,
+        distDirectory
+      } = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
+
+      const distDir = _path.default.resolve(distDirectory);
+
+      const serverDir = _path.default.resolve(appDirectory, SERVER_DIR);
+
+      const sharedDir = _path.default.resolve(appDirectory, SHARED_DIR);
+
+      const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+
+      const patterns = [];
+
+      if (_fs.default.existsSync(serverDir)) {
+        patterns.push({
+          from: serverDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
+
+      if (_fs.default.existsSync(sharedDir)) {
+        patterns.push({
+          from: sharedDir,
+          to: distDir,
+          tsconfigPath
+        });
+      }
+
+      if (patterns.length > 0) {
+        await compile(appDirectory, modernConfig, {
+          patterns
+        });
+      }
     }
-  }
 
-}), {
-  name: '@modern-js/plugin-server-build'
+  })
 });
 
 exports.default = _default;

package/dist/types/index.d.ts

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

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/modern.config.js

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

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",
@@ -29,37 +29,26 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.2.0",
-    "@modern-js/server-utils": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
-    "globby": "^12.0.2",
-    "json5": "^2.2.0"
+    "@modern-js/babel-compiler": "^1.2.2",
+    "@modern-js/server-utils": "^1.2.1",
+    "@modern-js/utils": "^1.3.6"
   },
   "devDependencies": {
-    "@modern-js/plugin-analyze": "^1.2.0",
+    "@modern-js/plugin-analyze": "^1.3.4",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",
     "ts-jest": "^27.0.5",
     "typescript": "^4",
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/core": "^1.6.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": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}

package/tsconfig.json

@@ -10,5 +10,5 @@
     "paths": {},
     "types": ["node", "jest"]
   },
-  "include": ["src", "src/.ts"]
+  "include": ["src"]
 }

package/src/index.ts

@@ -1,98 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import {
-  createPlugin,
-  useAppContext,
-  useResolvedConfigContext,
-  NormalizedConfig,
-} from '@modern-js/core';
-import { compiler } from '@modern-js/babel-compiler';
-import { resolveBabelConfig } from '@modern-js/server-utils';
-
-const SERVER_DIR = './server';
-const SHARED_DIR = './shared';
-const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-interface Pattern {
-  from: string;
-  to: string;
-  tsconfigPath?: string;
-}
-
-interface CompileOptions {
-  patterns: Pattern[];
-}
-
-const compile = async (
-  appDirectory: string,
-  modernConfig: NormalizedConfig,
-  compileOptions: CompileOptions,
-) => {
-  const { patterns } = compileOptions;
-  const results = await Promise.all(
-    patterns.map(pattern => {
-      const { from, to, tsconfigPath } = pattern;
-      const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-        tsconfigPath: tsconfigPath ? tsconfigPath : '',
-        syntax: 'es6+',
-        type: 'commonjs',
-      });
-      return compiler(
-        {
-          rootDir: appDirectory,
-          distDir: to,
-          sourceDir: from,
-          extensions: FILE_EXTENSIONS,
-        },
-        babelConfig,
-      );
-    }),
-  );
-  results.forEach(result => {
-    if (result.code === 1) {
-      throw new Error(result.message);
-    }
-  });
-};
-
-export default createPlugin(
-  () => ({
-    config() {
-      return {};
-    },
-    async afterBuild() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const { appDirectory, distDirectory } = useAppContext();
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const modernConfig = useResolvedConfigContext();
-
-      const distDir = path.resolve(distDirectory);
-      const serverDir = path.resolve(appDirectory, SERVER_DIR);
-      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-
-      const patterns = [];
-      if (fs.existsSync(serverDir)) {
-        patterns.push({
-          from: serverDir,
-          to: distDir,
-          tsconfigPath,
-        });
-      }
-
-      if (fs.existsSync(sharedDir)) {
-        patterns.push({
-          from: sharedDir,
-          to: distDir,
-          tsconfigPath,
-        });
-      }
-
-      if (patterns.length > 0) {
-        await compile(appDirectory, modernConfig, { patterns });
-      }
-    },
-  }),
-  { name: '@modern-js/plugin-server-build' },
-) as any;