@shuvi/platform-shared 1.0.0-rc.0 → 1.0.0-rc.3

package/esm/shared/index.d.ts

@@ -6,4 +6,5 @@ export * from './loader';
 export { errorModel } from './models/error';
 export * from './applicationTypes';
 export type { Application } from './application';
+export type { IRuntimeConfig } from './runtimeConfigTypes';
 export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';

package/esm/shared/routerTypes.d.ts

@@ -4,21 +4,16 @@ export declare type IURLQuery = ParsedQuery;
 export declare type IURLParams = IParams;
 export interface IPageRouteRecord extends IRouteRecord {
     id: string;
+    path: string;
     component?: any;
     children?: IPageRouteRecord[];
-    path: string;
-    fullPath?: string;
-    __componentSource__?: never;
-    __componentSourceWithAffix__?: string;
-    __import__?: never;
-    __resolveWeak__?: () => any;
     [x: string]: any;
 }
 export interface IRawPageRouteRecord extends IRouteRecord {
     id: string;
+    path: string;
     component?: any;
     children?: IRawPageRouteRecord[];
-    path: string;
     fullPath: string;
     __componentSource__: string;
     __componentSourceWithAffix__: string;
@@ -26,3 +21,30 @@ export interface IRawPageRouteRecord extends IRouteRecord {
     __resolveWeak__: () => any;
     [x: string]: any;
 }
+export interface IPlatformConfig {
+    name: string;
+    framework?: string;
+    target?: string;
+    [index: string]: any;
+}
+export declare type IRouterHistoryMode = 'browser' | 'hash' | 'memory';
+export interface IPageRouteConfig {
+    children?: IPageRouteConfig[];
+    name?: string;
+    component?: string;
+    redirect?: string;
+    path: string;
+    fullPath?: string;
+}
+export interface IPageRouteConfigWithId extends IPageRouteConfig {
+    id: string;
+    children?: IPageRouteConfigWithId[];
+}
+export interface IMiddlewareRouteConfig {
+    path: string;
+    middleware: string;
+}
+export interface IApiRouteConfig {
+    path: string;
+    api: string;
+}

package/esm/shared/runtimeConfigTypes.d.ts

@@ -0,0 +1 @@
+export declare type IRuntimeConfig = Record<string, string>;

package/esm/shared/runtimeConfigTypes.js

@@ -0,0 +1 @@
+export {};

package/esm/shared/shuvi-singleton-runtimeConfig.d.ts

@@ -1,4 +1,4 @@
-import { IRuntimeConfig } from '@shuvi/service/lib/core';
+import { IRuntimeConfig } from './runtimeConfigTypes';
 /**
  * getRuntimeConfig function
  *

package/lib/node/platform/index.d.ts

@@ -1,6 +1,7 @@
 export * from './runtimeFiles';
 export declare const SharedPlugins: {
     core: import("@shuvi/hook").IPluginInstance<{
+        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
         afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
@@ -11,6 +12,6 @@ export declare const SharedPlugins: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     types: string;
 }[];

package/lib/node/platform/plugins/main/hooks.d.ts

@@ -1,4 +1,4 @@
-import { IRuntimeConfig } from '@shuvi/service/lib/core';
+import { IRuntimeConfig } from '../../../../shared';
 export declare const extendedHooks: {
     addEntryCode: import("@shuvi/hook").AsyncParallelHook<void, void, string | string[]>;
     addPolyfill: import("@shuvi/hook").AsyncParallelHook<void, void, string | string[]>;

package/lib/node/platform/plugins/main/index.d.ts

@@ -1,5 +1,6 @@
 declare const _default: {
     core: import("@shuvi/hook").IPluginInstance<{
+        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
         afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
         afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
@@ -10,7 +11,7 @@ declare const _default: {
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
         addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     types: string;
 };
 export default _default;

package/lib/node/platform/runtimeFiles.d.ts

@@ -1,8 +1,4 @@
 import { IPluginContext } from '@shuvi/service';
-export declare const getRuntimeConfigFromConfig: (pluginContext: IPluginContext) => Promise<{
-    public: import("@shuvi/service/lib/core/apiTypes").IRuntimeConfig;
-    server: import("@shuvi/service/lib/core/apiTypes").IRuntimeConfig;
-}>;
 /**
  * A creator for `getPresetRuntimeFiles` which helps platforms to build a bunch of runtime files including
  * `core/error`, `core/platform`, `core/plugins`, `core/polyfill`, `core/runtimeConfig`, `core/setRuntimeConfig`,

package/lib/node/platform/runtimeFiles.js

@@ -9,32 +9,46 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPresetRuntimeFilesCreator = exports.getRuntimeConfigFromConfig = void 0;
+exports.getPresetRuntimeFilesCreator = void 0;
 const project_1 = require("@shuvi/service/lib/project");
+const shuvi_singleton_runtimeConfig_1 = require("../../shared/shuvi-singleton-runtimeConfig");
 const projectContext_1 = require("../project/projectContext");
 const file_presets_1 = require("../project/file-presets");
-const getRuntimeConfigFromConfig = (pluginContext) => __awaiter(void 0, void 0, void 0, function* () {
-    const { pluginRunner, config } = pluginContext;
-    return yield pluginRunner.modifyRuntimeConfig({
-        public: config.publicRuntimeConfig || {},
-        server: config.runtimeConfig || {}
-    });
-});
-exports.getRuntimeConfigFromConfig = getRuntimeConfigFromConfig;
 /**
  * A creator for `getPresetRuntimeFiles` which helps platforms to build a bunch of runtime files including
  * `core/error`, `core/platform`, `core/plugins`, `core/polyfill`, `core/runtimeConfig`, `core/setRuntimeConfig`,
  * `user/error`, `user/runtime` and `entry`
  */
 const getPresetRuntimeFilesCreator = (platformModule, polyfills) => (pluginContext) => __awaiter(void 0, void 0, void 0, function* () {
+    const { pluginRunner, config } = pluginContext;
     const getCandidates = (fileName, fallbackType) => project_1.fileUtils.getUserCustomFileCandidates(pluginContext.paths.rootDir, fileName, fallbackType);
+    const { public: publicRuntimeConfig, server: serverRuntimeConfig } = yield pluginRunner.modifyRuntimeConfig({
+        public: config.publicRuntimeConfig || {},
+        server: config.runtimeConfig || {}
+    });
+    const serverKeys = Object.keys(serverRuntimeConfig);
+    const publicKeys = Object.keys(publicRuntimeConfig);
+    for (let index = 0; index < serverKeys.length; index++) {
+        const key = serverKeys[index];
+        const hasSameKey = publicKeys.includes(key);
+        if (hasSameKey) {
+            console.warn(`Warning: key "${key}" exist in both "runtimeConfig" and "publicRuntimeConfig". Please rename the key, or the value from "publicRuntimeConfig" will be applied.\n`);
+            break;
+        }
+    }
+    if (serverKeys) {
+        (0, shuvi_singleton_runtimeConfig_1.setRuntimeConfig)(serverRuntimeConfig);
+    }
+    if (publicKeys) {
+        (0, shuvi_singleton_runtimeConfig_1.setPublicRuntimeConfig)(publicRuntimeConfig);
+    }
     const context = (0, projectContext_1.createProjectContext)();
     context.userModule = {
         error: getCandidates('error', 'nullish'),
-        app: getCandidates('app', 'noop')
+        app: getCandidates('app', 'noop'),
+        server: getCandidates('server', 'noop')
     };
     context.platformModule = platformModule;
-    const { public: publicRuntimeConfig, server: serverRuntimeConfig } = yield (0, exports.getRuntimeConfigFromConfig)(pluginContext);
     context.runtimeConfig = Object.assign(Object.assign({}, serverRuntimeConfig), publicRuntimeConfig);
     const runner = pluginContext.pluginRunner;
     const appPolyfills = (yield runner.addPolyfill()).flat();

package/lib/node/project/file-presets/files/app/user/server.js.d.ts

@@ -0,0 +1,3 @@
+import { ProjectContext } from '../../../../projectContext';
+declare const _default: (context: ProjectContext) => Omit<import("@shuvi/service/lib/project").DefineFileOption, "name">;
+export default _default;

package/lib/node/project/file-presets/files/app/user/server.js.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const project_1 = require("@shuvi/service/lib/project");
+const __1 = require("../../..");
+const { getAllFiles, getFirstModuleExport } = project_1.fileUtils;
+exports.default = (context) => {
+    const { server } = context.userModule;
+    const candidates = Array.isArray(server) ? server : [server];
+    return (0, __1.defineFile)({
+        dependencies: candidates,
+        content: () => {
+            return getFirstModuleExport(getAllFiles(candidates), candidates);
+        }
+    });
+};

package/lib/node/project/projectContext.d.ts

@@ -1,7 +1,8 @@
-import { IRuntimeConfig } from '@shuvi/service/lib/core';
+import { IRuntimeConfig } from '../../shared';
 export interface UserModule {
     app: string | string[];
     error: string | string[];
+    server: string | string[];
 }
 export interface ProjectContext {
     entryCodes: string[];

package/lib/node/project/projectContext.js

@@ -9,7 +9,8 @@ const createProjectContext = () => {
         platformModule: '',
         userModule: {
             app: '',
-            error: ''
+            error: '',
+            server: ''
         }
     };
 };

package/lib/node/route/helpers.d.ts

@@ -1,20 +1,19 @@
-import { IApiRouteConfig, IMiddlewareRouteConfig, IPageRouteConfig } from './route';
 declare const supportFileTypes: readonly ["page", "layout", "middleware", "api"];
 declare type GetArrayElementType<T extends readonly any[]> = T extends readonly any[] ? T[number] : never;
 export declare type SupportFileType = GetArrayElementType<typeof supportFileTypes>;
 declare type CapName = Capitalize<SupportFileType>;
 declare type FileTypeChecker = Record<`is${CapName}`, (filename: string) => boolean>;
-export declare function normalizeFilePath(filepath: string): string;
 export declare function parseDynamicPath(normalizedRoute: string): string;
 export declare function normalizeRoutePath(rawPath: string): string;
-export declare const normalize: (path: string) => string;
+export declare function combineComponents(fisrt: string, sec: string): string;
 export declare const isRouteFile: (file: string) => boolean;
 export declare const getAllowFilesAndDirs: (dirname: string) => Promise<string[]>;
 export declare const hasAllowFiles: (files: string[]) => boolean;
 export declare const readDir: (fullPath: string) => Promise<string[]>;
 export declare const hasRouteChildren: (files: string[], parentPath: string) => Promise<boolean>;
 declare const fileTypeChecker: FileTypeChecker;
-declare function sortRoutes(routes: IApiRouteConfig[]): IApiRouteConfig[];
-declare function sortRoutes(routes: IMiddlewareRouteConfig[]): IMiddlewareRouteConfig[];
-declare function sortRoutes(routes: IPageRouteConfig[]): IPageRouteConfig[];
+declare function sortRoutes<T extends {
+    path: string;
+    children?: T[];
+}>(routes: T[]): T[];
 export { fileTypeChecker, sortRoutes };

package/lib/node/route/helpers.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortRoutes = exports.fileTypeChecker = exports.hasRouteChildren = exports.readDir = exports.hasAllowFiles = exports.getAllowFilesAndDirs = exports.isRouteFile = exports.normalize = exports.normalizeRoutePath = exports.parseDynamicPath = exports.normalizeFilePath = void 0;
+exports.sortRoutes = exports.fileTypeChecker = exports.hasRouteChildren = exports.readDir = exports.hasAllowFiles = exports.getAllowFilesAndDirs = exports.isRouteFile = exports.combineComponents = exports.normalizeRoutePath = exports.parseDynamicPath = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const file_1 = require("@shuvi/utils/lib/file");
@@ -22,20 +22,9 @@ const supportFileTypes = ['page', 'layout', 'middleware', 'api'];
 const allowReadFilExtList = ['ts', 'js', 'tsx', 'jsx'];
 const dynamicMatchAllRegex = /\[\[(.+?)\]\]/g;
 const dynamicMatchPartRegex = /\[(.+?)\]/g;
-function normalizeFilePath(filepath) {
-    const res = filepath
-        // Remove the file extension from the end
-        .replace(/\.\w+$/, '')
-        // Convert to unix path
-        .replace(/\\/g, '/');
-    return res.charAt(0) !== '/' ? '/' + res : res;
-}
-exports.normalizeFilePath = normalizeFilePath;
 function parseDynamicPath(normalizedRoute) {
-    (0, invariant_1.default)(normalizedRoute.length >= 1, 'parseDynamicPath param normalizedRoute length should not >= 1');
     (0, invariant_1.default)(!checkSpecialRegexChars(normalizedRoute), 'filePath should not be special regex chars: |\\{}()^$+*?');
     return normalizedRoute
-        .slice(1)
         .split('/')
         .map(segment => {
         let result = '';
@@ -45,9 +34,9 @@ function parseDynamicPath(normalizedRoute) {
         result = result.replace(dynamicMatchPartRegex, function (matchString, ...matchArr) {
             return parseMatchRepeat(matchArr[0], false);
         });
-        return `/${result}`;
+        return `${result}`;
     })
-        .join('');
+        .join('/');
 }
 exports.parseDynamicPath = parseDynamicPath;
 function parseMatchRepeat(param, optional) {
@@ -65,8 +54,13 @@ function checkSpecialRegexChars(string) {
     return /[|\\{}()^$+*?]/g.test(string);
 }
 function normalizeRoutePath(rawPath) {
+    let routePath = rawPath
+        // Remove the file extension from the end
+        .replace(/\.\w+$/, '')
+        // Convert to unix path
+        .replace(/\\/g, '/');
     // /xxxx/index -> /xxxx/
-    let routePath = rawPath.replace(/\/index$/, '/');
+    routePath = rawPath.replace(/\/index$/, '/');
     // remove the last slash
     // e.g. /abc/ -> /abc
     if (routePath !== '/' && routePath.slice(-1) === '/') {
@@ -76,14 +70,26 @@ function normalizeRoutePath(rawPath) {
     return routePath;
 }
 exports.normalizeRoutePath = normalizeRoutePath;
-const normalize = (path) => {
-    const result = normalizeRoutePath(normalizeFilePath(path));
-    if (result === '/') {
-        return result;
+function combineComponents(fisrt, sec) {
+    if (fisrt === '' || sec === '') {
+        return `${fisrt}${sec}`;
     }
-    return result.replace(/^\//, '');
-};
-exports.normalize = normalize;
+    if (fisrt.endsWith('/')) {
+        if (sec.startsWith('/')) {
+            return `${fisrt}${sec.slice(1)}`;
+        }
+        else {
+            return `${fisrt}${sec}`;
+        }
+    }
+    else if (sec.startsWith('/')) {
+        return `${fisrt}${sec}`;
+    }
+    else {
+        return `${fisrt}/${sec}`;
+    }
+}
+exports.combineComponents = combineComponents;
 const isRouteFile = (file) => {
     return Object.keys(fileTypeChecker).some(key => {
         return fileTypeChecker[key](file);

package/lib/node/route/matchSpec.d.ts

@@ -0,0 +1,8 @@
+export interface FileMatcherPatterns {
+    excludePattern: string | undefined;
+}
+export declare function getRegularExpressionsForWildcards(specs: readonly string[] | undefined, basePath: string): readonly string[] | undefined;
+export declare function getRegularExpressionForWildcard(specs: readonly string[] | undefined, basePath: string, usage: 'exclude'): string | undefined;
+export declare function getRegexFromPattern(pattern: string, caseSensitive: boolean): RegExp;
+export declare function getFileMatcherPatterns(basePath: string, excludes: readonly string[] | undefined): FileMatcherPatterns;
+export declare function matchFile(file: string, patterns: FileMatcherPatterns, caseSensitive: boolean): boolean;

package/lib/node/route/matchSpec.js

@@ -0,0 +1,138 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchFile = exports.getFileMatcherPatterns = exports.getRegexFromPattern = exports.getRegularExpressionForWildcard = exports.getRegularExpressionsForWildcards = void 0;
+// port from typescript
+const nodePath = __importStar(require("path"));
+const directorySeparator = '/';
+// Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.
+// It may be inefficient (we could just match (/[-[\]{}()*+?.,\\^$|#\s]/g), but this is future
+// proof.
+const reservedCharacterPattern = /[^\w\s\/]/g;
+const commonPackageFolders = ['node_modules'];
+// does not match centeain directories or directories that start with a . character
+const implicitExcludePathRegexPattern = `/((${commonPackageFolders.join('|')})|([/.][^/]*))`;
+function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
+    return match === '*'
+        ? singleAsteriskRegexFragment
+        : match === '?'
+            ? '[^/]'
+            : '\\' + match;
+}
+const wildcardMatcher = {
+    singleAsteriskRegexFragment: '[^/]*',
+    doubleAsteriskRegexFragment: '(/.+?)?',
+    replaceWildcardCharacter: match => replaceWildcardCharacter(match, wildcardMatcher.singleAsteriskRegexFragment)
+};
+/**
+ * An "includes" path "foo" is implicitly a glob "foo/** /*" (without the space) if its last component has no extension,
+ * and does not contain any glob characters itself.
+ */
+function isImplicitGlob(lastPathComponent) {
+    return !/[.*?]/.test(lastPathComponent);
+}
+function normalizePath(path, currentDirectory) {
+    return currentDirectory
+        ? nodePath.posix.resolve(currentDirectory, path)
+        : nodePath.posix.normalize(path);
+}
+function getNormalizedPathComponents(path, currentDirectory) {
+    const normalizedPath = normalizePath(path, currentDirectory);
+    const comps = normalizedPath.split('/');
+    if (comps.length && !comps[comps.length - 1])
+        comps.pop();
+    return comps;
+}
+function getSubPatternFromSpec(spec, basePath, { doubleAsteriskRegexFragment, replaceWildcardCharacter }) {
+    let subpattern = '';
+    let hasWrittenComponent = false;
+    const components = getNormalizedPathComponents(spec, basePath);
+    const lastComponent = components[components.length - 1];
+    // remove trailing slash
+    components[0] = components[0].replace(/[/]$/, '');
+    if (isImplicitGlob(lastComponent)) {
+        components.push('**', '*');
+    }
+    for (let component of components) {
+        if (component === '**') {
+            subpattern += doubleAsteriskRegexFragment;
+        }
+        else {
+            if (hasWrittenComponent) {
+                subpattern += directorySeparator;
+            }
+            subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+        }
+        hasWrittenComponent = true;
+    }
+    return subpattern;
+}
+function getRegularExpressionsForWildcards(specs, basePath) {
+    if (specs === undefined || specs.length === 0) {
+        return undefined;
+    }
+    const result = [];
+    for (const spec of specs) {
+        if (spec) {
+            let r = getSubPatternFromSpec(spec, basePath, wildcardMatcher);
+            if (r) {
+                result.push(r);
+            }
+        }
+    }
+    return result;
+}
+exports.getRegularExpressionsForWildcards = getRegularExpressionsForWildcards;
+function getRegularExpressionForWildcard(specs, basePath, usage) {
+    const patterns = getRegularExpressionsForWildcards(specs, basePath);
+    if (!patterns || !patterns.length) {
+        return undefined;
+    }
+    const pattern = patterns.map(pattern => `(${pattern})`).join('|');
+    // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
+    const terminator = usage === 'exclude' ? '($|/)' : '$';
+    return `^(${pattern})${terminator}`;
+}
+exports.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+function getRegexFromPattern(pattern, caseSensitive) {
+    return new RegExp(pattern, caseSensitive ? '' : 'i');
+}
+exports.getRegexFromPattern = getRegexFromPattern;
+function getFileMatcherPatterns(basePath, excludes) {
+    const absolutePath = normalizePath(basePath);
+    return {
+        excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, 'exclude')
+    };
+}
+exports.getFileMatcherPatterns = getFileMatcherPatterns;
+function matchFile(file, patterns, caseSensitive) {
+    file = normalizePath(file);
+    const excludeRegex = patterns.excludePattern &&
+        getRegexFromPattern(patterns.excludePattern, caseSensitive);
+    const implicitExcludeRegex = getRegexFromPattern(implicitExcludePathRegexPattern, caseSensitive);
+    return (!implicitExcludeRegex.test(file) &&
+        (!excludeRegex || !excludeRegex.test(file)));
+}
+exports.matchFile = matchFile;

package/lib/node/route/route.d.ts

@@ -1,22 +1,19 @@
-import { IUserRouteConfig, IApiRouteConfig, IMiddlewareRouteConfig } from '@shuvi/service';
+import { IPageRouteConfig, IApiRouteConfig, IMiddlewareRouteConfig } from '../../shared';
 import { SupportFileType } from './helpers';
-export declare type IPageRouteConfig = IUserRouteConfig;
-export type { IApiRouteConfig, IMiddlewareRouteConfig };
+export type { IPageRouteConfig, IApiRouteConfig, IMiddlewareRouteConfig };
 interface RawFileRoute {
     kind: 'file';
     type: SupportFileType;
-    name: string;
-    segment: string;
     filepath: string;
+    segment: string;
 }
-interface RawDirRoute {
+export interface RawDirRoute {
     kind: 'dir';
     filepath: string;
     segment: string;
-    parentSegment: string;
     children: (RawFileRoute | RawDirRoute)[];
 }
-declare type RawRoute = RawFileRoute | RawDirRoute;
+export declare type RawRoute = RawFileRoute | RawDirRoute;
 export interface RouteException {
     type: SupportFileType | 'dir';
     msg: string;
@@ -31,7 +28,7 @@ export declare type PageRoutes = RouteResult<IPageRouteConfig>;
 export declare type ApiRoutes = RouteResult<IApiRouteConfig>;
 export declare type MiddlewareRoutes = RouteResult<IMiddlewareRouteConfig>;
 export declare type RouteConfigType = IPageRouteConfig | IApiRouteConfig | IMiddlewareRouteConfig;
-export declare const getRawRoutesFromDir: (dirname: string) => Promise<RawRoutes>;
-export declare const getPageRoutes: (dirname: string) => Promise<PageRoutes>;
-export declare const getApiRoutes: (dir: string) => Promise<ApiRoutes>;
-export declare const getMiddlewareRoutes: (dirname: string) => Promise<MiddlewareRoutes>;
+export declare const getRawRoutesFromDir: (dirname: string, excludes?: string[]) => Promise<RawRoutes>;
+export declare const getPageRoutes: (dirname: string, excludes?: string[]) => Promise<PageRoutes>;
+export declare const getApiRoutes: (dir: string, excludes?: string[]) => Promise<ApiRoutes>;
+export declare const getMiddlewareRoutes: (dirname: string, excludes?: string[]) => Promise<MiddlewareRoutes>;

package/lib/node/route/route.js

@@ -13,8 +13,10 @@ exports.getMiddlewareRoutes = exports.getApiRoutes = exports.getPageRoutes = exp
 const path_1 = require("path");
 const file_1 = require("@shuvi/utils/lib/file");
 const helpers_1 = require("./helpers");
-const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!(yield (0, file_1.isDirectory)(dirname))) {
+const matchSpec_1 = require("./matchSpec");
+const getRawRoutesFromDir = (dirname, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    const rootDirname = dirname;
+    if (!(yield (0, file_1.isDirectory)(rootDirname))) {
         return {
             routes: [],
             warnings: [],
@@ -23,7 +25,9 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
     }
     const warnings = [];
     const errors = [];
-    const _getRawRoutesFromDir = (dirname, rawRoutes, segment) => __awaiter(void 0, void 0, void 0, function* () {
+    const routes = [];
+    const patterns = (0, matchSpec_1.getFileMatcherPatterns)(rootDirname, excludes);
+    const visitDirectory = (dirname, routes, parentDir) => __awaiter(void 0, void 0, void 0, function* () {
         const files = yield (0, helpers_1.getAllowFilesAndDirs)(dirname);
         const onlyHasDir = !(0, helpers_1.hasAllowFiles)(files);
         if (!files.length) {
@@ -33,38 +37,46 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
             });
         }
         for (const file of files) {
-            const filepath = (0, path_1.join)(dirname, file);
+            let filepath = (0, path_1.join)(dirname, file);
             const isDir = yield (0, file_1.isDirectory)(filepath);
+            if (isDir) {
+                // transform '/foo' to '/foo/' if `foo` is a dir,
+                // this is required for matchFile to wrok properly
+                filepath = (0, path_1.join)(filepath, path_1.sep);
+            }
+            if (!(0, matchSpec_1.matchFile)(filepath, patterns, false)) {
+                continue;
+            }
+            const segment = parentDir === '' ? '/' : (0, helpers_1.normalizeRoutePath)(parentDir);
             if (isDir) {
                 if (onlyHasDir) {
                     // only indent segment,routes was in same level.
-                    yield _getRawRoutesFromDir(filepath, rawRoutes, `${segment}/${file}`);
-                    continue;
+                    yield visitDirectory(filepath, routes, `${parentDir}/${file}`);
+                }
+                else {
+                    const route = {
+                        kind: 'dir',
+                        filepath,
+                        segment: segment,
+                        children: []
+                    };
+                    routes.push(route);
+                    yield visitDirectory(filepath, route.children, file);
                 }
-                const rawRoute = {
-                    kind: 'dir',
+            }
+            else {
+                const ext = (0, path_1.extname)(file);
+                const type = (0, path_1.basename)(file, ext);
+                routes.push({
+                    kind: 'file',
+                    segment: segment,
                     filepath,
-                    segment: (0, helpers_1.normalize)(file).replace(/^\//, ''),
-                    parentSegment: (0, helpers_1.normalize)(segment).replace(/^\//, ''),
-                    children: []
-                };
-                yield _getRawRoutesFromDir(filepath, rawRoute.children, file);
-                rawRoutes.push(rawRoute);
-                continue;
+                    type
+                });
             }
-            const ext = (0, path_1.extname)(file);
-            const type = (0, path_1.basename)(file, ext);
-            rawRoutes.push({
-                kind: 'file',
-                name: file,
-                segment: (0, helpers_1.normalize)(segment),
-                filepath,
-                type
-            });
         }
-        return rawRoutes;
     });
-    const routes = yield _getRawRoutesFromDir(dirname, [], '');
+    yield visitDirectory(rootDirname, routes, '');
     return {
         routes,
         warnings,
@@ -72,9 +84,9 @@ const getRawRoutesFromDir = (dirname) => __awaiter(void 0, void 0, void 0, funct
     };
 });
 exports.getRawRoutesFromDir = getRawRoutesFromDir;
-const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname);
-    const _getPageRoutes = (rawRoutes, routes, segment = '') => {
+const getPageRoutes = (dirname, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname, excludes);
+    const _getPageRoutes = (rawRoutes, routes, parentSegment = '') => {
         const layoutRoute = rawRoutes.some(route => route.kind === 'file' && route.type === 'layout');
         const route = {};
         if (layoutRoute) {
@@ -83,10 +95,10 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
         for (const rawRoute of rawRoutes) {
             if (rawRoute.kind === 'dir') {
                 const workRoutes = layoutRoute ? route.children : routes;
-                const preSegment = layoutRoute
+                const nextSegment = layoutRoute
                     ? ''
-                    : `${segment}${rawRoute.parentSegment}/`;
-                _getPageRoutes(rawRoute.children, workRoutes, preSegment);
+                    : (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
+                _getPageRoutes(rawRoute.children, workRoutes, nextSegment);
             }
             else if (rawRoute.type === 'page' || rawRoute.type === 'layout') {
                 if (rawRoute.type === 'page' && layoutRoute) {
@@ -96,10 +108,8 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
                     });
                 }
                 else {
-                    let prefix = segment;
-                    let suffix = rawRoute.segment;
                     route.component = rawRoute.filepath;
-                    route.path = `${prefix}${suffix}`;
+                    route.path = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
                     routes.push(Object.assign({}, route));
                 }
             }
@@ -107,11 +117,6 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
         return routes;
     };
     const routes = (0, helpers_1.sortRoutes)(_getPageRoutes(rawRoutes, []));
-    routes.forEach(route => {
-        if (!route.path.startsWith('/')) {
-            route.path = `/${route.path}`;
-        }
-    });
     return {
         routes,
         warnings,
@@ -119,44 +124,39 @@ const getPageRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* (
     };
 });
 exports.getPageRoutes = getPageRoutes;
-const getApiRoutes = (dir) => __awaiter(void 0, void 0, void 0, function* () {
+const getApiRoutes = (dir, excludes) => __awaiter(void 0, void 0, void 0, function* () {
     const getConflictWaring = (rawRoute, conflictRawRoute) => {
         return `Find both ${(0, path_1.basename)(conflictRawRoute.filepath)} and ${(0, path_1.basename)(rawRoute.filepath)} in "${(0, path_1.dirname)(rawRoute.filepath)}"!, only "${(0, path_1.basename)(conflictRawRoute.filepath)}" is used.`;
     };
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dir);
-    const _getApiRoutes = (rawRoutes, routes, prefix = '') => {
+    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dir, excludes);
+    const _getApiRoutes = (rawRoutes, routes, parentSegment = '') => {
         const page = rawRoutes.find(route => route.kind === 'file' && route.type === 'page');
         const layout = rawRoutes.find(route => route.kind === 'file' && route.type === 'layout');
         const allowedRoutes = rawRoutes.filter(route => route.kind === 'dir' || route.type === 'api');
         for (let rawRoute of allowedRoutes) {
-            prefix = prefix === '/' ? '' : prefix;
+            const currentPath = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
             if (rawRoute.kind === 'dir') {
-                _getApiRoutes(rawRoute.children, routes, prefix + '/' + rawRoute.parentSegment);
-                continue;
+                _getApiRoutes(rawRoute.children, routes, currentPath);
             }
-            if (rawRoute.type === 'api') {
+            else if (rawRoute.type === 'api') {
                 if (layout) {
                     warnings.push({
                         type: 'api',
                         msg: getConflictWaring(rawRoute, layout)
                     });
-                    continue;
                 }
-                if (page) {
+                else if (page) {
                     warnings.push({
                         type: 'api',
                         msg: getConflictWaring(rawRoute, page)
                     });
-                    continue;
                 }
-                let path = prefix + '/' + rawRoute.segment;
-                if (path === '//') {
-                    path = '/';
+                else {
+                    routes.push({
+                        path: currentPath,
+                        api: rawRoute.filepath
+                    });
                 }
-                routes.push({
-                    path,
-                    api: rawRoute.filepath
-                });
             }
         }
         return routes;
@@ -170,26 +170,20 @@ const getApiRoutes = (dir) => __awaiter(void 0, void 0, void 0, function* () {
     };
 });
 exports.getApiRoutes = getApiRoutes;
-const getMiddlewareRoutes = (dirname) => __awaiter(void 0, void 0, void 0, function* () {
-    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname);
-    const _getMiddlewareRoutes = (rawRoutes, routes, segment) => {
-        segment = segment === '/' ? '' : segment;
+const getMiddlewareRoutes = (dirname, excludes) => __awaiter(void 0, void 0, void 0, function* () {
+    const { routes: rawRoutes, warnings, errors } = yield (0, exports.getRawRoutesFromDir)(dirname, excludes);
+    const _getMiddlewareRoutes = (rawRoutes, routes, parentSegment) => {
         for (const rawRoute of rawRoutes) {
+            const currentPath = (0, helpers_1.combineComponents)(parentSegment, rawRoute.segment);
             if (rawRoute.kind === 'dir') {
-                _getMiddlewareRoutes(rawRoute.children, routes, segment + '/' + rawRoute.parentSegment);
-                continue;
+                _getMiddlewareRoutes(rawRoute.children, routes, currentPath);
             }
-            if (rawRoute.type === 'middleware') {
-                let path = segment + '/' + rawRoute.segment;
-                let catchAllOp = '/*';
-                if (path === '//') {
-                    path = '/';
-                }
-                if (path === '/') {
-                    catchAllOp = catchAllOp.slice(1);
-                }
+            else if (rawRoute.type === 'middleware') {
                 routes.push({
-                    path: path + catchAllOp,
+                    // catch all
+                    path: currentPath.endsWith('/')
+                        ? `${currentPath}*`
+                        : `${currentPath}/*`,
                     middleware: rawRoute.filepath
                 });
             }
@@ -197,11 +191,6 @@ const getMiddlewareRoutes = (dirname) => __awaiter(void 0, void 0, void 0, funct
         return routes;
     };
     const routes = (0, helpers_1.sortRoutes)(_getMiddlewareRoutes(rawRoutes, [], ''));
-    routes.forEach(route => {
-        if (!route.path.startsWith('/')) {
-            route.path = `/${route.path}`;
-        }
-    });
     const exceptionFilter = (e) => e.type === 'middleware';
     return {
         routes,

package/lib/shared/index.d.ts

@@ -6,4 +6,5 @@ export * from './loader';
 export { errorModel } from './models/error';
 export * from './applicationTypes';
 export type { Application } from './application';
+export type { IRuntimeConfig } from './runtimeConfigTypes';
 export { IAppModule, IPluginInstance, BuiltInRuntimePluginHooks, CustomRuntimePluginHooks, RuntimePluginHooks, createRuntimePlugin, RuntimePluginInstance } from './lifecycle';

package/lib/shared/routerTypes.d.ts

@@ -4,21 +4,16 @@ export declare type IURLQuery = ParsedQuery;
 export declare type IURLParams = IParams;
 export interface IPageRouteRecord extends IRouteRecord {
     id: string;
+    path: string;
     component?: any;
     children?: IPageRouteRecord[];
-    path: string;
-    fullPath?: string;
-    __componentSource__?: never;
-    __componentSourceWithAffix__?: string;
-    __import__?: never;
-    __resolveWeak__?: () => any;
     [x: string]: any;
 }
 export interface IRawPageRouteRecord extends IRouteRecord {
     id: string;
+    path: string;
     component?: any;
     children?: IRawPageRouteRecord[];
-    path: string;
     fullPath: string;
     __componentSource__: string;
     __componentSourceWithAffix__: string;
@@ -26,3 +21,30 @@ export interface IRawPageRouteRecord extends IRouteRecord {
     __resolveWeak__: () => any;
     [x: string]: any;
 }
+export interface IPlatformConfig {
+    name: string;
+    framework?: string;
+    target?: string;
+    [index: string]: any;
+}
+export declare type IRouterHistoryMode = 'browser' | 'hash' | 'memory';
+export interface IPageRouteConfig {
+    children?: IPageRouteConfig[];
+    name?: string;
+    component?: string;
+    redirect?: string;
+    path: string;
+    fullPath?: string;
+}
+export interface IPageRouteConfigWithId extends IPageRouteConfig {
+    id: string;
+    children?: IPageRouteConfigWithId[];
+}
+export interface IMiddlewareRouteConfig {
+    path: string;
+    middleware: string;
+}
+export interface IApiRouteConfig {
+    path: string;
+    api: string;
+}

package/lib/shared/runtimeConfigTypes.d.ts

@@ -0,0 +1 @@
+export declare type IRuntimeConfig = Record<string, string>;

package/lib/shared/shuvi-singleton-runtimeConfig.d.ts

@@ -1,4 +1,4 @@
-import { IRuntimeConfig } from '@shuvi/service/lib/core';
+import { IRuntimeConfig } from './runtimeConfigTypes';
 /**
  * getRuntimeConfig function
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-shared",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.0-rc.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -12,9 +12,9 @@
   "files": [
     "lib",
     "esm",
-    "types",
     "template",
-    "shuvi-app-extensions.d.ts"
+    "shuvi-type-extensions-node.d.js",
+    "shuvi-type-extensions-runtime.d.ts"
   ],
   "exports": {
     "./shared": {
@@ -62,21 +62,11 @@
       "default": "./esm/shuvi-app/*.js"
     },
     "./template/*": "./template/*",
-    "./shuvi-app-extensions.d.ts": "./shuvi-app-extensions.d.ts"
-  },
-  "engines": {
-    "node": ">= 12.0.0"
-  },
-  "dependencies": {
-    "redux": "4.1.2",
-    "@shuvi/redox": "0.0.3",
-    "@shuvi/hook": "1.0.0-rc.0",
-    "@shuvi/service": "1.0.0-rc.0",
-    "@shuvi/toolpack": "1.0.0-rc.0",
-    "@shuvi/router": "1.0.0-rc.0",
-    "@shuvi/runtime": "1.0.0-rc.0",
-    "@shuvi/shared": "1.0.0-rc.0",
-    "@shuvi/utils": "1.0.0-rc.0"
+    "./shuvi-type-extensions-node": {
+      "types": "./shuvi-type-extensions-node.d.js",
+      "default": "./shuvi-type-extensions-node.js"
+    },
+    "./shuvi-type-extensions-runtime": "./shuvi-type-extensions-runtime.d.ts"
   },
   "scripts": {
     "dev": "run-p watch:*",
@@ -86,5 +76,25 @@
     "build": "run-p build:*",
     "build:esm": "tsc -p tsconfig.build.browser.json",
     "build:cjs": "tsc -p tsconfig.build.node.json"
+  },
+  "engines": {
+    "node": ">= 12.0.0"
+  },
+  "dependencies": {
+    "@shuvi/hook": "1.0.0-rc.3",
+    "@shuvi/redox": "0.0.3",
+    "@shuvi/router": "1.0.0-rc.3",
+    "@shuvi/runtime": "1.0.0-rc.3",
+    "@shuvi/service": "1.0.0-rc.3",
+    "@shuvi/shared": "1.0.0-rc.3",
+    "@shuvi/toolpack": "1.0.0-rc.3",
+    "@shuvi/utils": "1.0.0-rc.3",
+    "redux": "4.1.2"
+  },
+  "peerDependencies": {
+    "@shuvi/service": "1.0.0-rc.3"
+  },
+  "devDependencies": {
+    "@types/minimatch": "3.0.5"
   }
-}
+}

package/lib/node/platform/plugins/main/shuvi-app.d.ts

@@ -1,8 +0,0 @@
-import { extendedHooks } from './hooks';
-declare module '@shuvi/runtime' {
-    interface CustomCorePluginHooks {
-        addEntryCode: typeof extendedHooks.addEntryCode;
-        addPolyfill: typeof extendedHooks.addPolyfill;
-        modifyRuntimeConfig: typeof extendedHooks.modifyRuntimeConfig;
-    }
-}