fix: valaxy types export

YunYouJun · YunYouJun · commit 2f7ecfb5647b · 2022-04-06T03:31:17.000+08:00
diff --git a/packages/valaxy/bin/valaxy.js b/packages/valaxy/bin/valaxy.js
@@ -4,7 +4,7 @@
 // const path = require('path')
 
 function main() {
-  const { run } = require('../dist/cli')
+  const { run } = require('../dist/node/cli')
   run()
 }
 
diff --git a/packages/valaxy/src/node/cli.ts b/packages/valaxy/src/node/cli.ts
@@ -12,6 +12,9 @@ import { version } from '../../package.json'
 import { resolveOptions } from './options'
 import { bindShortcut, initServer, printInfo } from './utils/cli'
 
+// build
+import { build, ssgBuild } from './build'
+
 const cli = yargs.scriptName('valaxy')
   .usage('$0 [args]')
   .version(version)
@@ -137,7 +140,6 @@ cli.command(
     }
 
     if (ssg) {
-      const { ssgBuild } = await import('./build')
       consola.info('use vite-ssg to do ssg build...')
 
       try {
@@ -149,8 +151,6 @@ cli.command(
       }
     }
     else {
-      const { build } = await import('./build')
-
       consola.info('use vite do spa build...')
       await build(options, viteConfig)
     }
diff --git a/packages/valaxy/tsup.config.ts b/packages/valaxy/tsup.config.ts
@@ -5,6 +5,7 @@ export default defineConfig((options) => {
     entry: [
       'src/node/index.ts',
       'src/node/cli.ts',
+      'src/index.ts',
     ],
     // https://tsup.egoist.sh/#code-splitting
     // Code splitting currently only works with the esm output format, and it's enabled by default. If you want code splitting for cjs output format as well, try using --splitting flag which is an experimental feature to get rid of the limitation in esbuild.

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// const path = require('path')`
`5`	`5`
`6`	`6`	`function main() {`
`7`		`- const { run } = require('../dist/cli')`
	`7`	`+ const { run } = require('../dist/node/cli')`
`8`	`8`	`run()`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ import { version } from '../../package.json'`
`12`	`12`	`import { resolveOptions } from './options'`
`13`	`13`	`import { bindShortcut, initServer, printInfo } from './utils/cli'`
`14`	`14`
	`15`	`+// build`
	`16`	`+import { build, ssgBuild } from './build'`
	`17`	`+`
`15`	`18`	`const cli = yargs.scriptName('valaxy')`
`16`	`19`	`.usage('$0 [args]')`
`17`	`20`	`.version(version)`
`@@ -137,7 +140,6 @@ cli.command(`
`137`	`140`	`}`
`138`	`141`
`139`	`142`	`if (ssg) {`
`140`		`- const { ssgBuild } = await import('./build')`
`141`	`143`	`consola.info('use vite-ssg to do ssg build...')`
`142`	`144`
`143`	`145`	`try {`
`@@ -149,8 +151,6 @@ cli.command(`
`149`	`151`	`}`
`150`	`152`	`}`
`151`	`153`	`else {`
`152`		`- const { build } = await import('./build')`
`153`		`-`
`154`	`154`	`consola.info('use vite do spa build...')`
`155`	`155`	`await build(options, viteConfig)`
`156`	`156`	`}`