diff --git a/Makefile b/Makefile
index bf8f2f463..ab0038d6a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,4 +11,4 @@ init:
node build/bin/init.js $(filter-out $@,$(MAKECMDGOALS))
dev:
- npm run docs
+ npm run dev
diff --git a/build/bin/build-all.js b/build/bin/build-all.js
index e1014ed74..97927ee70 100644
--- a/build/bin/build-all.js
+++ b/build/bin/build-all.js
@@ -10,15 +10,15 @@ let componentPaths = [];
delete components.font;
Object.keys(components).forEach(key => {
- const filePath = path.join(__dirname, `../../packages/${key}/cooking.conf.js`);
+ const filePath = path.join(__dirname, `../../packages/${key}/webpack.conf.js`);
if (existsSync(filePath)) {
- componentPaths.push(`packages/${key}/cooking.conf.js`);
+ componentPaths.push(`packages/${key}/webpack.conf.js`);
}
});
const paths = componentPaths.join(',');
-const cli = `node_modules/.bin/cooking build -c ${paths} -p`;
+const cli = `node_modules/.bin/webpack build -c ${paths} -p`;
execSync(cli, {
stdio: 'inherit'
diff --git a/build/release.sh b/build/release.sh
new file mode 100644
index 000000000..a738c9f18
--- /dev/null
+++ b/build/release.sh
@@ -0,0 +1,38 @@
+git checkout master
+git merge dev
+
+#!/usr/bin/env sh
+set -e
+echo "Enter release version: "
+read VERSION
+
+read -p "Releasing $VERSION - are you sure? (y/n)" -n 1 -r
+echo # (optional) move to a new line
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+ echo "Releasing $VERSION ..."
+
+ # build
+ VERSION=$VERSION npm run dist
+
+ # publish zanui-css
+ echo "Releasing zanui-css $VERSION ..."
+ cd packages/zanui-css
+ npm version $VERSION --message "[release] $VERSION"
+ npm publish
+ cd ../..
+
+ # commit
+ git add -A
+ git commit -m "[build] $VERSION"
+ npm version $VERSION --message "[release] $VERSION"
+
+ # publish
+ git push origin master
+ git push origin refs/tags/v$VERSION
+ git checkout dev
+ git rebase master
+ git push origin dev
+
+ npm publish
+fi
diff --git a/build/webpack.build.js b/build/webpack.build.js
index 6e900f7ba..49223cc98 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -1,13 +1,13 @@
-var config = require('./webpack.config.js')
+var config = require('./webpack.config.js');
config.entry = {
- 'oxygen': './src/index.js'
-}
+ 'zanui': './src/index.js'
+};
config.output = {
- filename: './dist/[name].js',
+ filename: './lib/[name].js',
library: 'zanui',
libraryTarget: 'umd'
-}
+};
-module.exports = config
+module.exports = config;
diff --git a/build/webpack.build.min.js b/build/webpack.build.min.js
index d8a978bc0..b3521675c 100644
--- a/build/webpack.build.min.js
+++ b/build/webpack.build.min.js
@@ -1,10 +1,9 @@
-var config = require('./webpack.build.js')
-var webpack = require('webpack')
+var config = require('./webpack.build.js');
+var webpack = require('webpack');
+config.output.filename = config.output.filename.replace(/\.js$/, '.min.js');
-config.output.filename = config.output.filename.replace(/\.js$/, '.min.js')
-
-delete config.devtool
+delete config.devtool;
config.plugins = [
new webpack.optimize.UglifyJsPlugin({
@@ -14,6 +13,6 @@ config.plugins = [
warnings: false
}
})
-]
+];
-module.exports = config
+module.exports = config;
diff --git a/build/webpack.config.js b/build/webpack.config.js
index 8841731d8..4a626fbe0 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -24,7 +24,8 @@ function wrap(render) {
module.exports = {
entry: {
- 'build-docs': './docs/index.js'
+ 'zanui-docs': './docs/index.js',
+ 'zanui-examples': './docs/examples.js'
},
output: {
path: './docs/build',
@@ -39,7 +40,7 @@ module.exports = {
extensions: ['.js', '.vue', '.pcss'],
alias: {
'vue$': 'vue/dist/vue.runtime.common.js',
- 'oxygen': path.join(__dirname, '..'),
+ 'zanui': path.join(__dirname, '..'),
'src': path.join(__dirname, '../src'),
'packages': path.join(__dirname, '../packages')
}
diff --git a/packages/switch/CHANGELOG.md b/docs/ExamplesApp.vue
similarity index 100%
rename from packages/switch/CHANGELOG.md
rename to docs/ExamplesApp.vue
diff --git a/docs/App.vue b/docs/ExamplesDocsApp.vue
similarity index 100%
rename from docs/App.vue
rename to docs/ExamplesDocsApp.vue
diff --git a/docs/examples/button.md b/docs/examples-docs/button.md
similarity index 100%
rename from docs/examples/button.md
rename to docs/examples-docs/button.md
diff --git a/docs/examples/cell.md b/docs/examples-docs/cell.md
similarity index 100%
rename from docs/examples/cell.md
rename to docs/examples-docs/cell.md
diff --git a/docs/examples/checkbox.md b/docs/examples-docs/checkbox.md
similarity index 100%
rename from docs/examples/checkbox.md
rename to docs/examples-docs/checkbox.md
diff --git a/docs/examples/dialog.md b/docs/examples-docs/dialog.md
similarity index 100%
rename from docs/examples/dialog.md
rename to docs/examples-docs/dialog.md
diff --git a/docs/examples/field.md b/docs/examples-docs/field.md
similarity index 100%
rename from docs/examples/field.md
rename to docs/examples-docs/field.md
diff --git a/docs/examples/picker.md b/docs/examples-docs/picker.md
similarity index 100%
rename from docs/examples/picker.md
rename to docs/examples-docs/picker.md
diff --git a/docs/examples/popup.md b/docs/examples-docs/popup.md
similarity index 100%
rename from docs/examples/popup.md
rename to docs/examples-docs/popup.md
diff --git a/docs/examples/radio.md b/docs/examples-docs/radio.md
similarity index 100%
rename from docs/examples/radio.md
rename to docs/examples-docs/radio.md
diff --git a/docs/examples/switch.md b/docs/examples-docs/switch.md
similarity index 100%
rename from docs/examples/switch.md
rename to docs/examples-docs/switch.md
diff --git a/docs/examples.js b/docs/examples.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/examples/button.vue b/docs/examples/button.vue
new file mode 100644
index 000000000..3574db362
--- /dev/null
+++ b/docs/examples/button.vue
@@ -0,0 +1,10 @@
+
+
+
+
+
+
diff --git a/docs/index.js b/docs/index.js
index 932bd8878..212561ff8 100644
--- a/docs/index.js
+++ b/docs/index.js
@@ -1,6 +1,6 @@
import Vue from 'vue';
import VueRouter from 'vue-router';
-import App from './App';
+import App from './ExamplesDocsApp';
import routes from './router.config';
import demoBlock from './components/demo-block';
import SideNav from './components/side-nav';
diff --git a/docs/router.config.js b/docs/router.config.js
index 3aaeb1002..6bc6286cf 100644
--- a/docs/router.config.js
+++ b/docs/router.config.js
@@ -23,7 +23,7 @@ const registerRoute = (navConfig) => {
route.push({
path: '/component' + page.path,
component: function(resolve) {
- require([`./examples${page.path}.md`], resolve);
+ require([`./examples-docs${page.path}.md`], resolve);
}
});
}
diff --git a/examples.html b/examples.html
new file mode 100644
index 000000000..3de3e8494
--- /dev/null
+++ b/examples.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+ Oxygen
+
+
+
+
+
+
+
+
diff --git a/index.html b/index.html
index 2a1d2e4be..b44af6e28 100644
--- a/index.html
+++ b/index.html
@@ -11,6 +11,6 @@
-
+