diff --git a/client/App.js b/client/App.js index d7a59564..4a29d424 100644 --- a/client/App.js +++ b/client/App.js @@ -2,6 +2,7 @@ import React, { Component } from 'react' import Routes from './routes' import './styles/cs.scss' // import './styles/cs.less' +console.log(4444) class App extends Component { render() { diff --git a/client/styles/cs.scss b/client/styles/cs.scss index c09207b9..fa2633d7 100644 --- a/client/styles/cs.scss +++ b/client/styles/cs.scss @@ -1,5 +1,5 @@ html { body { - border: 1px #000 solid; + border: 1px #F00 solid; } } diff --git a/package.json b/package.json index 7bc157a3..2cc4dacd 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,7 @@ "description": "-------------------------------------------------------------------------------- #### **项目管理**: #### *PMO*:(http://pmo.corp.qunar.com)
-------------------------------------------------------------------------------- #### **CI/CD**: #### *QDR*:(http://qdr.corp.qunar.com/)
#### *QCI*:(http://qci.corp.qunar.com/)
#### *CABLE*:(http://wanshiwu.corp.qunar.com/qualitycheck/index/)
", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build-server": "babel server -d server_dist", - "dev-server": "nodemon server_dist/app.js dev" + "start": "webpack-dev-server" }, "repository": { "type": "git", @@ -29,15 +27,9 @@ "mongoose-auto-increment": "^5.0.1" }, "devDependencies": { - "babel-cli": "^6.24.1", - "babel-preset-stage-3": "^6.24.1", - "fs-extra": "^3.0.1", - "gulp": "^3.9.1", - "gulp-babel": "^6.1.2", - "gulp-watch": "^4.3.11", - "nodemon": "^1.11.0", "axios": "^0.16.2", "babel": "^6.5.2", + "babel-cli": "^6.24.1", "babel-core": "^6.8.0", "babel-eslint": "^6.0.4", "babel-loader": "^6.2.4", @@ -46,13 +38,21 @@ "babel-plugin-transform-runtime": "^6.9.0", "babel-preset-es2015": "^6.9.0", "babel-preset-react": "^6.5.0", + "babel-preset-stage-3": "^6.24.1", "babel-register": "^6.9.0", "babel-runtime": "^6.9.2", "buffer-shims": "^1.0.0", + "css-loader": "^0.28.4", + "express": "^4.15.3", "extract-text-webpack-plugin": "^2.1.2", + "fs-extra": "^3.0.1", + "gulp": "^3.9.1", + "gulp-babel": "^6.1.2", + "gulp-watch": "^4.3.11", "less": "^2.7.2", "less-loader": "^4.0.4", "node-sass": "^4.5.3", + "nodemon": "^1.11.0", "prop-types": "^15.5.10", "react": "^15.6.1", "react-dom": "^15.6.1", @@ -62,10 +62,11 @@ "react-scripts": "1.0.10", "sass-loader": "^6.0.6", "scss-loader": "0.0.1", + "style-loader": "^0.18.2", "webpack": "^2.0.0", - "webpack-node-externals": "^1.6.0", - "css-loader": "^0.28.4", - "style-loader": "^0.18.2" + "webpack-dev-middleware": "^1.11.0", + "webpack-dev-server": "^2.5.0", + "webpack-node-externals": "^1.6.0" }, "engines": { "node": ">= 6.0.0", diff --git a/webpack.config.js b/webpack.config.js index 4d4086be..9e7d23ea 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -20,6 +20,9 @@ module.exports = { // 包存放的目录 path: path.resolve('./build'), }, + devServer:{ + contentBase:'./' + }, // target: 'node', // externals: [nodeExternals()], module: {