@modern-js/plugin-server 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @modern-js/plugin-server
 
+## 1.1.7
+
+### Patch Changes
+
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/server-utils@1.2.3
+  - @modern-js/babel-compiler@1.2.3
+
+## 1.1.6
+
+### Patch Changes
+
+- d2d1d6b2: feat: add prepare hook
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+  - @modern-js/server-utils@1.2.2
+
 ## 1.1.5
 
 ### Patch Changes

package/dist/js/modern/server.js

@@ -33,18 +33,21 @@ export default (() => ({
       appDirectory,
       distDirectory
     } = api.useAppContext();
-    const pwd = isProd() ? distDirectory : appDirectory;
-    const serverPath = path.resolve(pwd, SERVER_DIR);
-    const webAppPath = path.resolve(serverPath, WEB_APP_NAME);
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    const webMod = requireExistModule(webAppPath);
-
-    if (webMod) {
-      webMod(transformAPI);
-    }
-
+    let webAppPath = '';
     return {
+      prepare() {
+        const pwd = isProd() ? distDirectory : appDirectory;
+        const serverPath = path.resolve(pwd, SERVER_DIR);
+        webAppPath = path.resolve(serverPath, WEB_APP_NAME);
+        const webMod = requireExistModule(webAppPath);
+
+        if (webMod) {
+          webMod(transformAPI);
+        }
+      },
+
       reset() {
         storage.reset();
         const newWebModule = requireExistModule(webAppPath);

package/dist/js/node/server.js

@@ -44,21 +44,23 @@ var _default = () => ({
       appDirectory,
       distDirectory
     } = api.useAppContext();
-    const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
-
-    const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
-
-    const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
-
     const storage = new Storage();
     const transformAPI = createTransformAPI(storage);
-    const webMod = (0, _utils.requireExistModule)(webAppPath);
+    let webAppPath = '';
+    return {
+      prepare() {
+        const pwd = (0, _utils.isProd)() ? distDirectory : appDirectory;
 
-    if (webMod) {
-      webMod(transformAPI);
-    }
+        const serverPath = _path.default.resolve(pwd, _utils.SERVER_DIR);
+
+        webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
+        const webMod = (0, _utils.requireExistModule)(webAppPath);
+
+        if (webMod) {
+          webMod(transformAPI);
+        }
+      },
 
-    return {
       reset() {
         storage.reset();
         const newWebModule = (0, _utils.requireExistModule)(webAppPath);

package/dist/js/treeshaking/server.js

@@ -51,18 +51,20 @@ export default (function () {
           appDirectory = _api$useAppContext.appDirectory,
           distDirectory = _api$useAppContext.distDirectory;
 
-      var pwd = isProd() ? distDirectory : appDirectory;
-      var serverPath = path.resolve(pwd, SERVER_DIR);
-      var webAppPath = path.resolve(serverPath, WEB_APP_NAME);
       var storage = new Storage();
       var transformAPI = createTransformAPI(storage);
-      var webMod = requireExistModule(webAppPath);
-
-      if (webMod) {
-        webMod(transformAPI);
-      }
-
+      var webAppPath = '';
       return {
+        prepare: function prepare() {
+          var pwd = isProd() ? distDirectory : appDirectory;
+          var serverPath = path.resolve(pwd, SERVER_DIR);
+          webAppPath = path.resolve(serverPath, WEB_APP_NAME);
+          var webMod = requireExistModule(webAppPath);
+
+          if (webMod) {
+            webMod(transformAPI);
+          }
+        },
         reset: function reset() {
           storage.reset();
           var newWebModule = requireExistModule(webAppPath);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.5",
+  "version": "1.1.7",
   "types": "./dist/types/server.d.ts",
   "jsnext:source": "./src/server.ts",
   "main": "./dist/js/node/server.js",
@@ -48,15 +48,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/babel-compiler": "^1.2.1",
-    "@modern-js/server-utils": "^1.2.2",
-    "@modern-js/utils": "^1.3.7"
+    "@modern-js/babel-compiler": "^1.2.3",
+    "@modern-js/server-utils": "^1.2.3",
+    "@modern-js/utils": "^1.5.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "1.2.5",
-    "@modern-js/core": "1.6.1",
+    "@modern-js/server-core": "1.3.1",
+    "@modern-js/core": "1.8.0",
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.3.6",
+    "@modern-js/types": "^1.5.0",
     "del-cli": "^4.0.1",
     "typescript": "^4",
     "@types/jest": "^26.0.9",

package/tests/.eslintrc.js

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

package/tests/fixtures/foo/server/index.ts

@@ -1,23 +0,0 @@
-type Sign = { status: number };
-
-const fn = (sign: Sign) => {
-  sign.status += 1;
-};
-
-export default ({
-  addMiddleware,
-  beforeMatch,
-  beforeRender,
-  afterMatch,
-  afterRender,
-}: any) => {
-  addMiddleware(fn);
-
-  beforeMatch(fn);
-
-  beforeRender(fn);
-
-  afterMatch(fn);
-
-  afterRender(fn);
-};

package/tests/index.test.ts

@@ -1,39 +0,0 @@
-import path from 'path';
-import cliPugin from '../src/cli';
-import serverPlugin from '../src/server';
-
-describe('plugin-server', () => {
-  it('cli', () => {
-    expect(cliPugin).toBeDefined();
-    expect(cliPugin().name).toBe('@modern-js/plugin-server');
-  });
-
-  it('server', () => {
-    expect(serverPlugin).toBeDefined();
-
-    const plugin = serverPlugin();
-    expect(plugin.name).toBe('@modern-js/plugin-server');
-
-    const hooks: any = plugin.setup!({
-      useAppContext: () => ({
-        appDirectory: path.join(__dirname, './fixtures/foo'),
-      }),
-    } as any);
-
-    const sign = { status: 0 };
-    hooks.gather({
-      addWebMiddleware: (fn: any) => {
-        fn(sign);
-      },
-    });
-    expect(sign.status).toBe(1);
-
-    const params = { context: sign };
-    hooks.beforeMatch(params);
-    hooks.afterMatch(params);
-    hooks.beforeRender(params);
-    hooks.afterRender(params);
-    hooks.reset();
-    expect(sign.status).toBe(5);
-  });
-});

package/tests/tsconfig.json

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