@modern-js/plugin-ssg 1.1.2 → 1.1.3-rc.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/plugin-ssg
 
+## 1.1.3-rc.0
+
+### Patch Changes
+
+- Updated dependencies [b7fb82ec]
+  - @modern-js/utils@1.1.6-rc.0
+  - @modern-js/core@1.2.1-rc.0
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/types/libs/make.d.ts

@@ -1,4 +1,4 @@
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { compile } from '../server/prerender';
 import { RouteOptions, SsgRoute } from '../types';
 export declare function makeRender(ssgRoutes: SsgRoute[], render: ReturnType<typeof compile>, port: number): Promise<string>[];

package/dist/types/libs/replace.d.ts

@@ -1,4 +1,4 @@
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
 export declare function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number;
 export declare function replaceRoute(ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[]): ModernRoute[];

package/dist/types/libs/util.d.ts

@@ -1,4 +1,4 @@
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;

package/dist/types/server/index.d.ts

@@ -1,4 +1,4 @@
 import { NormalizedConfig } from '@modern-js/core';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
 export declare const createServer: (ssgRoutes: SsgRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 export declare type AgreedRoute = {
   path: string;
   component: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.1.3-rc.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,14 +35,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.4",
+    "@modern-js/utils": "^1.1.6-rc.0",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
     "react-router-dom": "^5.2.1"
   },
   "devDependencies": {
-    "@modern-js/server": "^1.1.4",
+    "@modern-js/server": "^1.2.1-rc.0",
+    "@modern-js/types": "^1.1.5-rc.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -50,12 +51,12 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/core": "^1.1.4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@modern-js/core": "^1.2.1-rc.0",
+    "@modern-js/plugin-testing": "^1.2.2",
+    "@modern-js/module-tools": "^1.1.4"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.1.4"
+    "@modern-js/core": "^1.2.1-rc.0"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/index.ts

@@ -86,8 +86,8 @@ export default createPlugin(
         // each route will try to match the configuration
         pageRoutes.forEach(pageRoute => {
           const { entryName, entryPath } = pageRoute;
-          const agreedRoutes = agreedRouteMap[entryName];
-          let entryOptions = intermediateOptions[entryName];
+          const agreedRoutes = agreedRouteMap[entryName as string];
+          let entryOptions = intermediateOptions[entryName as string];
 
           if (!agreedRoutes) {
             // default behavior for non-agreed route
@@ -169,12 +169,16 @@ export default createPlugin(
 
             if (isOriginRoute) {
               throw new Error(
-                `ssg can not using with ssr，url - ${ssgRoute.urlPath}, entry - ${ssgRoute.entryName} `,
+                `ssg can not using with ssr，url - ${
+                  ssgRoute.urlPath
+                }, entry - ${ssgRoute.entryName!} `,
               );
             }
 
             logger.warn(
-              `new ssg route ${ssgRoute.urlPath} is using ssr now，maybe from parent route ${ssgRoute.entryName}，close ssr`,
+              `new ssg route ${
+                ssgRoute.urlPath
+              } is using ssr now，maybe from parent route ${ssgRoute.entryName!}，close ssr`,
             );
           }
           ssgRoute.isSSR = false;

package/src/libs/make.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import normalize from 'normalize-path';
 import { compile } from '../server/prerender';
 import { RouteOptions, SsgRoute } from '../types';

package/src/libs/replace.ts

@@ -1,5 +1,5 @@
 import normalize from 'normalize-path';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
 
 export function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number {

package/src/libs/util.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import { ROUTE_SPEC_FILE, fs, isSingleEntry } from '@modern-js/utils';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
 
 export function formatOutput(filename: string) {
@@ -51,7 +51,7 @@ export function getUrlPrefix(route: SsgRoute, baseUrl: string | string[]) {
 
   base = base === '/' ? '' : base;
   const entryName = route.entryName === 'main' ? '' : route.entryName;
-  const prefix = `${base}/${entryName}`;
+  const prefix = `${base}/${entryName as string}`;
   return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
 }
 

package/src/server/index.ts

@@ -2,7 +2,7 @@ import childProcess from 'child_process';
 import path from 'path';
 import { logger, SERVER_BUNDLE_DIRECTORY } from '@modern-js/utils';
 import { NormalizedConfig, useAppContext } from '@modern-js/core';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
 import { CLOSE_SIGN } from './consts';
 
@@ -18,7 +18,7 @@ export const createServer = (
     const backup: ModernRoute[] = ssgRoutes.map(ssgRoute => ({
       ...ssgRoute,
       isSSR: true,
-      bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`,
+      bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName as string}.js`,
     }));
 
     const total = backup.concat(apiRoutes);

package/src/server/process.ts

@@ -1,4 +1,5 @@
-import Server, { ModernRoute } from '@modern-js/server';
+import Server from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import portfinder from 'portfinder';
 import { NormalizedConfig } from '@modern-js/core';
 import { compatRequire } from '@modern-js/utils';

package/src/types.ts

@@ -1,4 +1,4 @@
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 
 export type AgreedRoute = {
   path: string;

package/tests/lib.test.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { ModernRoute } from '@modern-js/server';
+import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { exist, replaceRoute } from '@/libs/replace';
 import { makeRoute } from '@/libs/make';