chore: update yk-cli 部分路径改为可配置

zhangyuang · zhangyuang · commit a420eaba6070 · 2019-11-08T17:58:09.000+08:00
diff --git a/example/ssr-with-antd/build/webpack.config.base.js b/example/ssr-with-antd/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getStyleLoaders = require('./util').getStyleLoaders
@@ -106,7 +105,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-dva/build/webpack.config.base.js b/example/ssr-with-dva/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getStyleLoaders = require('./util').getStyleLoaders
@@ -98,7 +97,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-js/build/webpack.config.base.js b/example/ssr-with-js/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent')
@@ -98,7 +97,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-js/package.json b/example/ssr-with-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-with-js",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "dependencies": {
     "egg": "^2.21.0",
     "egg-scripts": "^2.11.0",
diff --git a/example/ssr-with-loadable/build/webpack.config.base.js b/example/ssr-with-loadable/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getStyleLoaders = require('./util').getStyleLoaders
@@ -98,7 +97,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-mobx/build/webpack.config.base.js b/example/ssr-with-mobx/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getStyleLoaders = require('./util').getStyleLoaders
@@ -101,7 +100,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-ts/build/webpack.config.base.js b/example/ssr-with-ts/build/webpack.config.base.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const paths = require('./paths')
-const path = require('path')
 // style files regexes
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent')
@@ -97,7 +96,7 @@ module.exports = {
   mode: process.env.NODE_ENV,
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '../web')
+      '@': paths.appSrc
     },
     extensions: paths.moduleFileExtensions
       .map(ext => `.${ext}`)
diff --git a/example/ssr-with-ts/package.json b/example/ssr-with-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-with-ts",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "ykfe",
   "dependencies": {
     "egg-scripts": "^2.10.0",
diff --git a/packages/yk-cli/package.json b/packages/yk-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yk-cli",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "description": "ykcli for ssr",
   "main": "./lib/index.js",
   "module": "./es/index.js",
diff --git a/packages/yk-cli/src/clientRender.ts b/packages/yk-cli/src/clientRender.ts
@@ -2,6 +2,7 @@
 import { mkdir } from 'shelljs'
 import webpack from 'webpack'
 import fs from 'fs'
+import { join } from 'path'
 import { webpackWithPromise } from './util'
 import { Argv } from './interface/argv'
 
@@ -61,6 +62,7 @@ const dev = async (argv?: Argv) => {
 }
 
 const build = async () => {
+  const outputPath = clientConfig.output.path
   const stream = await renderLayout()
   ora.start()
   const stats: any = await webpackWithPromise(clientConfig)
@@ -74,12 +76,12 @@ const build = async () => {
   }))
   let writeStream
   try {
-    fs.statSync(cwd + '/dist/index.html')
-    writeStream = fs.createWriteStream(cwd + '/dist/index.html')
+    fs.statSync(join(outputPath, './index.html'))
+    writeStream = fs.createWriteStream(join(outputPath, './index.html'))
     stream.pipe(writeStream)
   } catch (error) {
-    mkdir(cwd + '/dist')
-    writeStream = fs.createWriteStream(cwd + '/dist/index.html')
+    mkdir(join(outputPath))
+    writeStream = fs.createWriteStream(join(outputPath, './index.html'))
     stream.pipe(writeStream)
   }
   ora.succeed()
diff --git a/packages/yk-cli/src/renderLayout.ts b/packages/yk-cli/src/renderLayout.ts
@@ -1,6 +1,6 @@
 
 import React from 'react'
-import { resolve } from 'path'
+import { resolve, join } from 'path'
 import Shell from 'shelljs'
 import { renderToNodeStream } from 'react-dom/server'
 // @ts-ignore
@@ -15,10 +15,12 @@ try {
   config = require('../../../config/config.default')
 }
 
+const paths = require('../../../build/paths')
 const serverConfig = require('../../../build/webpack.config.server')
 const isDev = process.env.NODE_ENV === 'development'
+
 serverConfig.entry = {
-  Layout: resolve(__dirname, '../../../web/layout')
+  Layout: join(paths.appSrc, './layout')
 }
 serverConfig.output.path = resolve(__dirname, '../dist')
 serverConfig.externals = nodeExternals({
diff --git a/packages/ykfe-utils/package.json b/packages/ykfe-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ykfe-utils",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/packages/ykfe-utils/src/renderToStream.js b/packages/ykfe-utils/src/renderToStream.js
@@ -1,6 +1,6 @@
 const renderToStream = async (ctx, config) => {
   const baseDir = config.baseDir || process.cwd()
-  const isLocal = config.env === 'local'
+  const isLocal = process.env.NODE_ENV === 'development'
   const serverJs = config.serverJs
 
   if (config.type !== 'ssr') {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ssr-with-js",`
`3`		`- "version": "2.1.4",`
	`3`	`+ "version": "2.1.5",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"egg": "^2.21.0",`
`6`	`6`	`"egg-scripts": "^2.11.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ssr-with-ts",`
`3`		`- "version": "2.0.3",`
	`3`	`+ "version": "2.0.4",`
`4`	`4`	`"description": "ykfe",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"egg-scripts": "^2.10.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "yk-cli",`
`3`		`- "version": "2.8.5",`
	`3`	`+ "version": "2.8.6",`
`4`	`4`	`"description": "ykcli for ssr",`
`5`	`5`	`"main": "./lib/index.js",`
`6`	`6`	`"module": "./es/index.js",`