Skip to content

Commit

Permalink
Merge branch 'release/0.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Feb 7, 2020
2 parents 43efb6c + 137b2db commit cd9306b
Show file tree
Hide file tree
Showing 8 changed files with 1,868 additions and 1,318 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/src/service-worker/dist/
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ module.exports = {
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-unused-vars': 'off',
},
parserOptions: {
parser: '@typescript-eslint/parser'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main
name: main

on:
push:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.6.3] - 2020-02-07
### Changed
- Update dependencies

## [0.6.2] - 2020-02-05
### Changed
- Update dependencies
Expand Down Expand Up @@ -237,7 +241,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
### Added
- First release

[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.2...HEAD
[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.3...HEAD
[0.6.3]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.2...v0.6.3
[0.6.2]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.1...v0.6.2
[0.6.1]: https://github.com/nwtgck/piping-ui-web/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/nwtgck/piping-ui-web/compare/v0.5.1...v0.6.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Piping UI
[![Netlify Status](https://api.netlify.com/api/v1/badges/7c9ee3e6-ade3-4032-bac0-3a3ed25ae3e6/deploy-status)](https://app.netlify.com/sites/piping-ui/deploys)
[![main](https://github.com/nwtgck/piping-ui-web/workflows/main/badge.svg)](https://github.com/nwtgck/piping-ui-web/actions?query=workflow%3Amain)
<a href="https://piping-ui.org"><img src="https://user-images.githubusercontent.com/9122190/28998409-c5bf7362-7a00-11e7-9b63-db56694522e7.png" alt="Launch now as Web App" height="48"></a>

Web UI for [Piping Server](https://github.com/nwtgck/piping-server) - Easy and secure file transfer between every device over HTTPS
Expand Down
3 changes: 0 additions & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@ module.exports = {
presets: [
'@vue/cli-plugin-babel/preset'
],
'plugins': [
'@babel/plugin-proposal-nullish-coalescing-operator'
]
}
3,128 changes: 1,836 additions & 1,292 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"name": "piping-ui",
"version": "0.6.2",
"version": "0.6.3",
"private": true,
"author": "Ryo Ota <nwtgck@nwtgck.org> (https://github.com/nwtgck)",
"scripts": {
"serve": "npm run generate-files && vue-cli-service serve",
"build": "npm run generate-files && vue-cli-service build",
"build-sw": "webpack --config src/service-worker/webpack.config.js src/service-worker/src/sw.ts",
"generate-files": "npm run generate-version && npm run generate-sitemap && npm run generate-robots-txt && npm run copy-openpgp && npm run build-sw",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint",
"build-sw": "webpack --config src/service-worker/webpack.config.js src/service-worker/src/sw.ts",
"copy-openpgp": "copyfiles --flat node_modules/openpgp/dist/*.min.js public/openpgp",
"generate-files": "npm run generate-version && npm run generate-sitemap && npm run generate-robots-txt && npm run copy-openpgp && npm run build-sw",
"generate-robots-txt": "ts-node --project scripts/tsconfig.json scripts/generate-robots-txt.tsx > public/robots.txt",
"generate-sitemap": "ts-node --project scripts/tsconfig.json scripts/generate-sitemap.tsx > public/sitemap.xml",
"generate-version": "cross-var echo \"export const VERSION = \\\"$npm_package_version\\\";\" > src/version.ts",
"postinstall": "license-checker --production --json > src/licenses.json",
"real-serve": "watch-build-serve -i=dist -i=.idea -i=./node_modules -i=.git -i=src/version.ts -i src/service-worker/dist -i public/openpgp -i src/licenses.json -i public/sitemap.xml -i public/robots.txt"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.26",
"@fortawesome/free-brands-svg-icons": "^5.12.0",
"@fortawesome/fontawesome-svg-core": "^1.2.27",
"@fortawesome/free-brands-svg-icons": "^5.12.1",
"@fortawesome/vue-fontawesome": "^0.1.9",
"@mattiasbuelens/web-streams-adapter": "0.1.0-alpha.3",
"binconv": "^0.2.0",
"clipboard": "^2.0.4",
"core-js": "^3.6.4",
"file-saver": "^2.0.2",
"file-type": "^14.0.0",
"filepond": "^4.9.5",
"file-type": "^14.1.1",
"filepond": "^4.10.0",
"jszip": "^3.2.2",
"jwk-thumbprint": "^0.1.2",
"linkifyjs": "^2.1.8",
Expand All @@ -43,11 +43,11 @@
"vue-class-component": "^7.2.2",
"vue-filepond": "^6.0.2",
"vue-property-decorator": "^8.4.0",
"vuetify": "^2.2.9"
"vuetify": "^2.2.11"
},
"devDependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
"@mdi/js": "^4.8.95",
"@mdi/js": "^4.9.95",
"@types/chai": "^4.2.8",
"@types/clipboard": "^2.0.1",
"@types/file-saver": "^2.0.1",
Expand All @@ -60,27 +60,29 @@
"@types/smoothscroll-polyfill": "^0.3.1",
"@types/url-join": "^4.0.0",
"@types/workbox-sw": "^4.3.0",
"@vue/cli-plugin-babel": "^4.1.2",
"@vue/cli-plugin-eslint": "^4.1.2",
"@vue/cli-plugin-pwa": "^4.1.2",
"@vue/cli-plugin-typescript": "^4.1.2",
"@vue/cli-plugin-unit-mocha": "^4.1.2",
"@vue/cli-service": "^4.1.2",
"@vue/eslint-config-typescript": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^2.18.0",
"@typescript-eslint/parser": "^2.18.0",
"@vue/cli-plugin-babel": "~4.2.2",
"@vue/cli-plugin-eslint": "~4.2.2",
"@vue/cli-plugin-pwa": "~4.2.2",
"@vue/cli-plugin-typescript": "~4.2.2",
"@vue/cli-plugin-unit-mocha": "~4.2.2",
"@vue/cli-service": "~4.2.2",
"@vue/eslint-config-typescript": "^5.0.1",
"@vue/test-utils": "^1.0.0-beta.31",
"babel-eslint": "^10.0.3",
"chai": "^4.2.0",
"copyfiles": "^2.2.0",
"cross-var": "^1.1.0",
"eslint": "^5.16.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.1.2",
"license-checker": "^25.0.1",
"material-design-icons-iconfont": "^5.0.1",
"react": "^16.12.0",
"sass": "^1.25.0",
"sass-loader": "^8.0.2",
"typescript": "^3.7.5",
"vue-cli-plugin-vuetify": "^2.0.3",
"typescript": "~3.7.5",
"vue-cli-plugin-vuetify": "^2.0.4",
"vue-template-compiler": "^2.6.11",
"vuetify-loader": "^1.4.3",
"watch-build-serve": "github:nwtgck/watch-build-serve-node#afc757410b3339e1603916ab98b8e5760569dbaa",
Expand Down

0 comments on commit cd9306b

Please sign in to comment.