From e97586b9db2d5e153895ed310fd61803e75b525f Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Sat, 4 Apr 2020 21:53:48 +0900 Subject: [PATCH 01/22] =?UTF-8?q?Single=20File=20Components=20-=20?= =?UTF-8?q?=E9=96=A2=E5=BF=83=E3=81=AE=E5=88=86=E9=9B=A2=20-=20Sass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Atom/BaseLinkButton/index.sass | 33 +++++++++++ src/components/Atom/BaseLinkButton/index.vue | 36 +----------- src/components/Atom/BaseLinkText/index.sass | 34 +++++++++++ src/components/Atom/BaseLinkText/index.vue | 37 +----------- src/components/Atom/BaseNuxtLink/index.sass | 34 +++++++++++ src/components/Atom/BaseNuxtLink/index.vue | 37 +----------- src/components/Atom/BaseTime/index.sass | 16 ++++++ src/components/Atom/BaseTime/index.vue | 19 +------ .../Atom/SecondsIndicator/index.sass | 39 +++++++++++++ .../Atom/SecondsIndicator/index.vue | 42 +------------- src/components/Atom/Typography/index.sass | 29 ++++++++++ src/components/Atom/Typography/index.vue | 32 +---------- src/components/Atom/VueToNuxtLogo/index.sass | 54 ++++++++++++++++++ src/components/Atom/VueToNuxtLogo/index.vue | 57 +------------------ src/components/Molecule/BaseFooter/index.sass | 40 +++++++++++++ src/components/Molecule/BaseFooter/index.vue | 43 +------------- .../Molecule/LinkButtonWithIcon/index.sass | 2 + .../Molecule/LinkButtonWithIcon/index.vue | 5 +- .../Molecule/LinkTextWithIcon/index.sass | 2 + .../Molecule/LinkTextWithIcon/index.vue | 5 +- .../Organism/BindNavigation/index.sass | 16 ++++++ .../Organism/BindNavigation/index.vue | 19 +------ src/components/Template/BaseLayout/index.sass | 23 ++++++++ .../{BaseLayout.vue => BaseLayout/index.vue} | 26 +-------- .../{OtherPage.vue => OtherPage/index.vue} | 2 +- src/pages/index.vue | 2 +- 26 files changed, 336 insertions(+), 348 deletions(-) create mode 100644 src/components/Atom/BaseLinkButton/index.sass create mode 100644 src/components/Atom/BaseLinkText/index.sass create mode 100644 src/components/Atom/BaseNuxtLink/index.sass create mode 100644 src/components/Atom/BaseTime/index.sass create mode 100644 src/components/Atom/SecondsIndicator/index.sass create mode 100644 src/components/Atom/Typography/index.sass create mode 100644 src/components/Atom/VueToNuxtLogo/index.sass create mode 100644 src/components/Molecule/BaseFooter/index.sass create mode 100644 src/components/Molecule/LinkButtonWithIcon/index.sass create mode 100644 src/components/Molecule/LinkTextWithIcon/index.sass create mode 100644 src/components/Organism/BindNavigation/index.sass create mode 100644 src/components/Template/BaseLayout/index.sass rename src/components/Template/{BaseLayout.vue => BaseLayout/index.vue} (53%) rename src/pages/{OtherPage.vue => OtherPage/index.vue} (82%) diff --git a/src/components/Atom/BaseLinkButton/index.sass b/src/components/Atom/BaseLinkButton/index.sass new file mode 100644 index 00000000..7d2d1a1b --- /dev/null +++ b/src/components/Atom/BaseLinkButton/index.sass @@ -0,0 +1,33 @@ +@mixin _structure() + min-height: pix2rem(48) + min-width: pix2rem(160) + padding: pix2rem(8) pix2rem(16) + max-width: 90vw + display: inline-flex + align-items: center + justify-content: center + line-height: 1.2 + +@mixin _skin($_color) + border-radius: pix2rem(4) + border: 1px solid $_color + color: $_color + text-decoration: none + &:hover + color: white + background-color: $_color + // Extra + white-space: pre-line + word-wrap: break-word + overflow-wrap: break-word + +@mixin _button($_color) + @include _structure() + @include _skin($_color) + +// Style Instance =============== +.buttonGreen + @include _button(#3b8070) + +.buttonGrey + @include _button(#35495e) diff --git a/src/components/Atom/BaseLinkButton/index.vue b/src/components/Atom/BaseLinkButton/index.vue index 48cd051b..24e48a76 100644 --- a/src/components/Atom/BaseLinkButton/index.vue +++ b/src/components/Atom/BaseLinkButton/index.vue @@ -38,38 +38,4 @@ export default { } - + + + + + + + + + + + + From 3bd4fdac66ec4d30b977c17e308b31303dfd1397 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Thu, 9 Apr 2020 11:03:04 +0900 Subject: [PATCH 03/22] Update index.js --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 45533c3b..abd1a00b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -17,7 +17,7 @@ export const state = () => ({ }, sitemap: [ { - name: 'HOME', + name: 'TOP', path: '/', }, { From 5532c8ca8551bb2411b57bc87c8c8bfc2c393896 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 16:28:37 +0900 Subject: [PATCH 04/22] Update nuxt.config.js --- nuxt.config.js | 46 ++++------------------------------------------ 1 file changed, 4 insertions(+), 42 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index fc9a8748..2666476e 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -1,29 +1,19 @@ import Sass from 'sass' import Fiber from 'fibers' -const baseDir = process.env.BASE_DIR || '/' - -// DEPLOY_ENV が GH_PAGES の場合のみ router.base = '//' を追加する -// SEE: https://ja.nuxtjs.org/api/configuration-router/ -// SEE: https://ja.nuxtjs.org/faq/github-pages/ -// SEE: https://nuxtjs.org/api/configuration-builddir const routerBase = process.env.BASE_DIR ? { router: { - base: baseDir, + base: process.env.BASE_DIR, }, generate: { - fallback: true, // '404.html' を使用したい場合 + fallback: true, dir: 'public', }, } : {} export default { - mode: 'universal', - /* - ** Headers of the page - */ head: { title: process.env.npm_package_name || '', meta: [ @@ -37,7 +27,7 @@ export default { }, ], link: [ - { rel: 'icon', type: 'image/x-icon', href: `${baseDir}favicon.ico` }, + { rel: 'icon', type: 'image/x-icon', href: `${process.env.BASE_DIR || '/'}favicon.ico` }, { rel: 'stylesheet', href: @@ -45,28 +35,13 @@ export default { }, ], }, - /* - ** Customize the progress-bar color - */ loading: { color: '#ddd' }, - /* - ** Global CSS - */ css: ['@/assets/style/main.sass'], - /* - ** Plugins to load before mounting the App - */ plugins: [], - /* - ** Nuxt.js dev-modules - */ buildModules: [ // Doc: https://github.com/nuxt-community/eslint-module '@nuxtjs/eslint-module', ], - /* - ** Nuxt.js modules - */ modules: [ // Doc: https://axios.nuxtjs.org/usage '@nuxtjs/axios', @@ -75,10 +50,6 @@ export default { styleResources: { sass: ['./assets/style/_chunk.sass'], }, - /* - ** Axios module configuration - ** See https://axios.nuxtjs.org/options - */ axios: {}, vue: { config: { @@ -86,25 +57,16 @@ export default { devtools: true, }, }, - /* - ** Serve configuration - */ server: { port: 4000, // default: 3000 host: 'localhost', // default: localhost }, /** - * configuration-srcdir + * configuration-srcDir * DOC: https://ja.nuxtjs.org/api/configuration-srcdir/#__layout */ srcDir: 'src/', - /* - ** Build configuration - */ build: { - /* - ** You can extend webpack config here - */ babel: { presets({ isServer }) { return [ From a80133604ac196932de449589f7085c6d23c4e01 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 16:36:33 +0900 Subject: [PATCH 05/22] Fix lint --- nuxt.config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nuxt.config.js b/nuxt.config.js index 2666476e..ac12eeb3 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -27,7 +27,11 @@ export default { }, ], link: [ - { rel: 'icon', type: 'image/x-icon', href: `${process.env.BASE_DIR || '/'}favicon.ico` }, + { + rel: 'icon', + type: 'image/x-icon', + href: `${process.env.BASE_DIR || '/'}favicon.ico`, + }, { rel: 'stylesheet', href: From ec8bc06665544a5f30ac81dc27a510ef2dcea562 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 16:37:49 +0900 Subject: [PATCH 06/22] update run-task --- README.md | 4 +++- package.json | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f9d7504..3ce8e319 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,8 @@ $ yarn generate:gh-pages ## References - [Nuxt.js docs](https://ja.nuxtjs.org/) -- [Vue.js Lifecycle Diagram](https://jp.vuejs.org/v2/guide/instance.html#ライフサイクルダイアグラム) +- [Vue.js life cycle Diagram](https://jp.vuejs.org/v2/guide/instance.html#ライフサイクルダイアグラム) - [Sass: sass:math](https://sass-lang.com/documentation/modules/math) - [Pug](https://pugjs.org/api/getting-started.html) +- [Nuxt TypeScript docs](https://typescript.nuxtjs.org/ja/). +- [Nuxt Community TypeScript Template](https://github.com/nuxt-community/typescript-template). diff --git a/package.json b/package.json index 9e562c04..e979b8b3 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,9 @@ "generate:gh-pages": "cross-env BASE_DIR=/NuxtBoilerplate/ nuxt generate", "generate": "nuxt generate", "lint": "eslint --ext .js,.vue .", + "lint:fix": "yarn lint --fix", "clean:generate": "yarn clean docs", - "clean": "rimraf .nuxt dist .out", + "clean": "rimraf .nuxt dist .out public", "test": "jest", "prestorybook": "yarn clean", "storybook": "start-storybook -c ./src/.storybook -p 6006", From 0f6f58e2e059434d3a7820aee25952a94b7a1a9d Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 16:48:40 +0900 Subject: [PATCH 07/22] add -D husky lint-staged https://github.com/typicode/husky --- package.json | 32 ++++-- yarn.lock | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 303 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index e979b8b3..53b949c8 100644 --- a/package.json +++ b/package.json @@ -5,23 +5,36 @@ "author": "Tomonari Takai", "private": true, "scripts": { - "predev": "yarn clean", "dev": "nuxt", "build": "nuxt build", "start": "nuxt start", - "pregenerate:gh-pages": "yarn clean:generate", - "generate:gh-pages": "cross-env BASE_DIR=/NuxtBoilerplate/ nuxt generate", "generate": "nuxt generate", + "generate:gh-pages": "cross-env BASE_DIR=/NuxtBoilerplate/ nuxt generate", "lint": "eslint --ext .js,.vue .", "lint:fix": "yarn lint --fix", - "clean:generate": "yarn clean docs", "clean": "rimraf .nuxt dist .out public", "test": "jest", - "prestorybook": "yarn clean", "storybook": "start-storybook -c ./src/.storybook -p 6006", "storybook:debug": "yarn storybook --debug-webpack", "build-storybook": "build-storybook -c ./src/.storybook -o .out" }, + "lint-staged": { + "*.{js,vue}": "eslint --fix" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged", + "post-merge": "yarn clean && yarn install", + "post-checkout": "yarn clean && yarn install", + "post-rebase": "yarn clean && yarn install", + "pre-auto-gc": "yarn clean" + } + }, + "browserslist": [ + "defaults", + "not < 1%", + "IE 11" + ], "dependencies": { "@nuxtjs/axios": "5.9.7", "@nuxtjs/style-resources": "1.0.0", @@ -52,7 +65,9 @@ "eslint-plugin-nuxt": "0.5.2", "eslint-plugin-prettier": "3.1.3", "fibers": "4.0.2", + "husky": "^4.2.5", "jest": "25.3.0", + "lint-staged": "^10.1.7", "node-sass": "4.13.1", "prettier": "2.0.4", "pug": "2.0.4", @@ -62,10 +77,5 @@ "sass-loader": "8.0.2", "sass-resources-loader": "2.0.3", "vue-jest": "4.0.0-beta.2" - }, - "browserslist": [ - "defaults", - "not < 1%", - "IE 11" - ] + } } diff --git a/yarn.lock b/yarn.lock index ccdc2a66..e36899fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1757,6 +1757,13 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" +"@samverschueren/stream-to-observable@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" + integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== + dependencies: + any-observable "^0.3.0" + "@sinonjs/commons@^1.7.0": version "1.7.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1" @@ -2807,7 +2814,7 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-escapes@^3.2.0: +ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== @@ -2871,6 +2878,11 @@ ansi-to-html@^0.6.11: dependencies: entities "^1.1.2" +any-observable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" + integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -4058,7 +4070,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4. escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -4077,6 +4089,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + character-entities-legacy@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" @@ -4234,7 +4254,7 @@ cli-boxes@^2.2.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d" integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w== -cli-cursor@^2.1.0: +cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= @@ -4258,6 +4278,14 @@ cli-table3@0.5.1: optionalDependencies: colors "^1.1.2" +cli-truncate@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= + dependencies: + slice-ansi "0.0.4" + string-width "^1.0.1" + cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -4412,6 +4440,11 @@ commander@^4.0.1, commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.0.0.tgz#dbf1909b49e5044f8fdaf0adc809f0c0722bdfd0" + integrity sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -4422,6 +4455,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-versions@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -5040,6 +5078,11 @@ data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" +date-fns@^1.27.2: + version "1.30.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" + integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== + de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" @@ -5083,6 +5126,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + deep-equal@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" @@ -5447,6 +5495,11 @@ electron-to-chromium@^1.3.390: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.393.tgz#d13fa4cbf5065e18451c84465d22aef6aca9a911" integrity sha512-Ko3/VdhZAaMaJBLBFqEJ+M1qMiBI8sJfPY/hSJvDrkB3Do8LJsL9tmXy4w7o9nPXif/jFaZGSlXTQWU8XVsYtg== +elegant-spinner@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= + element-resize-detector@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1" @@ -6000,6 +6053,21 @@ execa@^3.2.0, execa@^3.4.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf" + integrity sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -6220,6 +6288,14 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== +figures@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + dependencies: + escape-string-regexp "^1.0.5" + object-assign "^4.1.0" + figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -6364,6 +6440,13 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-versions@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" + integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww== + dependencies: + semver-regex "^2.0.0" + flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -6615,6 +6698,11 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -7177,6 +7265,22 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +husky@^4.2.5: + version "4.2.5" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36" + integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ== + dependencies: + chalk "^4.0.0" + ci-info "^2.0.0" + compare-versions "^3.6.0" + cosmiconfig "^6.0.0" + find-versions "^3.2.0" + opencollective-postinstall "^2.0.2" + pkg-dir "^4.2.0" + please-upgrade-node "^3.2.0" + slash "^3.0.0" + which-pm-runs "^1.0.0" + hyphenate-style-name@^1.0.1, hyphenate-style-name@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48" @@ -7293,6 +7397,11 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" +indent-string@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= + indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" @@ -7710,7 +7819,7 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-obj@^1.0.0: +is-obj@^1.0.0, is-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= @@ -7720,6 +7829,13 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA= +is-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" + integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== + dependencies: + symbol-observable "^1.1.0" + is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -7758,6 +7874,11 @@ is-regex@^1.0.5: dependencies: has "^1.0.3" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -8584,6 +8705,69 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +lint-staged@^10.1.7: + version "10.1.7" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.7.tgz#b628f8b010083fe4e116d0af7949a32f1ea6b3a7" + integrity sha512-ZkK8t9Ep/AHuJQKV95izSa+DqotftGnSsNeEmCSqbQ6j4C4H0jDYhEZqVOGD1Q2Oe227igbqjMWycWyYbQtpoA== + dependencies: + chalk "^4.0.0" + commander "^5.0.0" + cosmiconfig "^6.0.0" + debug "^4.1.1" + dedent "^0.7.0" + execa "^4.0.0" + listr "^0.14.3" + log-symbols "^3.0.0" + micromatch "^4.0.2" + normalize-path "^3.0.0" + please-upgrade-node "^3.2.0" + string-argv "0.3.1" + stringify-object "^3.3.0" + +listr-silent-renderer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= + +listr-update-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" + integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== + dependencies: + chalk "^1.1.3" + cli-truncate "^0.2.1" + elegant-spinner "^1.0.1" + figures "^1.7.0" + indent-string "^3.0.0" + log-symbols "^1.0.2" + log-update "^2.3.0" + strip-ansi "^3.0.1" + +listr-verbose-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" + integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== + dependencies: + chalk "^2.4.1" + cli-cursor "^2.1.0" + date-fns "^1.27.2" + figures "^2.0.0" + +listr@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" + integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== + dependencies: + "@samverschueren/stream-to-observable" "^0.3.0" + is-observable "^1.1.0" + is-promise "^2.1.0" + is-stream "^1.1.0" + listr-silent-renderer "^1.1.1" + listr-update-renderer "^0.5.0" + listr-verbose-renderer "^0.5.0" + p-map "^2.0.0" + rxjs "^6.3.3" + load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -8774,6 +8958,29 @@ lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= + dependencies: + chalk "^1.0.0" + +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== + dependencies: + chalk "^2.4.2" + +log-update@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= + dependencies: + ansi-escapes "^3.0.0" + cli-cursor "^2.0.0" + wrap-ansi "^3.0.1" + lolex@^5.0.0: version "5.1.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" @@ -9736,6 +9943,11 @@ open@^7.0.0: is-docker "^2.0.0" is-wsl "^2.1.1" +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + opener@1.5.1, opener@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" @@ -9855,6 +10067,11 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-map@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + p-map@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" @@ -10162,6 +10379,13 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -12042,6 +12266,13 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" +rxjs@^6.3.3: + version "6.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" + integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== + dependencies: + tslib "^1.9.0" + rxjs@^6.4.0: version "6.5.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" @@ -12215,6 +12446,16 @@ select@^1.1.2: resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" + integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== + "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -12460,6 +12701,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slice-ansi@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= + slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -12748,6 +12994,11 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= +string-argv@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + string-length@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" @@ -12883,6 +13134,15 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-object@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + strip-ansi@5.2.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" @@ -13045,6 +13305,11 @@ svgo@^1.0.0: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-observable@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -14121,6 +14386,11 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + which@1, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -14194,6 +14464,14 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + wrap-ansi@^6.0.0, wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" From a7cad4348604eccedf23ddca3ea0bcdacd65a63d Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 16:54:34 +0900 Subject: [PATCH 08/22] Change from modern-css-reset to destyle.css. --- package.json | 2 +- src/assets/style/main.sass | 2 +- yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 53b949c8..ba86c4c7 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@nuxtjs/axios": "5.9.7", "@nuxtjs/style-resources": "1.0.0", "core-js": "3.6.5", - "modern-css-reset": "1.1.0", + "destyle.css": "^1.0.11", "nuxt": "2.12.2", "vue-feather-icons": "5.0.0", "vue-styled-components": "1.4.14" diff --git a/src/assets/style/main.sass b/src/assets/style/main.sass index f28b68fd..20b62011 100644 --- a/src/assets/style/main.sass +++ b/src/assets/style/main.sass @@ -2,7 +2,7 @@ // fileName = main.sass // Library ===================================== -@import 'modern-css-reset' +@import 'destyle.css' @import url('https://fonts.googleapis.com/css?family=Gelasio:500|Roboto:400,700&display=swap&subset=latin-ext') // Original Chunk ============================== diff --git a/yarn.lock b/yarn.lock index e36899fc..96136254 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5230,6 +5230,11 @@ destroy@^1.0.4, destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +destyle.css@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/destyle.css/-/destyle.css-1.0.11.tgz#46391a267a641c7a5cef8dfe766784982f52c557" + integrity sha512-BmI0mIqho8BQpdhylMTK0wkfeHs+z7J9U/Cri8Cf0W8odyLiuFUIXo3vlArEjUzIDKrVjQZz1xvXu8M2Nvfy2g== + detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -9399,11 +9404,6 @@ mkdirp@^0.5.3: dependencies: minimist "^1.2.5" -modern-css-reset@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/modern-css-reset/-/modern-css-reset-1.1.0.tgz#91be70bcf6b2aefed0d16e8a439ef174a5f7459a" - integrity sha512-JOsOWxyDiZJWhvvx0LVtY9l4MT/1tlDevBkmPbGFEvxTLGVwCOJ/f0ZoT9moTdMsrqZeShJOX/bTaUfI4WfFQw== - move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" From 77d0b51f156631898645adfb955e5abe2f10a19f Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 17:20:00 +0900 Subject: [PATCH 09/22] fix import path --- src/assets/style/main.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/style/main.sass b/src/assets/style/main.sass index 20b62011..dd3849f9 100644 --- a/src/assets/style/main.sass +++ b/src/assets/style/main.sass @@ -2,7 +2,7 @@ // fileName = main.sass // Library ===================================== -@import 'destyle.css' +@import 'destyle.css/destyle' @import url('https://fonts.googleapis.com/css?family=Gelasio:500|Roboto:400,700&display=swap&subset=latin-ext') // Original Chunk ============================== From 62f5001d26ec14c33a32048ae899825843a2cda6 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 17:55:00 +0900 Subject: [PATCH 10/22] [Separation of Concerns] pages --- src/pages/OtherPage/index.js | 10 ++++++++++ src/pages/OtherPage/index.vue | 14 +------------- src/pages/index.js | 12 ++++++++++++ src/pages/index.sass | 2 ++ src/pages/index.vue | 22 ++-------------------- 5 files changed, 27 insertions(+), 33 deletions(-) create mode 100644 src/pages/OtherPage/index.js create mode 100644 src/pages/index.js create mode 100644 src/pages/index.sass diff --git a/src/pages/OtherPage/index.js b/src/pages/OtherPage/index.js new file mode 100644 index 00000000..287a49b1 --- /dev/null +++ b/src/pages/OtherPage/index.js @@ -0,0 +1,10 @@ +import BaseLayout from '@/components/Template/BaseLayout/index.vue' +import Typography from '@/components/Atom/Typography/index.vue' + +export default { + name: 'OtherPage', + components: { + BaseLayout, + Typography, + }, +} diff --git a/src/pages/OtherPage/index.vue b/src/pages/OtherPage/index.vue index d32f508a..17874ba4 100644 --- a/src/pages/OtherPage/index.vue +++ b/src/pages/OtherPage/index.vue @@ -1,19 +1,7 @@ + - - diff --git a/src/pages/index.js b/src/pages/index.js new file mode 100644 index 00000000..05905c3d --- /dev/null +++ b/src/pages/index.js @@ -0,0 +1,12 @@ +import BaseLayout from '@/components/Template/BaseLayout/index.vue' +import VueToNuxtLogo from '@/components/Atom/VueToNuxtLogo/index.vue' +import Typography from '@/components/Atom/Typography/index.vue' + +export default { + name: 'PageIndex', + components: { + BaseLayout, + VueToNuxtLogo, + Typography, + }, +} diff --git a/src/pages/index.sass b/src/pages/index.sass new file mode 100644 index 00000000..5c8815cf --- /dev/null +++ b/src/pages/index.sass @@ -0,0 +1,2 @@ +.logo + margin: 0 auto diff --git a/src/pages/index.vue b/src/pages/index.vue index 742a7c76..bddcafe8 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,3 +1,5 @@ + + - - - - From c5925c019af0183e73b3d3549c723e0d43b74486 Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 17:59:24 +0900 Subject: [PATCH 11/22] [Separation of Concerns] layouts --- src/layouts/default.js | 60 ++++++++++++++++++++++ src/layouts/default.sass | 40 +++++++++++++++ src/layouts/default.vue | 108 +-------------------------------------- 3 files changed, 102 insertions(+), 106 deletions(-) create mode 100644 src/layouts/default.js create mode 100644 src/layouts/default.sass diff --git a/src/layouts/default.js b/src/layouts/default.js new file mode 100644 index 00000000..16b53220 --- /dev/null +++ b/src/layouts/default.js @@ -0,0 +1,60 @@ +import { mapActions, mapState } from 'vuex' + +export default { + name: 'LayoutDefault', + data() { + return { + localFlagIsMobile: true, + localFlagIsDesktop: false, + } + }, + computed: { + ...mapState(['isMobile', 'isTablet', 'isDesktop']), + classNameObject() { + return { + [this.$style.root]: true, + [this.$style.isMobile]: this.isMobile, + [this.$style.isTablet]: this.isTablet, + [this.$style.isDesktop]: this.isDesktop, + } + }, + }, + mounted() { + this.$nextTick(() => { + const mqlMobile = window.matchMedia(this.$style.mqlMobile) + const mqlDesktop = window.matchMedia(this.$style.mqlDesktop) + this.matchMobile(mqlMobile) + this.matchDesktop(mqlDesktop) + mqlMobile.addListener(this.matchMobile) + mqlDesktop.addListener(this.matchDesktop) + }) + }, + // TODO: Check performance addListener + // destroyed() {}, + methods: { + ...mapActions(['setFlagMobile', 'setFlagTablet', 'setFlagDesktop']), + matchMobile(mql) { + if (mql.matches) { + this.setFlagMobile() + this.localFlagIsMobile = true + } else { + this.localFlagIsMobile = false + this.checkTablet() + } + }, + matchDesktop(mql) { + if (mql.matches) { + this.setFlagDesktop() + this.localFlagIsDesktop = true + } else { + this.localFlagIsDesktop = false + this.checkTablet() + } + }, + checkTablet() { + if (!this.localFlagIsDesktop && !this.localFlagIsMobile) { + this.setFlagTablet() + } + }, + }, +} diff --git a/src/layouts/default.sass b/src/layouts/default.sass new file mode 100644 index 00000000..f14c6c87 --- /dev/null +++ b/src/layouts/default.sass @@ -0,0 +1,40 @@ +// String from Sass to JS +@value mqlMobile: #{$mql-mobile} +@value mqlDesktop: #{$mql-desktop} + +.root + background-color: colors('background') + +@mixin _flashAnimation + $_inCubic: cubic-bezier(0.55, 0.06, 0.68, 0.19) + animation-duration: 1.5s !important + animation-timing-function: $_inCubic !important + animation-delay: 0s !important + animation-iteration-count: 1 !important + animation-direction: reverse !important + animation-fill-mode: none !important + animation-play-state: running !important + +@keyframes flashA + 0% + background-color: colors('background') + 100% + background-color: burlywood + +@keyframes flashB + 0% + background-color: colors('background') + 100% + background-color: burlywood + +.isDesktop + @include _flashAnimation + animation-name: flashA !important + +.isTablet + @include _flashAnimation + animation-name: flashB !important + +.isMobile + @include _flashAnimation + animation-name: flashA !important diff --git a/src/layouts/default.vue b/src/layouts/default.vue index a287726a..4b8d57f8 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,110 +1,6 @@ + + - - - - From f1637126c1180c233d2999424c51bbb5e5de3dbd Mon Sep 17 00:00:00 2001 From: Tomonari Takai Date: Wed, 22 Apr 2020 23:33:01 +0900 Subject: [PATCH 12/22] delete seconds indicator --- .../Atom/SecondsIndicator/index.sass | 39 --------------- .../Atom/SecondsIndicator/index.story.js | 23 --------- .../Atom/SecondsIndicator/index.vue | 50 ------------------- 3 files changed, 112 deletions(-) delete mode 100644 src/components/Atom/SecondsIndicator/index.sass delete mode 100644 src/components/Atom/SecondsIndicator/index.story.js delete mode 100644 src/components/Atom/SecondsIndicator/index.vue diff --git a/src/components/Atom/SecondsIndicator/index.sass b/src/components/Atom/SecondsIndicator/index.sass deleted file mode 100644 index d4b42354..00000000 --- a/src/components/Atom/SecondsIndicator/index.sass +++ /dev/null @@ -1,39 +0,0 @@ -$_bgColor: #E3F4F2 -$_fillColor: #CDF2E9 - -@mixin _childElement() - position: absolute - width: 50% - height: 100% - top: 0 - -.secondsIndicator - width: 100vw - height: 100vh - overflow: hidden - position: relative - - .fillWrapper - position: absolute - width: 300% - height: 300% - background-color: $_bgColor - top: -100% - left: -100% - &.isAnimate - transition: transform 0.9s cubic-bezier(0.65, 0.05, 0.36, 1) - - .fillWite - @include _childElement() - left: 0 - background-color: $_fillColor - - .maskLeft - @include _childElement() - left: 0 - background-color: $_bgColor - - .maskRight - @include _childElement() - right: 0 - background-color: $_fillColor diff --git a/src/components/Atom/SecondsIndicator/index.story.js b/src/components/Atom/SecondsIndicator/index.story.js deleted file mode 100644 index 05981bce..00000000 --- a/src/components/Atom/SecondsIndicator/index.story.js +++ /dev/null @@ -1,23 +0,0 @@ -import { storiesOf } from '@storybook/vue' -import { withKnobs, number } from '@storybook/addon-knobs' -import SecondsIndicator from './index.vue' - -const stories = storiesOf('Design System|Atom/SecondsIndicator', module) - -stories.addDecorator(withKnobs) - -stories.add('normal', () => ({ - components: { - SecondsIndicator, - }, - props: { - seconds: { - type: Number, - default: number('seconds', 30), - }, - }, - template: ` -
- -
`, -})) diff --git a/src/components/Atom/SecondsIndicator/index.vue b/src/components/Atom/SecondsIndicator/index.vue deleted file mode 100644 index fd3eebe7..00000000 --- a/src/components/Atom/SecondsIndicator/index.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +