Skip to content

Commit 09ed48c

Browse files
author
Jeff
committed
Merge branch 'master' of https://github.com/yamsellem/vue-select into yamsellem-master
# Conflicts: # .gitignore
2 parents 182e11b + 09165c4 commit 09ed48c

18 files changed

+196
-515
lines changed

‎.babelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"presets": ["es2015", "stage-2"],
3-
"plugins": ["transform-runtime"],
2+
"presets": ["@babel/preset-env"],
3+
"plugins": ["@babel/plugin-transform-runtime"],
44
"comments": false
5-
}
5+
}

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ package-lock.json
99
docs/gitbook/_book
1010
docs/node_modules
1111
site
12-
dist
12+
_book
13+
dist

‎build/build.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎build/dev-client.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎build/dev-server.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎build/utils.js

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎build/webpack.base.conf.js

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,56 @@
1+
var webpack = require('webpack')
2+
var VueLoaderPlugin = require('vue-loader').VueLoaderPlugin;
3+
var MiniCssExtractPlugin = require('mini-css-extract-plugin')
14
var path = require('path')
2-
var config = require('../config')
3-
var utils = require('./utils')
4-
var projectRoot = path.resolve(__dirname, '../')
5+
var chokidar = require('chokidar');
6+
7+
const env = process.env.NODE_ENV === 'production' ? 'production' : 'development';
58

69
module.exports = {
7-
entry: {
8-
app: utils.shouldServeHomepage() ? './docs/homepage/home.js' : './dev/dev.js',
9-
},
10+
mode: env,
1011
output: {
11-
path: config.build.assetsRoot,
12-
publicPath: config.build.assetsPublicPath,
12+
path: path.resolve(__dirname, '../dist'),
13+
publicPath: '/',
1314
filename: '[name].js'
1415
},
16+
devtool: env === 'production' ? 'source-map' : 'eval-source-map',
1517
resolve: {
16-
extensions: ['', '.js', '.vue'],
17-
fallback: [path.join(__dirname, '../node_modules')],
18+
extensions: ['.js', '.vue'],
1819
alias: {
1920
'src': path.resolve(__dirname, '../src'),
2021
'assets': path.resolve(__dirname, '../docs/assets'),
2122
'mixins': path.resolve(__dirname, '../src/mixins'),
2223
'components': path.resolve(__dirname, '../src/components'),
2324
'docs': path.resolve(__dirname, '../docs'),
24-
'vue$': 'vue/dist/vue.common.js',
25+
'vue$': 'vue/dist/vue.esm.js'
2526
}
2627
},
27-
resolveLoader: {
28-
fallback: [path.join(__dirname, '../node_modules')]
29-
},
3028
module: {
31-
loaders: [
29+
rules: [
3230
{
3331
test: /\.vue$/,
3432
loader: 'vue-loader'
3533
},
3634
{
3735
test: /\.js$/,
3836
loader: 'babel-loader',
39-
include: projectRoot,
37+
include: path.resolve(__dirname, '../'),
4038
exclude: /node_modules/
4139
},
4240
{
4341
test: /\.json$/,
4442
loader: 'json-loader'
4543
},
44+
{
45+
test: /\.s?css$/,
46+
use: [
47+
process.env.NODE_ENV !== 'production'
48+
? 'vue-style-loader'
49+
: MiniCssExtractPlugin.loader,
50+
'css-loader',
51+
'sass-loader'
52+
]
53+
},
4654
{
4755
test: /\.html$/,
4856
loader: 'vue-html-loader'
@@ -52,20 +60,39 @@ module.exports = {
5260
loader: 'url',
5361
query: {
5462
limit: 10000,
55-
name: utils.assetsPath('img/[name].[hash:7].[ext]')
63+
name: 'img/[name].[hash:7].[ext]'
5664
}
5765
},
5866
{
5967
test: /\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/,
6068
loader: 'url',
6169
query: {
6270
limit: 10000,
63-
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
71+
name: 'fonts/[name].[hash:7].[ext]'
6472
}
6573
}
6674
]
6775
},
68-
vue: {
69-
loaders: utils.cssLoaders()
76+
plugins: [
77+
new webpack.DefinePlugin({
78+
'process.env': env
79+
}),
80+
new MiniCssExtractPlugin({
81+
filename: 'vue-select.css'
82+
}),
83+
new VueLoaderPlugin()
84+
],
85+
devServer: {
86+
hot: true,
87+
hotOnly: true,
88+
inline: true,
89+
port: 8080,
90+
before(app, server) {
91+
chokidar.watch([
92+
'./**/*.html'
93+
]).on('all', function () {
94+
server.sockWrite(server.sockets, 'content-changed');
95+
})
96+
}
7097
}
7198
}

‎build/webpack.dev.conf.js

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,24 @@
1-
var config = require('../config')
2-
var webpack = require('webpack')
31
var merge = require('webpack-merge')
4-
var utils = require('./utils')
5-
var baseWebpackConfig = require('./webpack.base.conf')
62
var HtmlWebpackPlugin = require('html-webpack-plugin')
73

8-
// add hot-reload related code to entry chunks
9-
Object.keys(baseWebpackConfig.entry).forEach(function (name) {
10-
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
11-
})
4+
var baseWebpackConfig = require('./webpack.base.conf')
125

136
module.exports = merge(baseWebpackConfig, {
7+
entry: './dev/dev.js',
148
module: {
15-
loaders: utils.styleLoaders().concat({ test: /\.md$/, loader: "html!markdown" })
9+
rules: [{
10+
test: /\.md$/,
11+
loader: "html!markdown-code-highlight-loader"
12+
}]
1613
},
17-
// eval-source-map is faster for development
18-
devtool: '#eval-source-map',
1914
plugins: [
20-
new webpack.DefinePlugin({
21-
'process.env': config.dev.env
22-
}),
23-
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
24-
new webpack.optimize.OccurenceOrderPlugin(),
25-
new webpack.HotModuleReplacementPlugin(),
26-
new webpack.NoErrorsPlugin(),
27-
// https://github.com/ampedandwired/html-webpack-plugin
2815
new HtmlWebpackPlugin({
2916
filename: 'index.html',
30-
template: utils.shouldServeHomepage() ? './docs/homepage/home.html' : './dev/dev.html',
17+
template: './dev/dev.html',
3118
inject: true
3219
})
3320
],
34-
markdownLoader: {
35-
highlight: function (code) {
36-
return require('highlight.js').highlightAuto(code).value;
37-
}
21+
optimization: {
22+
noEmitOnErrors: true
3823
}
3924
})

0 commit comments

Comments
 (0)