Skip to content

Commit

Permalink
Vue.js 2.3 to 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jkazama committed Mar 8, 2018
1 parent 0bd3c0e commit e16708e
Show file tree
Hide file tree
Showing 7 changed files with 1,763 additions and 861 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"presets": ["es2015"],
"presets": ["env"],
"plugins": [
["transform-runtime", {"polyfill": true, "regenerator": true}]
]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 jkazama
Copyright (c) 2016-2018 jkazama

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ src

| ライブラリ | バージョン | 用途/追加理由 |
| ------------------------- | -------- | ------------- |
| `vue` | 2.3.+ | アプリケーションの MVVM 機能を提供 |
| `jquery` | 3.2.+ | DOM 操作サポート |
| `vue` | 2.5.+ | アプリケーションの MVVM 機能を提供 |
| `jquery` | 3.3.+ | DOM 操作サポート |
| `lodash` | 4.17.+ | 汎用ユーティリティライブラリ |
| `moment` | 2.18.+ | 日時ライブラリ |
| `moment` | 2.20.+ | 日時ライブラリ |
| `bootstrap-sass-official` | 3.3.+ | CSS フレームワーク |
| `fontawesome` | 4.7.+ | フォントアイコンライブラリ |

Expand Down
5 changes: 4 additions & 1 deletion gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ gulp.task('revision', (callback) =>
gulp.task('build:webpack', () => {
process.env.NODE_ENV = (production == true) ? 'production' : 'development'
let plugins = [new webpack.DefinePlugin({'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)})]
if (production) plugins.push(new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }}))
if (production) {
plugins.push(new webpack.optimize.UglifyJsPlugin({ compress: { warnings: false  } }))
plugins.push(new webpack.optimize.ModuleConcatenationPlugin())
}
return gulp.src([resource.src.webpack.babel])
.pipe(named())
.pipe($.plumber())
Expand Down
46 changes: 21 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sample-ui-vue-pages",
"version": "1.2.0",
"version": "1.3.0",
"description": "Vue.js Boilerplate [Multi Page]",
"main": "src/js/common.js",
"scripts": {
Expand All @@ -16,51 +16,47 @@
"dependencies": {
"bootstrap-sass": "~3.3.0",
"co": "~4.6.0",
"flatpickr": "~2.6.0",
"flatpickr": "~4.3.0",
"font-awesome": "~4.7.0",
"jquery": "~3.2.0",
"jquery": "~3.3.0",
"lodash": "~4.17.0",
"moment": "~2.18.0",
"superagent": "~3.5.0",
"vue": "~2.3.0"
"moment": "~2.20.0",
"superagent": "~3.8.0",
"vue": "~2.5.0"
},
"devDependencies": {
"babel-core": "~6.24.0",
"babel-loader": "~7.0.0",
"babel-loader": "~7.1.0",
"babel-plugin-transform-runtime": "~6.23.0",
"babel-preset-es2015": "~6.24.0",
"babel-runtime": "~6.23.0",
"browser-sync": "~2.18.0",
"babel-preset-env": "~1.6.0",
"babel-runtime": "~6.26.0",
"browser-sync": "~2.23.0",
"css-loader": "~0.28.0",
"del": "~2.2.0",
"del": "~3.0.0",
"gulp": "~3.9.0",
"gulp-changed": "~3.1.0",
"gulp-concat": "~2.6.0",
"gulp-cssmin": "~0.2.0",
"gulp-htmlhint": "~0.3.0",
"gulp-if": "~2.0.0",
"gulp-load-plugins": "~1.5.0",
"gulp-order": "~1.1.0",
"gulp-pleeease": "~2.0.0",
"gulp-plumber": "~1.1.0",
"gulp-pug": "~3.3.0",
"gulp-rev-all": "~0.9.0",
"gulp-sass": "~3.1.0",
"gulp-slash": "~1.1.0",
"gulp-uglify": "~3.0.0",
"html-loader": "~0.4.0",
"node-sass": "~4.5.0",
"pug": "~2.0.0-rc.1",
"html-loader": "~0.5.0",
"node-sass": "~4.7.0",
"pug": "~2.0.0-rc.4",
"pug-loader": "~2.3.0",
"run-sequence": "~1.2.0",
"run-sequence": "~2.2.0",
"sass-loader": "~6.0.0",
"template-html-loader": "~1.0.0",
"vinyl-named": "~1.1.0",
"vue-hot-reload-api": "~2.1.0",
"vue-loader": "~12.1.0",
"vue-style-loader": "~3.0.0",
"vue-template-compiler": "~2.3.0",
"webpack": "~2.6.0",
"webpack-stream": "~3.2.0"
"vue-hot-reload-api": "~2.3.0",
"vue-loader": "~14.1.0",
"vue-style-loader": "~4.0.0",
"vue-template-compiler": "~2.5.0",
"webpack": "~3.11.0",
"webpack-stream": "~4.0.0"
}
}
6 changes: 3 additions & 3 deletions src/js/components/DatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ Message(:field="field")
import * as Lib from 'platform/plain'
import Message from 'components/Message.vue'
// for localize
Flatpickr.l10ns.default.weekdays = {
flatpickr.l10ns.default.weekdays = {
shorthand: ['', '', '', '', '', '', ''],
longhand: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日']
}
Flatpickr.l10ns.default.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月']
}
Expand Down Expand Up @@ -84,7 +84,7 @@ export default {
this.updateValue(v)
},
}, this.config)
this.datepicker = new Flatpickr(this.$el.querySelector("input"), config)
this.datepicker = new flatpickr(this.$el.querySelector("input"), config)
}
},
beforeDestroy () {
Expand Down
Loading

0 comments on commit e16708e

Please sign in to comment.