Merge pull request #27 from xiaoluoboding/develop

Develop
xiaoluoboding · Dec 6, 2019 · 109dd79 · 109dd79
2 parents 8a7829d + b570dc2
commit 109dd79
Show file tree

Hide file tree

Showing 24 changed files with 311 additions and 498 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.816a3708.js rel=preload as=script><link href=js/index.91eca1de.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.816a3708.js></script><script src=js/index.91eca1de.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.216a4a1e.js rel=preload as=script><link href=js/index.d6340fe9.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.216a4a1e.js></script><script src=js/index.d6340fe9.js></script></body></html>
diff --git a/docs/js/chunk-vendors.216a4a1e.js b/docs/js/chunk-vendors.216a4a1e.js
diff --git a/docs/js/chunk-vendors.816a3708.js b/docs/js/chunk-vendors.816a3708.js
diff --git a/docs/js/index.91eca1de.js b/docs/js/index.91eca1de.js
diff --git a/docs/js/index.d6340fe9.js b/docs/js/index.d6340fe9.js
diff --git a/lib/vue-smart-widget.common-report.html b/lib/vue-smart-widget.common-report.html
diff --git a/lib/vue-smart-widget.common.js b/lib/vue-smart-widget.common.js
diff --git a/lib/vue-smart-widget.umd-report.html b/lib/vue-smart-widget.umd-report.html
diff --git a/lib/vue-smart-widget.umd.js b/lib/vue-smart-widget.umd.js
diff --git a/lib/vue-smart-widget.umd.min-report.html b/lib/vue-smart-widget.umd.min-report.html
diff --git a/lib/vue-smart-widget.umd.min.js b/lib/vue-smart-widget.umd.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-smart-widget",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Smart widget is a flexible and extensible content container component for Vue2.5+.",
   "author": "xiaoluoboding <xiaoluoboding@gmail.com>",
   "scripts": {
@@ -32,15 +32,14 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "core-js": "^3.4.2",
-    "vue": "^2.6.10",
     "vue-grid-layout": "^2.3.7"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.5",
     "@vue/cli-plugin-eslint": "^4.0.5",
     "@vue/cli-service": "^4.0.5",
     "@vue/eslint-config-standard": "^4.0.0",
+    "core-js": "^3.4.2",
     "babel-eslint": "^10.0.1",
     "echarts": "^4.5.0",
     "element-ui": "^2.13.0",
@@ -53,6 +52,7 @@
     "postcss-url": "^8.0.0",
     "svg-sprite-loader": "^4.1.6",
     "v-tooltip": "^2.0.2",
+    "vue": "^2.6.10",
     "ve-charts": "^0.8.3",
     "vue-router": "^3.0.3",
     "vue-template-compiler": "^2.6.10",

diff --git a/src/assets/icons/collapse.svg b/src/assets/icons/collapse.svg
diff --git a/src/assets/icons/expand.svg b/src/assets/icons/expand.svg
diff --git a/src/assets/img/fullscreen.svg → src/assets/icons/fullscreen.svg b/src/assets/img/fullscreen.svg → src/assets/icons/fullscreen.svg
diff --git a/src/assets/icons/loading.svg b/src/assets/icons/loading.svg
diff --git a/src/assets/icons/refresh.svg b/src/assets/icons/refresh.svg
diff --git a/src/assets/img/unfullscreen.svg → src/assets/icons/unfullscreen.svg b/src/assets/img/unfullscreen.svg → src/assets/icons/unfullscreen.svg
diff --git a/src/assets/img/collapse.svg b/src/assets/img/collapse.svg
diff --git a/src/assets/img/expand.svg b/src/assets/img/expand.svg
diff --git a/src/assets/img/loading.svg b/src/assets/img/loading.svg
diff --git a/src/assets/img/refresh.svg b/src/assets/img/refresh.svg
diff --git a/src/plugins/svg-icon.js b/src/plugins/svg-icon.js
@@ -1,3 +1,3 @@
-const req = require.context('../assets/img', false, /\.svg$/)
+const req = require.context('../assets/icons', false, /\.svg$/)
 const requireAll = requireContext => requireContext.keys().map(requireContext)
 requireAll(req)
diff --git a/vue.config.js b/vue.config.js
@@ -1,6 +1,7 @@
 const path = require('path')
 
 const isProd = process.env.NODE_ENV === 'production'
+const isLib = process.env.VUE_APP_BUILD_MODE === 'lib'
 const resolve = dir => path.join(__dirname, dir)
 
 const setChainWebpack = config => {
@@ -19,13 +20,13 @@ const setChainWebpack = config => {
   config.module
     .rule('svg')
     .exclude
-      .add(resolve('src/assets/img'))
+      .add(resolve('src/assets/icons'))
       .end()
   config.module
     .rule('icons')
     .test(/\.svg$/)
     .include
-      .add(resolve('src/assets/img'))
+      .add(resolve('src/assets/icons'))
       .end()
     .use('svg-sprite-loader')
     .loader('svg-sprite-loader')
@@ -50,6 +51,16 @@ const setChainWebpack = config => {
   }
 }
 
+const setConfigureWebpack = config => {
+  if (isLib) {
+    config.output = {
+      ...config.output,
+      library: 'VueSmartWidget',
+      libraryExport: 'default'
+    }
+  }
+}
+
 module.exports = {
   publicPath: './',
   pages: {
@@ -60,6 +71,7 @@ module.exports = {
   lintOnSave: true,
   productionSourceMap: false,
   chainWebpack: config => setChainWebpack(config),
+  configureWebpack: config => setConfigureWebpack(config),
   css: {
     extract: false
   },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.816a3708.js rel=preload as=script><link href=js/index.91eca1de.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.816a3708.js></script><script src=js/index.91eca1de.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><title>vue-smart-widget</title><link href=js/chunk-vendors.216a4a1e.js rel=preload as=script><link href=js/index.d6340fe9.js rel=preload as=script></head><body><noscript><strong>We're sorry but vue-smart-widget doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.216a4a1e.js></script><script src=js/index.d6340fe9.js></script></body></html>