Skip to content

M
marketing
Commit f23eae1a by 黑潮
Options

update: 修改

parent 56935e91
Showing with 68 additions and 83 deletions
build/build.js
......@@ -4,11 +4,11 @@ require('./check-versions')()
process.env.NODE_ENV = 'production'
const ora = require('ora')
const rm = require('rimraf')
const path = require('path')
// const rm = require('rimraf')
// const path = require('path')
const chalk = require('chalk')
const webpack = require('webpack')
const config = require('../config')
// const config = require('../config')
const webpackConfig = require('./webpack.prod.conf')
const spinner = ora('building for production...')
......
build/utils.js
......@@ -3,7 +3,7 @@ const path = require('path');
const packageConfig = require('../package.json');
exports.assetsPath = function(_path) {
return path.posix.join('/static', _path);
return path.posix.join('static', _path);
};
const cssLoaders = function() {
......
build/webpack.base.conf.js
......@@ -3,7 +3,8 @@ const path = require('path');
const utils = require('./utils');
const { VueLoaderPlugin } = require('vue-loader');
const ESLintPlugin = require('eslint-webpack-plugin');
const utils = require('./utils');
const config = require('./config');
const HtmlWebpackPlugin = require('html-webpack-plugin');
function resolve(dir) {
return path.join(__dirname, '..', dir);
......@@ -19,6 +20,13 @@ module.exports = {
'@': resolve('src'),
}
},
output: {
path: config.ouputDir,
filename: utils.assetsPath('js/[name].[chunkhash].js'),
chunkFilename: utils.assetsPath('js/[name].[chunkhash].js'),
clean: true,
publicPath: config.publicPath
},
module: {
rules: [
{
......@@ -36,8 +44,10 @@ module.exports = {
generator: {
filename: 'img/[name].[hash:7].[ext]'
},
dataUrlCondition: {
maxSize: 10000,
parser: {
dataUrlCondition: {
maxSize: 10000,
}
}
},
{
......@@ -46,8 +56,10 @@ module.exports = {
generator: {
filename: 'media/[name].[hash:7].[ext]'
},
dataUrlCondition: {
maxSize: 10000,
parser: {
dataUrlCondition: {
maxSize: 10000,
}
}
},
{
......@@ -56,8 +68,10 @@ module.exports = {
generator: {
filename: 'fonts/[name].[hash:7].[ext]'
},
dataUrlCondition: {
maxSize: 10000,
parser: {
dataUrlCondition: {
maxSize: 10000,
}
}
},
...utils.styleLoaders(),
......@@ -65,20 +79,13 @@ module.exports = {
},
plugins: [
new VueLoaderPlugin(),
new ESLintPlugin({
extensions: ['js', 'vue'],
files: 'src',
fix: 'true'
}),
// new ESLintPlugin({
// extensions: ['js', 'vue'],
// files: 'src',
// fix: true
// }),
new HtmlWebpackPlugin({
template: 'index.html',
})
],
externals: {
vue: 'Vue',
'vue-router': 'VueRouter',
vuex: 'Vuex',
'axios': 'axios',
'element-ui': 'ELEMENT'
},
]
};
build/webpack.dev.conf.js
'use strict';
const utils = require('./utils');
const config = require('../config');
const merge = require('webpack-merge');
const config = require('./config');
const { merge } = require('webpack-merge');
const path = require('path');
const baseWebpackConfig = require('./webpack.base.conf');
const HtmlWebpackPlugin = require('html-webpack-plugin');
......@@ -24,7 +24,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
directory: path.join(__dirname, '../static'),
},
historyApiFallback: {
rewrites: [{ from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }]
rewrites: [{ from: /.*/, to: path.posix.join(config.publicPath, 'index.html') }]
},
host: 'localhost',
port: PORT,
......@@ -61,7 +61,7 @@ module.exports = new Promise((resolve, reject) => {
compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`]
},
onErrors: config.dev.notifyOnErrors ? utils.createNotifierCallback() : undefined
onErrors: utils.createNotifierCallback()
})
);
......
build/webpack.prod.conf.js
......@@ -2,7 +2,7 @@
const path = require('path');
const utils = require('./utils');
const webpack = require('webpack');
const config = require('../config');
const config = require('./config');
const merge = require('webpack-merge');
const baseWebpackConfig = require('./webpack.base.conf');
const CopyWebpackPlugin = require('copy-webpack-plugin');
......@@ -10,17 +10,19 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
const webpackConfig = merge(baseWebpackConfig, {
mode: 'production',
devtool: false,
output: {
path: config.ouputDir,
filename: utils.assetsPath('js/[name].[chunkhash].js'),
chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
},
optimization: {
minimizer: [
`...`,
new CssMinimizerPlugin(),
],
},
externals: {
vue: 'Vue',
'vue-router': 'VueRouter',
vuex: 'Vuex',
'axios': 'axios',
'element-ui': 'ELEMENT'
},
plugins: [
new MiniCssExtractPlugin({
filename: utils.assetsPath('css/[name].[contenthash].css'),
......
index.html
......@@ -15,14 +15,7 @@
<div id="app"></div>
<!-- built files will be auto injected -->
<!-- 组件引用cdn -->
<script>
(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();
</script>
<!-- 4.0组件库中的组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -5,7 +5,7 @@
"author": "",
"private": true,
"scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"dev": "webpack --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"build": "node build/build.js",
"format": "onchange 'test/**/*.js' 'src/**/*.js' 'src/**/*.vue' -- prettier --write {{changed}}"
......@@ -27,77 +27,60 @@
"v-charts": "^1.17.8",
"v-viewer": "^1.6.4",
"viser-vue": "^2.2.5",
"vue": "^2.6.6",
"vue-axios": "^2.1.1",
"vue-lazyload": "^1.2.6",
"vue-qr": "^1.3.8",
"vue-router": "^3.3.4",
"vue-ueditor-wrap": "^1.3.4",
"vue2-editor": "^2.5.0",
"vuedraggable": "^2.24.0",
"vue-lazyload": "^1.2.6",
"vuex": "^3.5.1"
},
"devDependencies": {
"autoprefixer": "10.4.0",
"@babel/core": "7.16.0",
"@babel/eslint-parser": "7.16.3",
"babel-loader": "8.2.3",
// "babel-plugin-syntax-jsx": "^6.18.0",
// "babel-plugin-transform-runtime": "^6.22.0",
// "babel-plugin-transform-vue-jsx": "^3.5.0",
// "babel-polyfill": "^6.26.0",
"@babel/preset-env": "7.16.0",
// "babel-preset-flow": "^6.23.0",
// "babel-preset-stage-2": "^6.22.0",
"@soda/friendly-errors-webpack-plugin": "^1.8.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
"@vue/babel-preset-jsx": "^1.2.4",
"autoprefixer": "10.4.0",
"babel-loader": "8.2.3",
"chalk": "4.1.2",
"copy-webpack-plugin": "9.0.1",
"css-loader": "6.5.1",
"eslint": "8.2.0",
// "eslint-config-prettier": "^4.0.0",
// "eslint-config-standard": "^12.0.0",
// "eslint-friendly-formatter": "^4.0.1",
// "eslint-loader": "^2.1.1",
// "eslint-plugin-html": "^5.0.0",
// "eslint-plugin-import": "^2.22.0",
// "eslint-plugin-node": "^7.0.1",
// "eslint-plugin-prettier": "^3.1.4",
// "eslint-plugin-promise": "^4.0.1",
// "eslint-plugin-standard": "^4.0.0",
// "eslint-plugin-vue": "^4.7.1",
// "extract-text-webpack-plugin": "^3.0.0",
"css-minimizer-webpack-plugin": "3.1.3",
// "file-loader": "^1.1.4",
// "friendly-errors-webpack-plugin": "^1.6.1",
"@soda/friendly-errors-webpack-plugin": "^1.8.0",
"eslint": "8.2.0",
"eslint-webpack-plugin": "^3.1.1",
"html-webpack-plugin": "5.5.0",
"mini-css-extract-plugin": "2.4.4",
"node-notifier": "10.0.0",
"sass": "1.43.4",
// "onchange": "^5.2.0",
// "optimize-css-assets-webpack-plugin": "^3.2.0",
"node-sass": "4.14.1",
"ora": "6.0.1",
"portfinder": "^1.0.27",
// "postcss-import": "^11.0.0",
"postcss": "8.3.11",
"postcss-import": "^14.0.2",
"postcss-loader": "6.2.0",
// "postcss-url": "^7.2.1",
// "prettier": "^1.16.4",
// "rimraf": "^2.6.0",
"sass-loader": "12.3.0",
"postcss-url": "^10.1.3",
"sass-loader": "^7.0.3",
"semver": "7.3.5",
"shelljs": "0.8.4",
"vue-loader": "15.9.8",
"style-loader": "3.3.1",
"vue-template-compiler": "^2.6.6",
"vue-eslint-parser": "^8.0.1",
"vue-loader": "15.9.8",
"vue-template-compiler": "2.6.6",
"webpack": "5.56.0",
"webpack-bundle-analyzer": "4.5.0",
"webpack-cli":"4.9.1",
"webpack-dev-server": "^3.11.2",
"webpack-cli": "4.9.1",
"webpack-dev-server": "4.3.0",
"webpack-merge": "5.8.0"
},
"optionalDependencies": {
"fsevents": "*"
},
"engines": {
"node": ">= 6.0.0",
"npm": ">= 3.0.0"
"node": ">= 12.22.0",
"npm": ">= 6.14.11"
},
"browserslist": [
"> 1%",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment