Update vite and vite-ssr dependencies

frandiox · Nov 28, 2020 · 7807968 · 7807968
1 parent 1436f62
commit 7807968
Show file tree

Hide file tree

Showing 7 changed files with 150 additions and 351 deletions.
diff --git a/core/build/index.js b/core/build/index.js
@@ -1,5 +1,5 @@
 import path from 'path'
-import buildSSR from 'vite-ssr/build/index.js'
+import buildSSR from 'vite-ssr/build.js'
 import buildFunctions from './functions.js'
 
 import config from '../config.cjs'

diff --git a/core/config.cjs b/core/config.cjs
@@ -1,31 +1,7 @@
-const fs = require('fs')
-const path = require('path')
-
-const systemRoot = path.parse(process.cwd()).root
-const fileExists = (dir, file) => fs.existsSync(path.resolve(dir, file))
-
-let rootDir
-let currentDir = process.cwd()
-let isTS = false
-
-while (!rootDir && currentDir !== systemRoot) {
-  if (fileExists(currentDir, 'vite.config.js')) {
-    rootDir = currentDir
-  } else if (fileExists(currentDir, 'vite.config.ts')) {
-    isTS = true
-    rootDir = currentDir
-  } else {
-    currentDir = path.resolve(currentDir, '..')
-  }
-}
-
-if (!rootDir) {
-  throw new Error(`Could not find Vite config file`)
-}
+const { getProjectInfo } = require('vite-ssr/config')
 
 module.exports = {
-  isTS,
-  rootDir,
+  ...getProjectInfo(),
   outDir: 'dist',
   clientOutDir: 'client',
   ssrOutDir: 'ssr',

diff --git a/core/package.json b/core/package.json
@@ -37,6 +37,6 @@
     "@rollup/plugin-virtual": "^2.0.3",
     "fast-glob": "^3.2.4",
     "rollup": "^2.33.1",
-    "vite-ssr": "^0.0.6"
+    "vite-ssr": "^0.0.7"
   }
 }
diff --git a/core/webpack.cjs b/core/webpack.cjs
@@ -7,12 +7,7 @@ module.exports = {
   resolve: {
     mainFields: ['main', 'module'],
     alias: {
-      __vitedge_router__: path.resolve(
-        rootDir,
-        outDir,
-        ssrOutDir,
-        '_assets/src/main.js'
-      ),
+      __vitedge_router__: path.resolve(rootDir, outDir, ssrOutDir),
       __vitedge_functions__: path.resolve(rootDir, outDir, fnsOutFile),
     },
   },