lifeifan 7 years ago
parent
commit
55dce3e80e

+ 5 - 4
build/webpack.demo.base.conf.js

@@ -14,9 +14,10 @@ module.exports = merge(webpackBaseConf, {
         app: './sites/demo/app.js',
     },
     output: {
-        path: path.resolve(__dirname, '../dist/sites/demo/'),
-        chunkFilename: 'js/[name].[hash:5].js',
-        filename: isDev ? 'js/[name].js' : 'js/[name].[hash].js'
+        publicPath: '/',
+        path: path.resolve(__dirname, '../dist/sites/'),
+        chunkFilename: 'demo/js/[name].[hash:5].js',
+        filename: isDev ? 'demo/js/[name].js' : 'demo/js/[name].[hash].js'
     },
     module: {
         rules: [
@@ -40,7 +41,7 @@ module.exports = merge(webpackBaseConf, {
             filename:'demo.html'
         }),
         new MiniCssExtractPlugin({
-            filename: isDev ? 'css/[name].css' : 'css/[name].[hash].css'
+            filename: isDev ? 'demo/css/[name].css' : 'demo/css/[name].[hash].css'
         })
     ]
 });

+ 4 - 0
build/webpack.demo.build.conf.js

@@ -9,6 +9,10 @@ rimraf('./dist/sites/demo', function (err) {
     if(err) console.log(err);
 });
 
+rimraf('./dist/sites/demo.html', function (err) {
+    if (err) console.log(err);
+});
+
 module.exports = merge(baseConf, {
     mode: 'production',
     devtool: 'cheap-module-source-map',

+ 3 - 2
build/webpack.demo.dev.conf.js

@@ -7,7 +7,7 @@ const Carefree = require('@nutui/carefree');
 module.exports = merge(baseConf, {
     mode: 'development',
     output: {
-        publicPath: '/',
+        publicPath: '',
     },
     devtool: 'cheap-module-eval-source-map',
     plugins:[
@@ -24,7 +24,8 @@ module.exports = merge(baseConf, {
         })
     ],
     devServer: {
-        contentBase: path.resolve(__dirname, 'dist'),
+        contentBase: path.resolve(__dirname, 'dist/sites/'),
+        index: 'demo.html',
         compress: true, //gzip压缩
         historyApiFallback: true,
     }

+ 10 - 5
build/webpack.doc.base.conf.js

@@ -12,11 +12,15 @@ module.exports = merge(webpackBaseConf, {
         app: './sites/doc/app.js',
     },
     output: {
-        path: path.resolve(__dirname, '../dist/sites/doc/'),
-        chunkFilename: 'js/[name].[hash:5].js',
-        filename: isDev ? 'js/[name].js' : 'js/[name].[hash].js'
+        publicPath: '/',
+        path: path.resolve(__dirname, '../dist/sites/'),
+        chunkFilename: 'doc/js/[name].[hash:5].js',
+        filename: isDev ? 'doc/js/[name].js' : 'doc/js/[name].[hash].js'
     },
     module: {
+        rules: [
+
+        ]
     },
     plugins: [
         new mdtohtml({
@@ -33,10 +37,11 @@ module.exports = merge(webpackBaseConf, {
             nohead:true
         }),
         new HtmlWebpackPlugin({
-            template: './sites/doc/index.html'
+            template: './sites/doc/index.html',
+            filename: 'default.html'
         }),
         new MiniCssExtractPlugin({
-            filename: isDev ? 'css/[name].css' : 'css/[name].[hash].css'
+            filename: isDev ? 'doc/css/[name].css' : 'doc/css/[name].[hash].css'
         })
     ]
 });

+ 4 - 0
build/webpack.doc.build.conf.js

@@ -9,6 +9,10 @@ rimraf('./dist/sites/doc', function (err) {
     if (err) console.log(err);
 });
 
+rimraf('./dist/sites/default.html', function (err) {
+    if (err) console.log(err);
+});
+
 module.exports = merge(baseConf, {
     mode: 'production',
     devtool: 'cheap-module-source-map',

+ 2 - 1
build/webpack.doc.dev.conf.js

@@ -11,8 +11,9 @@ module.exports = merge(baseConf, {
     },
     devtool: 'cheap-module-eval-source-map',
     devServer: {
-        contentBase: path.resolve(__dirname, 'dist'),
+        contentBase: path.resolve(__dirname, 'dist/sites'),
         compress: true,
+        index: 'default.html',
         historyApiFallback: true,
     }
 });

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-beta.1",
   "description": "一套移动端轻量级Vue组件库",
   "typings": "dist/types/index.d.ts",
   "main": "dist/nutui.js",

+ 1 - 0
sites/demo/index.html

@@ -7,6 +7,7 @@
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
   <title>NutUI - 移动端Vue组件库</title>
   <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
+  <script src="https://h5.m.jd.com/babelDiy/Zeus/2846ykuM7PwipD9E2RzMj2BGEQpA/plugin/share.min.js"></script>
   <!-- <script src="//misc.360buyimg.com/felibs/fastclick/1.0.6/fastclick.min.js"></script> -->
   <style>
     html {

+ 1 - 1
sites/demo/view/demonav.vue

@@ -4,7 +4,7 @@
             <b class="go-btn"></b>
         </div>
         <div class="title">{{title}}</div>
-        <a class="home" :href="'http://git.jd.com/jdcfe/NutUI2/blob/dev/src/demo/'+title.toLowerCase()+'.vue'"></a>
+        <a class="home" :href="'https://github.com/jdf2e/nutui/tree/master/src/packages/'+title.toLowerCase()+'/demo.vue'"></a>
     </div>
 </template>
 

+ 3 - 3
sites/doc/app.vue

@@ -32,7 +32,7 @@
         </div>
         <ul class="list">
           <li class="cur">
-            <a href>指南</a>
+            <a href="default.html#/doc">指南</a>
           </li>        
           <li>
             <a class="qrcode demoLink" href="/demo.html#/index" target="_blank">示例             
@@ -68,10 +68,10 @@
             <div class="bg">
               <img src="./asset/css/i/phtitle.png" alt="">
               <div>
-                <input type="text" readonly :value="'http://127.0.0.1:8081/index.html#/'+routerName">
+                <input type="text" readonly :value="'http://nutui.jd.com/demo.html#/'+routerName">
               </div>
             </div>
-            <iframe :src="'http://127.0.0.1:8081/index.html#/'+routerName"></iframe>
+            <iframe :src="'/demo.html#/'+routerName"></iframe>
           </div>
         </div>
     </div>

+ 1 - 0
sites/doc/asset/css/style-blue.scss

@@ -4,6 +4,7 @@
     h1 {
         font-size: 28px;
         font-weight: 700;
+        margin:10px 0;
         color: #333333;
     }
     p {

+ 4 - 4
sites/doc/index.vue

@@ -15,10 +15,10 @@
           <div class="menu">
             <ul>
               <li>
-                <a href="/#/doc">指南</a>
+                <a href="default.html#/doc">指南</a>
               </li>
               <li>
-                <a href="/#/ActionSheet">组件</a>
+                <a href="default.html#/ActionSheet">组件</a>
               </li>
               <li>
                 <a href="/demo.html#/index" class="qrcode top-qr" target="_blank">示例
@@ -43,7 +43,7 @@
           <div class="mouseDiv" id="mouseDiv"></div>
           <p class="title">NutUI</p>
           <p class="sub-title">一套轻量级移动端Vue / 微信小程序组件库</p>
-          <a href="/#/doc" class="blue-btn">开始使用</a>
+          <a href="default.html#/doc" class="blue-btn">开始使用</a>
           <a href="javascript:;" class="qrcode btn">
             扫码体验
             <a>
@@ -501,7 +501,7 @@ export default {
       height: 26px;
       width: 26px;
       font-size: 0;
-      background: url(" ./asset/css/i/github.png") 0 0 no-repeat;
+      background: url("./asset/css/i/github.png") 0 0 no-repeat;
       vertical-align: middle;
       position: relative;
       top: -1px;

+ 1 - 1
sites/doc/info.vue

@@ -3,7 +3,7 @@
   <ol class="nav-l-1">
     <dt>指南</dt>
     <dd :class="curName=='intr' ?'l-1 curs':'l-1'">
-      <a href="#/index">介绍</a>
+      <a href="#/doc">介绍</a>
     </dd>
     <dd :class="curName=='fastStart' ?'l-1 curs':'l-1'">
       <a href="#/start">快速上手</a>

+ 5 - 1
sites/doc/router.js

@@ -19,7 +19,11 @@ Vue.use(VueRouter);
 const routes = [
   {
     path: '*',
-    redirect: '/doc'
+    redirect: '/index'
+  },
+  {
+    path: '/',
+    redirect: '/index'
   },
   {
     path:'/index',