@vuepress/core 2.0.0-beta.28 → 2.0.0-beta.29

package/lib/app/createAppOptions.js

@@ -11,7 +11,7 @@ base = '/', lang = 'en-US', title = '', description = '', head = [], locales = {
 // theme config
 theme = '@vuepress/default', themeConfig = {}, 
 // bundler config
-bundler = '@vuepress/webpack', bundlerConfig = {}, 
+bundler = '@vuepress/vite', bundlerConfig = {}, 
 // directory config
 source, dest = utils_1.path.resolve(source, '.vuepress/dist'), temp = utils_1.path.resolve(source, '.vuepress/.temp'), cache = utils_1.path.resolve(source, '.vuepress/.cache'), public: publicDir = utils_1.path.resolve(source, '.vuepress/public'), 
 // markdown config

package/lib/app/resolveThemeInfo.js

@@ -12,7 +12,7 @@ const resolveThemeInfo = (app, themeName) => {
     const theme = (0, resolveTheme_1.resolveTheme)(app, themeName);
     const themeInfo = {
         layouts: (0, resolveThemeLayouts_1.resolveThemeLayouts)(theme.layouts),
-        plugins: [theme, ...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, theme.plugins)],
+        plugins: [...(0, resolvePluginsFromConfig_1.resolvePluginsFromConfig)(app, theme.plugins), theme],
     };
     // return if current theme does not have a parent theme
     if (!theme.extends) {

package/lib/types/app/options.d.ts

@@ -1,14 +1,12 @@
 import type { MarkdownOptions } from '@vuepress/markdown';
-import type { SiteLocaleConfig, SiteLocaleData } from '@vuepress/shared';
+import type { SiteData } from '@vuepress/shared';
 import type { BundlerConfig } from '../bundler';
 import type { PluginConfig } from '../plugin';
 import type { ThemeConfig } from '../theme';
 /**
  * Vuepress app options
  */
-export interface AppOptions<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> extends SiteLocaleData {
-    base: string;
-    locales: SiteLocaleConfig;
+export interface AppOptions<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> extends SiteData {
     theme: string;
     themeConfig: Partial<T>;
     bundler: string;
@@ -18,16 +16,16 @@ export interface AppOptions<T extends ThemeConfig = ThemeConfig, U extends Bundl
     temp: string;
     cache: string;
     public: string;
-    markdown: MarkdownOptions;
     debug: boolean;
+    markdown: MarkdownOptions;
+    pagePatterns: string[];
+    plugins: PluginConfig[];
     host: string;
     port: number;
     open: boolean;
-    pagePatterns: string[];
     templateDev: string;
-    templateSSR: string;
     shouldPreload: ((file: string, type: string) => boolean) | boolean;
     shouldPrefetch: ((file: string, type: string) => boolean) | boolean;
-    plugins: PluginConfig[];
+    templateSSR: string;
 }
-export declare type AppConfig = Partial<AppOptions> & Pick<AppOptions, 'source'>;
+export declare type AppConfig<T extends ThemeConfig = ThemeConfig, U extends BundlerConfig = BundlerConfig> = Partial<AppOptions<T, U>> & Pick<AppOptions<T, U>, 'source'>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/core",
-  "version": "2.0.0-beta.28",
+  "version": "2.0.0-beta.29",
   "description": "Core package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,8 +26,8 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@vuepress/client": "2.0.0-beta.28",
-    "@vuepress/markdown": "2.0.0-beta.28",
+    "@vuepress/client": "2.0.0-beta.29",
+    "@vuepress/markdown": "2.0.0-beta.29",
     "@vuepress/shared": "2.0.0-beta.28",
     "@vuepress/utils": "2.0.0-beta.28",
     "gray-matter": "^4.0.3",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71c34816a79263c7dcba3ff0c103e264abdbf0d2"
+  "gitHead": "2c6eb4270f96b6351cd1f565798bed1f662a6bb2"
 }