Merge pull request #16 from jkazama/1.1.x

v1.1.1
jkazama · Nov 16, 2016 · d2d862e · d2d862e
2 parents 0d328ac + f40920e
commit d2d862e
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 56 deletions.
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -36,9 +36,11 @@ const resource = {
       jquery:     `${paths.node.modules}/jquery/dist/jquery.js`,
       lodash:     `${paths.node.modules}/lodash/lodash.js`,
       moment:     `${paths.node.modules}/moment/moment.js`,
+      flatpickr:  `${paths.node.modules}/flatpickr/dist/flatpickr.js`,
       vue:        `${paths.node.modules}/vue/dist/vue.js`,
       bootstrap:  `${paths.node.modules}/bootstrap-sass/assets/javascripts/bootstrap.js`,
     },
+    css: [`${paths.node.modules}/flatpickr/dist/flatpickr.min.css`],
     fontawesome: `${paths.node.modules}/font-awesome/fonts/**/*`
   }
 }
@@ -142,6 +144,10 @@ gulp.task('build:static', () => {
     .pipe($.concat("vendor.bundle.js"))
     .pipe($.if(production, $.uglify()))
     .pipe(gulp.dest(paths.dist.js))
+  gulp.src(resource.vendor.css)
+    .pipe($.concat('vendor.css'))
+    .pipe($.pleeease())
+    .pipe(gulp.dest(paths.dist.css))
   gulp.src(resource.vendor.fontawesome)
     .pipe(gulp.dest(paths.dist.font))
   return gulp.src(resource.src.static)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sample-ui-vue-pages",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Vue.js Boilerplate [Multi Page]",
   "main": "src/js/common.js",
   "scripts": {
@@ -14,52 +14,54 @@
     "url" : "https://github.com/jkazama/sample-ui-vue-pages.git"
   },
   "dependencies": {
-    "co": "^4.6.0",
-    "superagent": "^2.2.0",
-    "lodash": "^4.15.0",
-    "vue": "^2.0.0",
-    "jquery": "^2.2.0",
-    "moment": "^2.14.0",
-    "flatpickr": "^2.0.0",
-    "bootstrap-sass": "^3.3.0",
-    "font-awesome": "^4.6.0"
+    "bootstrap-sass": "~3.3.0",
+    "co": "~4.6.0",
+    "flatpickr": "~2.1.0",
+    "font-awesome": "~4.6.0",
+    "jquery": "~3.1.0",
+    "lodash": "~4.17.0",
+    "moment": "~2.16.0",
+    "superagent": "~2.3.0",
+    "vue": "~2.0.0",
+    "vue-router": "~2.0.0",
+    "he": "~1.1.0"
   },
   "devDependencies": {
-    "babel-core": "^6.13.0",
-    "babel-runtime": "^6.9.0",
-    "babel-loader": "^6.2.0",
-    "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-preset-es2015 ": "^6.14.0",
-    "browser-sync": "^2.14.0",
-    "css-loader": "^0.23.0",
-    "del": "^2.2.0",
-    "gulp": "^3.9.0",
-    "gulp-changed": "^1.3.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-cssmin": "^0.1.0",
-    "gulp-htmlhint": "^0.3.0",
-    "gulp-if": "^2.0.0",
-    "gulp-load-plugins": "^1.2.0",
-    "gulp-order": "^1.1.0",
-    "gulp-pleeease": "^2.0.0",
-    "gulp-plumber": "^1.1.0",
-    "gulp-pug": "^3.0.0",
-    "gulp-rev-all": "^0.8.0",
-    "gulp-sass": "^2.3.0",
-    "gulp-slash": "^1.1.0",
-    "gulp-uglify": "^1.5.0",
-    "html-loader": "^0.4.0",
-    "node-sass": "^3.4.0",
-    "pug": "^2.0.0-beta5",
-    "pug-loader": "^2.3.0",
-    "run-sequence": "^1.2.0",
-    "sass-loader": "^4.0.0",
-    "style-loader": "^0.13.0",
-    "template-html-loader": "^0.0.3",
+    "babel-core": "~6.18.0",
+    "babel-loader": "~6.2.0",
+    "babel-plugin-transform-runtime": "~6.15.0",
+    "babel-preset-es2015": "~6.14.0",
+    "babel-runtime": "~6.18.0",
+    "browser-sync": "~2.17.0",
+    "css-loader": "~0.25.0",
+    "del": "~2.2.0",
+    "gulp": "~3.9.0",
+    "gulp-changed": "~1.3.0",
+    "gulp-concat": "~2.6.0",
+    "gulp-cssmin": "~0.1.0",
+    "gulp-htmlhint": "~0.3.0",
+    "gulp-if": "~2.0.0",
+    "gulp-load-plugins": "~1.2.0",
+    "gulp-order": "~1.1.0",
+    "gulp-pleeease": "~2.0.0",
+    "gulp-plumber": "~1.1.0",
+    "gulp-pug": "~3.0.0",
+    "gulp-rev-all": "~0.8.0",
+    "gulp-sass": "~2.3.0",
+    "gulp-slash": "~1.1.0",
+    "gulp-uglify": "~1.5.0",
+    "html-loader": "~0.4.0",
+    "node-sass": "~3.13.0",
+    "pug": "~2.0.0-beta6",
+    "pug-loader": "~2.3.0",
+    "run-sequence": "~1.2.0",
+    "sass-loader": "~4.0.0",
+    "style-loader": "~0.13.0",
+    "template-html-loader": "~0.0.3",
     "vinyl-named": "~1.1.0",
-    "vue-hot-reload-api": "^2.0.0",
-    "vue-loader": "^9.5.0",
-    "webpack": "^1.13.0",
-    "webpack-stream": "^3.2.0"
+    "vue-hot-reload-api": "~2.0.0",
+    "vue-loader": "~9.7.0",
+    "webpack": "~1.13.0",
+    "webpack-stream": "~3.2.0"
   }
 }
diff --git a/src/html/layouts/layout.pug b/src/html/layouts/layout.pug
@@ -5,6 +5,7 @@ html(lang="ja")
     meta(content="IE=edge,chrome=1" http-equiv="X-UA-Compatible")
     block title
       title アプリケーション
+    link(rel="stylesheet" href="/css/vendor.css")
     link(rel="stylesheet" href="/css/style.css")
     script(src="/js/vendor.bundle.js")
     block head-last

diff --git a/src/html/layouts/simple.pug b/src/html/layouts/simple.pug
@@ -5,6 +5,7 @@ html(lang="ja")
     meta(content="IE=edge,chrome=1" http-equiv="X-UA-Compatible")
     block title
       title アプリケーション
+    link(rel="stylesheet" href="/css/vendor.css")
     link(rel="stylesheet" href="/css/style.css")
     script(src="/js/vendor.bundle.js")
     block head-last

diff --git a/src/js/components/DatePicker.vue b/src/js/components/DatePicker.vue
@@ -32,16 +32,13 @@ Message(:field="field")
 
 <script lang="babel">
 import * as Lib from 'platform/plain'
-import moment from 'moment'
-import Vue from 'vue'
 import Message from 'components/Message.vue'
-import Flatpickr from 'flatpickr'
 // for localize
-Flatpickr.l10n.weekdays = {
+Flatpickr.l10ns.default.weekdays = {
   shorthand: ['日', '月', '火', '水', '木', '金', '土'],
   longhand: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日']
 }
-Flatpickr.l10n.months = {
+Flatpickr.l10ns.default.months = {
   shorthand: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
   longhand: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 }

diff --git a/src/js/components/InputText.vue b/src/js/components/InputText.vue
@@ -25,7 +25,6 @@ Message(:field="field")
 
 <script lang="babel">
 import * as Lib from 'platform/plain'
-import Vue from 'vue'
 import Message from 'components/Message.vue'
 export default {
   name: 'input-text',

diff --git a/src/js/components/Message.vue b/src/js/components/Message.vue
@@ -36,7 +36,6 @@ div
 
 <script lang="babel">
 import {Level, Event} from 'constants'
-import Vue from 'vue'
 export default {
   name: 'message',
   data() {

diff --git a/src/js/components/SelectBox.vue b/src/js/components/SelectBox.vue
@@ -20,7 +20,6 @@ Message(:field="field")
 
 <script lang="babel">
 import * as Lib from 'platform/plain'
-import Vue from 'vue'
 import Message from 'components/Message.vue'
 export default {
   name: 'select-box',

diff --git a/src/js/views/mixins/view-basic.js b/src/js/views/mixins/view-basic.js
@@ -1,7 +1,6 @@
 import Param from 'variables'
 import {Level, Event} from 'constants'
 import * as Lib from "platform/plain"
-import Vue from "vue"
 
 import Message from "components/Message.vue"
 import CommandButton from "components/CommandButton.vue"

diff --git a/src/js/views/mixins/view-crud.js b/src/js/views/mixins/view-crud.js
@@ -1,7 +1,6 @@
 import Param from 'variables'
 import {Level} from 'constants'
 import * as Lib from 'platform/plain'
-import Vue from 'vue'
 
 import ViewBasic from 'views/mixins/view-basic'
 

diff --git a/src/js/views/mixins/view-list.js b/src/js/views/mixins/view-list.js
@@ -1,7 +1,6 @@
 import Param from 'variables'
 import {Level} from 'constants'
 import * as Lib from 'platform/plain'
-import Vue from 'vue'
 
 import ViewBasic from 'views/mixins/view-basic'