Merge branch 'hotfix/1.4.3'

SevenOutman · Apr 13, 2018 · 180e9a2 · 180e9a2
2 parents 26529e0 + 8c6a941
commit 180e9a2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-aplayer",
- "version": "1.4.2",
+ "version": "1.4.3",
  "description": "Easy-to-config music player for Vue 2.x",
  "main": "dist/vue-aplayer.min.js",
  "files": [

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,16 +1,30 @@
 var path = require('path')
 var webpack = require('webpack')
-var HtmlWebpackPlugin = require('html-webpack-plugin')
 
 module.exports = {
  entry: './src/vue-aplayer.vue',
  output: {
  path: path.resolve(__dirname, 'dist'),
  filename: 'vue-aplayer.min.js',
- library: 'VueAplayer',
+ library: 'VueAPlayer',
  libraryTarget: 'umd'
  },
 
+ externals: {
+ 'hls.js': {
+ amd: 'hls.js',
+ commonjs: 'hls.js',
+ commonjs2: 'hls.js',
+ root: 'Hls'
+ },
+ 'vue': {
+ amd: 'vue',
+ commonjs: 'vue',
+ commonjs2: 'vue',
+ root: 'Vue'
+ },
+ },
+
  module: {
  rules: [
  {
@@ -28,9 +42,8 @@ module.exports = {
  loader: 'vue-loader',
  options: {
  loaders: {
- js: 'babel-loader',
- scss: 'style-loader!css-loader!postcss-loader!sass-loader'
- }
+ scss: 'vue-style-loader!css-loader?minimize=true!postcss-loader!sass-loader'
+ },
  }
  },
  {
@@ -48,7 +61,7 @@ module.exports = {
  }
  ]
  },
- devtool: '#eval-source-map',
+ devtool: '#source-map',
  plugins: [
  new webpack.DefinePlugin({
  'process.env': {