Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:didi/cube-ui into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderXL committed Oct 11, 2018
2 parents 7da7fe5 + 51491c0 commit 8c587e8
Show file tree
Hide file tree
Showing 380 changed files with 5,766 additions and 3,414 deletions.
4 changes: 2 additions & 2 deletions build/webpack.modules.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ var webpackConfig = merge(baseWebpackConfig, {
output: {
path: config.build.assetsRoot,
filename: utils.assetsPath('[name]/index.js'),
library: 'cube',
libraryTarget: 'commonjs2'
library: ['cube', '[name]'],
libraryTarget: 'umd'
},
plugins: [
// extract css into its own file
Expand Down
1 change: 0 additions & 1 deletion docs/css/app.094393590b40500049be4708259e04b4.css

This file was deleted.

1 change: 1 addition & 0 deletions docs/css/app.180aa3f86c925cfdd3c1ac20180ad2c3.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/example/css/app.315c25dc3c369c36b7ca9f86a303ed2f.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/example/css/app.8f00d9598e927dbd3e9676475a23c3d6.css

This file was deleted.

2 changes: 1 addition & 1 deletion docs/example/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.8f00d9598e927dbd3e9676475a23c3d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.314a476dbbaf1306625e.js></script><script type=text/javascript src=js/app.fe5720880091b58532d3.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.315c25dc3c369c36b7ca9f86a303ed2f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.a6526fe909133c8ba7de.js></script><script type=text/javascript src=js/app.3264341898becb0350cf.js></script></body></html>
1 change: 1 addition & 0 deletions docs/example/js/app.3264341898becb0350cf.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/example/js/app.fe5720880091b58532d3.js

This file was deleted.

23 changes: 0 additions & 23 deletions docs/example/js/vendor.314a476dbbaf1306625e.js

This file was deleted.

23 changes: 23 additions & 0 deletions docs/example/js/vendor.a6526fe909133c8ba7de.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=x5-cache content=disable><meta name=keywords content=CUBE,UI,VUE,COMPONENT,LIB,LIBRARY><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><title>cube-ui Document</title><link href=/cube-ui/css/app.094393590b40500049be4708259e04b4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/cube-ui/js/manifest.9fec39bee077f26aab93.js></script><script type=text/javascript src=/cube-ui/js/vendor.791b438f74325218ad2d.js></script><script type=text/javascript src=/cube-ui/js/app.47641adfe598e1671f38.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=x5-cache content=disable><meta name=keywords content=CUBE,UI,VUE,COMPONENT,LIB,LIBRARY><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><title>cube-ui Document</title><link href=/cube-ui/css/app.180aa3f86c925cfdd3c1ac20180ad2c3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/cube-ui/js/manifest.214004295b4d1e2d34e8.js></script><script type=text/javascript src=/cube-ui/js/vendor.cc2f17a2a551675ea25a.js></script><script type=text/javascript src=/cube-ui/js/app.57b873d06a5bf087d7c0.js></script></body></html>
1 change: 1 addition & 0 deletions docs/js/0.d5ce8696d7817c1ad3a3.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/js/0.fb61c90e96595aa7fbf9.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/js/1.34b5857f194e5f1acfb6.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/js/1.bdbe1fab9e1c37b6fd75.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/js/10.54dab1cc1b5fa24b4ed9.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/js/10.a3e343bed9758474747b.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/js/11.dc382ddc7935c9f46796.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/js/11.fca8be0d3e957f0d81cc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/js/13.238568fdec73355962fb.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/js/13.d9efc3abe297630dced6.js

This file was deleted.

1 change: 0 additions & 1 deletion docs/js/14.c07f00aea03c853eb3bb.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/js/14.c3cc516b23ecc8d821aa.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/js/15.8f30968a6de84c59ab95.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/js/15.f8a45a0f1c77686ee9c1.js

Large diffs are not rendered by default.

Loading

0 comments on commit 8c587e8

Please sign in to comment.