diff --git a/cuizin/static/.babelrc b/.babelrc similarity index 100% rename from cuizin/static/.babelrc rename to .babelrc diff --git a/cuizin/static/.editorconfig b/.editorconfig similarity index 100% rename from cuizin/static/.editorconfig rename to .editorconfig diff --git a/cuizin/static/.eslintignore b/.eslintignore similarity index 100% rename from cuizin/static/.eslintignore rename to .eslintignore diff --git a/cuizin/static/.eslintrc.js b/.eslintrc.js similarity index 100% rename from cuizin/static/.eslintrc.js rename to .eslintrc.js diff --git a/cuizin/static/.postcssrc.js b/.postcssrc.js similarity index 100% rename from cuizin/static/.postcssrc.js rename to .postcssrc.js diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 01d59db..1e08c95 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -5,7 +5,7 @@ const config = require('../config') const vueLoaderConfig = require('./vue-loader.conf') function resolve (dir) { - return path.join(__dirname, '..', dir) + return path.join(__dirname, '../cuizin/', dir) } const createLintingRule = () => ({ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 250e55c..a14e9e9 100755 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -54,7 +54,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { // https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ filename: 'index.html', - template: 'index.html', + template: 'static/index.html', inject: true }), // copy custom static assets diff --git a/config/index.js b/config/index.js index 394257e..9b34602 100644 --- a/config/index.js +++ b/config/index.js @@ -8,7 +8,7 @@ module.exports = { dev: { // Paths - assetsSubDirectory: path.resolve(__dirname, '../cuizin/static'), + assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: {}, diff --git a/package.json b/package.json index 89098e7..192efcc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "start": "npm run dev", - "lint": "eslint --ext .js,.vue src", + "lint": "eslint --ext .js,.vue cuizin/js_src", "build": "node build/build.js" }, "dependencies": {