From 16f142446eb7ca3d6690a841071d4106fa86c134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 26 Jul 2017 14:32:01 +0900 Subject: [PATCH 01/34] =?UTF-8?q?add:=20eslint=E3=81=ABeslint-plugin-filen?= =?UTF-8?q?ames=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 3 +++ package.json | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index c7a017f..a2dce15 100644 --- a/.eslintrc +++ b/.eslintrc @@ -7,6 +7,9 @@ "parserOptions": { "sourceType": "module" }, + "plugins": [ + "filenames" + ], "rules": { "comma-dangle": [1, "never"], "no-console": 1, diff --git a/package.json b/package.json index 78134fb..e6fb342 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "version": "5.0.0", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, - "devDependencies": {}, + "devDependencies": { + "eslint-plugin-filenames": "^1.2.0" + }, "scripts": { "start": "frp build && frp serve -t", "test": "frp task test", From 7d1e1fd11b1852d6e8844e479200046a41f26b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 26 Jul 2017 14:37:34 +0900 Subject: [PATCH 02/34] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=8C=E6=BC=8F=E3=82=8C=E3=81=A6=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index a2dce15..24f1cc3 100644 --- a/.eslintrc +++ b/.eslintrc @@ -39,7 +39,9 @@ "comma-spacing": 0, "prefer-const": 0, "no-undef": 0, - "curly": 0 + "curly": 0, + "filenames/match-regex": [2, "^[a-z\\-]+$"], + "filenames/match-exported": [2, "kebab"] }, "ecmaFeatures": { "arrowFunctions": true, From 16de698eda3b831ba1d624c26a6561df56aaeeb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 26 Jul 2017 15:13:56 +0900 Subject: [PATCH 03/34] =?UTF-8?q?add:=20babel-plugin-transform-runtime?= =?UTF-8?q?=E3=82=92=E5=B0=8E=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .babelrc | 12 ++++++++++++ package.json | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..73b4ea6 --- /dev/null +++ b/.babelrc @@ -0,0 +1,12 @@ +{ + "plugins": [ + "transform-runtime" + ], + "presets": [ + "es2015", + "stage-2" + ], + "ignore": [ + "node_modules" + ] +} diff --git a/package.json b/package.json index e6fb342..293e546 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,9 @@ "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { + "babel-eslint": "^7.2.3", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-preset-stage-2": "^6.24.1", "eslint-plugin-filenames": "^1.2.0" }, "scripts": { From bc5a8ce2cd75d4457f63fa74b1feadc33df3978b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 26 Jul 2017 15:23:47 +0900 Subject: [PATCH 04/34] update changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf7f67..e49ac65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [5.0.1](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.1) (2017-07-26) + + +### add + +* babel-plugin-transform-runtimeを導入 ([16de698eda3b831ba1d624c26a6561df56aaeeb6](https://github.com/frontainer/frontplate/commit/16de698eda3b831ba1d624c26a6561df56aaeeb6)) +* eslintにeslint-plugin-filenamesプラグインを追加 ([16f142446eb7ca3d6690a841071d4106fa86c134](https://github.com/frontainer/frontplate/commit/16f142446eb7ca3d6690a841071d4106fa86c134)) + + + # [5.0.0](https://github.com/frontainer/frontplate/compare/v4.0.2...v5.0.0) (2016-12-10) From 5816a4dc861fbbdcad482346de2fb0654c6d574c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 26 Jul 2017 15:17:45 +0900 Subject: [PATCH 05/34] 5.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 293e546..ab21ca9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.0", + "version": "5.0.1", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From 59adad209a3caf5407ec41f1cb5e29a0954c001e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 20:44:37 +0900 Subject: [PATCH 06/34] =?UTF-8?q?sass=E5=91=A8=E3=82=8A=E3=82=92=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .sass-lint.yml | 143 ++++++++++++ src/images/.keep | 0 src/sass/_setting.scss | 6 + src/sass/base/_placeholders.scss | 26 +++ src/sass/components/.keep | 0 src/sass/layout/_grid.scss | 38 ++++ src/sass/layout/_layout.scss | 16 +- src/sass/lib/_clearfix.scss | 7 + src/sass/lib/_flex.scss | 75 +++++++ src/sass/lib/_media-queries.scss | 207 ++++++++++++++++++ src/sass/sprites/.keep | 0 src/sass/sprites/_icon.scss | 88 -------- src/sass/style.scss | 17 +- src/sprites/icon/.keep | 0 .../web-navigation-line-craft-1-109681.png | Bin 9550 -> 0 bytes .../web-navigation-line-craft-2-109682.png | Bin 4454 -> 0 bytes .../web-navigation-line-craft-3-109688.png | Bin 5907 -> 0 bytes .../web-navigation-line-craft-4-109689.png | Bin 4531 -> 0 bytes .../web-navigation-line-craft-5-109690.png | Bin 12800 -> 0 bytes 19 files changed, 520 insertions(+), 103 deletions(-) create mode 100644 .sass-lint.yml create mode 100644 src/images/.keep create mode 100644 src/sass/base/_placeholders.scss create mode 100644 src/sass/components/.keep create mode 100644 src/sass/layout/_grid.scss create mode 100644 src/sass/lib/_clearfix.scss create mode 100644 src/sass/lib/_flex.scss create mode 100755 src/sass/lib/_media-queries.scss create mode 100644 src/sass/sprites/.keep delete mode 100644 src/sass/sprites/_icon.scss create mode 100644 src/sprites/icon/.keep delete mode 100644 src/sprites/icon/web-navigation-line-craft-1-109681.png delete mode 100644 src/sprites/icon/web-navigation-line-craft-2-109682.png delete mode 100644 src/sprites/icon/web-navigation-line-craft-3-109688.png delete mode 100644 src/sprites/icon/web-navigation-line-craft-4-109689.png delete mode 100644 src/sprites/icon/web-navigation-line-craft-5-109690.png diff --git a/.sass-lint.yml b/.sass-lint.yml new file mode 100644 index 0000000..beeabc2 --- /dev/null +++ b/.sass-lint.yml @@ -0,0 +1,143 @@ +# sass-lint config generated by make-sass-lint-config v0.0.3 +# +# The following scss-lint Linters are not yet supported by sass-lint: +# BemDepth, DisableLinterReason, ElsePlacement, PropertyCount +# PropertyUnits, SelectorDepth, SelectorFormat, SpaceAroundOperator +# TrailingWhitespace, UnnecessaryMantissa, UnnecessaryParentReference, Compass::* +# +# The following settings/values are unsupported by sass-lint: +# Linter Indentation, option "allow_non_nested_indentation" +# Linter Indentation, option "character" +# Linter NestingDepth, option "ignore_parent_selectors" +# Linter PropertySortOrder, option "ignore_unspecified" +# Linter PropertySortOrder, option "min_properties" +# Linter PropertySortOrder, option "separate_groups" +# Linter SpaceBeforeBrace, option "allow_single_line_padding" +# Linter VendorPrefix, option "identifier_list" + +files: + include: 'src/sass/**/*.scss' + ignore: + - 'src/sass/base/_mixin.scss' + - 'src/sass/base/_sanitize.scss' + - 'src/sass/lib/*.scss' + - 'src/sass/sprites/*.scss' +options: + formatter: stylish + merge-default-rules: false +rules: + border-zero: + - 0 + - convention: zero + brace-style: + - 1 + - allow-single-line: true + clean-import-paths: + - 1 + - filename-extension: false + leading-underscore: false + empty-line-between-blocks: + - 0 + - ignore-single-line-rulesets: true + extends-before-declarations: 1 + extends-before-mixins: 1 + final-newline: + - 0 + - include: true + force-attribute-nesting: 1 + force-element-nesting: 1 + force-pseudo-nesting: 1 + function-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + hex-length: + - 0 + - style: short + hex-notation: + - 0 + - style: lowercase + indentation: + - 0 + - size: 2 + leading-zero: + - 0 + - include: false + mixin-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + mixins-before-declarations: 0 + nesting-depth: + - 1 + - max-depth: 3 + no-color-literals: 0 + no-css-comments: 0 + no-debug: 1 + no-duplicate-properties: 1 + no-empty-rulesets: 1 + no-extends: 0 + no-ids: 1 + no-important: 0 + no-invalid-hex: 1 + no-mergeable-selectors: 0 + no-misspelled-properties: + - 1 + - extra-properties: ['*zoom'] + no-qualifying-elements: + - 1 + - allow-element-with-attribute: false + allow-element-with-class: false + allow-element-with-id: false + no-trailing-zero: 0 + no-transition-all: 0 + no-url-protocols: 1 + no-vendor-prefixes: + - 0 + - additional-identifiers: [] + excluded-identifiers: [] + placeholder-in-extend: 1 + placeholder-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + property-sort-order: 0 + quotes: + - 0 + - style: double + shorthand-values: + - 1 + - allowed-shorthands: + - 1 + - 2 + - 3 + single-line-per-selector: 0 + space-after-bang: + - 1 + - include: false + space-after-colon: + - 0 + - include: true + space-after-comma: + - 0 + - include: true + space-before-bang: + - 1 + - include: true + space-before-brace: + - 1 + - include: true + space-before-colon: 1 + space-between-parens: + - 1 + - include: false + trailing-semicolon: 1 + url-quotes: 0 + variable-for-property: + - 0 + - properties: [] + variable-name-format: + - 1 + - allow-leading-underscore: true + convention: hyphenatedlowercase + zero-unit: 0 diff --git a/src/images/.keep b/src/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/sass/_setting.scss b/src/sass/_setting.scss index b1daf93..6b31b1f 100644 --- a/src/sass/_setting.scss +++ b/src/sass/_setting.scss @@ -8,3 +8,9 @@ $base-font-family: "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "H $base-font-size: 14px; $base-font-color: #333; $base-background-color: #fff; + +//$color-primary +//$color-accent + +$breakpoint-tablet: 1279px; +$breakpoint-mobile: 759px; diff --git a/src/sass/base/_placeholders.scss b/src/sass/base/_placeholders.scss new file mode 100644 index 0000000..1507f08 --- /dev/null +++ b/src/sass/base/_placeholders.scss @@ -0,0 +1,26 @@ +%elps { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -ms-text-overflow: ellipsis; +} + +%image-replacement { + overflow: hidden; + text-indent: 100%; + white-space: nowrap; +} + +%youtube { + position: relative; + width: 100%; + padding-top: 56.25%; + + iframe { + position: absolute; + top: 0; + right: 0; + width: 100% !important; + height: 100% !important; + } +} diff --git a/src/sass/components/.keep b/src/sass/components/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/sass/layout/_grid.scss b/src/sass/layout/_grid.scss new file mode 100644 index 0000000..fbefd37 --- /dev/null +++ b/src/sass/layout/_grid.scss @@ -0,0 +1,38 @@ +.row { + box-sizing: border-box; + display: flex; + flex: 0 1 auto; + flex-direction: row; + flex-wrap: wrap; + width: 100%; +} + +$col: 12; +@for $i from 1 through $col { + $width: (100% / ($col/$i)); + .col-lg-#{$i} { + box-sizing: border-box; + flex: 0 0 auto; + flex-basis: $width; + max-width: $width; + // word-wrap: break-word; + } + + .col-md-#{$i} { + @include max-screen($breakpoint-tablet) { + box-sizing: border-box; + flex: 0 0 auto; + flex-basis: $width; + max-width: $width; + } + } + + .col-sm-#{$i} { + @include max-screen($breakpoint-mobile) { + box-sizing: border-box; + flex: 0 0 auto; + flex-basis: $width; + max-width: $width; + } + } +} diff --git a/src/sass/layout/_layout.scss b/src/sass/layout/_layout.scss index 7e0110a..525eaec 100644 --- a/src/sass/layout/_layout.scss +++ b/src/sass/layout/_layout.scss @@ -1,10 +1,6 @@ -.clearfix { - zoom: 1; - &:before, &:after { - content: " "; - display: table; - } - &:after { - clear: both; - } -} +//.l-container { +// +// @include max-screen($breakpoint-mobile) { +// +// } +//} diff --git a/src/sass/lib/_clearfix.scss b/src/sass/lib/_clearfix.scss new file mode 100644 index 0000000..42e71a5 --- /dev/null +++ b/src/sass/lib/_clearfix.scss @@ -0,0 +1,7 @@ +.clearfix { + &:after { + content: " "; + display: block; + clear: both; + } +} diff --git a/src/sass/lib/_flex.scss b/src/sass/lib/_flex.scss new file mode 100644 index 0000000..098d3b7 --- /dev/null +++ b/src/sass/lib/_flex.scss @@ -0,0 +1,75 @@ +.flex { + box-sizing: border-box; + flex: 1; + display: flex; + &:before, &:after { + content: none; + } +} +.flex-fill { + width: 100%; + height: 100%; +} +.flex-horizontal { + box-orient: horizontal; + box-direction: normal; + flex-direction: row; +} +.flex-vertical { + box-orient: vertical; + box-direction: normal; + flex-direction: column; +} +.flex-space-between { + justify-content: space-between; + flex-pack: justify; + box-pack: justify; +} +.flex-space-around { + justify-content: space-between; + flex-pack: justify; + box-pack: justify; +} +.flex-start { + justify-content: flex-start; + flex-pack: start; + box-pack: start; +} +.flex-end { + justify-content: flex-end; + flex-pack: end; + box-pack: end; +} +.flex-center { + justify-content: center; + flex-pack: center; + box-pack: center; +} +.flex-align-start { + align-items: flex-start; + flex-align: start; + box-align: start; +} +.flex-align-end { + align-items: flex-end; + flex-align: end; + box-align: end; +} +.flex-align-center { + align-items: center; + flex-align: center; + box-align: center; +} +.flex-align-baseline { + align-items: baseline; + flex-align: baseline; + box-align: baseline; +} +.flex-align-stretch { + align-items: stretch; + flex-align: stretch; + box-align: stretch; +} +.flex-inline { + display: inline-flex; +} \ No newline at end of file diff --git a/src/sass/lib/_media-queries.scss b/src/sass/lib/_media-queries.scss new file mode 100755 index 0000000..d1ce246 --- /dev/null +++ b/src/sass/lib/_media-queries.scss @@ -0,0 +1,207 @@ +// --------------------------------------------------------------------------------------------------------------------- +// +// Author: Rafal Bromirski +// www: http://paranoida.com/ +// twitter: http://twitter.com/paranoida +// dribbble: http://dribbble.com/paranoida +// +// Licensed under a MIT License +// +// --------------------------------------------------------------------------------------------------------------------- +// +// Requirements: +// Sass 3.2.0+ +// +// Version: +// 1.3 // developed on 14/11/2013 +// +// Mixins: +// @ min-screen(width) // shortcut for @media screen and (min-width ...) +// @ max-screen(width) // shortcut for @media screen and (max-width ...) +// @ screen(min-width, max-width) // shortcut for @media screen and (min-width ...) and (max-width ...) +// --- +// @ min-screen-height(height) // shortcut for @media screen and (min-height ...) +// @ max-screen-height(height) // shortcut for @media screen and (max-height ...) +// @ screen-height(min-height, max-height) // shortcut for @media screen and (min-height ...) and (max-height ...) +// --- +// @ iphone3 // only iPhone (2, 3G, 3GS) landscape & portrait +// @ iphone3(landscape) // only iPhone (2, 3G, 3GS) only landscape +// @ iphone3(portrait) // only iPhone (2, 3G, 3GS) only portrait +// --- +// @ iphone4 // only iPhone (4, 4S) landscape & portrait +// @ iphone4(landscape) // only iPhone (4, 4S) only landscape +// @ iphone4(portrait) // only iPhone (4, 4S) only portrait +// --- +// @ iphone5 // only iPhone (5) landscape & portrait +// @ iphone5(landscape) // only iPhone (5) only landscape +// @ iphone5(portrait) // only iPhone (5) only portrait +// --- +// @ ipad // all iPads (1, 2, 3, 4, Mini) landscape & portrait +// @ ipad(landscape) // all iPads (1, 2, 3, 4, Mini) only landscape +// @ ipad(portrait) // all iPads (1, 2, 3, 4, Mini) only portrait +// --- +// @ ipad-retina // only iPad (3, 4) landscape & portrait +// @ ipad-retina(landscape) // only iPad (3, 4) only landscape +// @ ipad-retina(portrait) // only iPad (3, 4) only portrait +// --- +// @ hdpi(ratio) // devices with hidpi displays (default ratio: 1.3) +// +// --------------------------------------------------------------------------------------------------------------------- + +// --------------------------------------------------------------------------------------------------------------------- +// --- screen ---------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin screen($resMin, $resMax) { + @media screen and (min-width: $resMin) and (max-width: $resMax) { + @content; + } +} + +@mixin max-screen($res) { + @media screen and (max-width: $res) { + @content; + } +} + +@mixin min-screen($res) { + @media screen and (min-width: $res) { + @content; + } +} + +@mixin screen-height($resMin, $resMax) { + @media screen and (min-height: $resMin) and (max-height: $resMax) { + @content; + } +} + +@mixin max-screen-height($res) { + @media screen and (max-height: $res) { + @content; + } +} + +@mixin min-screen-height($res) { + @media screen and (min-height: $res) { + @content; + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- hdpi ------------------------------------------------------------------------------------------------------------ +// --------------------------------------------------------------------------------------------------------------------- + +// Based on bourbon hidpi-media-queries file (https://github.com/thoughtbot/bourbon/blob/master/app/assets/stylesheets/css3/_hidpi-media-query.scss) +// HiDPI mixin. Default value set to 1.3 to target Google Nexus 7 (http://bjango.com/articles/min-device-pixel-ratio/) + +@mixin hdpi($ratio: 1.3) { + @media only screen and (-webkit-min-device-pixel-ratio: $ratio), + only screen and (min--moz-device-pixel-ratio: $ratio), + only screen and (-o-min-device-pixel-ratio: #{$ratio}/1), + only screen and (min-resolution: #{round($ratio*96)}dpi), + only screen and (min-resolution: #{$ratio}dppx) { + @content; + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- iphone ---------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin iphone3($orientation: all) { + $deviceMinWidth: 320px; + $deviceMaxWidth: 480px; + $devicePixelRatio: 1; + + @if $orientation == all { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) { + @content; + } + } @else { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (orientation: #{$orientation}) { + @content; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- iphone-retina --------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin iphone4($orientation: all) { + $deviceMinWidth: 320px; + $deviceMaxWidth: 480px; + $devicePixelRatio: 2; + $deviceAspectRatio: '2/3'; + + @if $orientation == all { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (device-aspect-ratio: $deviceAspectRatio) { + @content; + } + } @else { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (device-aspect-ratio: $deviceAspectRatio) and (orientation: #{$orientation}) { + @content; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- iphone-5 -------------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin iphone5($orientation: all) { + $deviceMinWidth: 320px; + $deviceMaxWidth: 568px; + $devicePixelRatio: 2; + $deviceAspectRatio: '40/71'; + + @if $orientation == all { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (device-aspect-ratio: $deviceAspectRatio) { + @content; + } + } @else { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (device-aspect-ratio: $deviceAspectRatio) and (orientation: #{$orientation}) { + @content; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- ipads (all) ----------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin ipad($orientation: all) { + $deviceMinWidth: 768px; + $deviceMaxWidth: 1024px; + + @if $orientation == all { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) { + @content; + } + } @else { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (orientation: #{$orientation}) { + @content; + } + } +} + +// --------------------------------------------------------------------------------------------------------------------- +// --- ipad-retina ----------------------------------------------------------------------------------------------------- +// --------------------------------------------------------------------------------------------------------------------- + +@mixin ipad-retina($orientation: all) { + $deviceMinWidth: 768px; + $deviceMaxWidth: 1024px; + $devicePixelRatio: 2; + + @if $orientation == all { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) { + @content; + } + } @else { + @media only screen and (min-device-width: $deviceMinWidth) and (max-device-width: $deviceMaxWidth) and (-webkit-device-pixel-ratio: $devicePixelRatio) and (orientation: #{$orientation}) { + @content; + } + } +} diff --git a/src/sass/sprites/.keep b/src/sass/sprites/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/sass/sprites/_icon.scss b/src/sass/sprites/_icon.scss deleted file mode 100644 index f8b7d1c..0000000 --- a/src/sass/sprites/_icon.scss +++ /dev/null @@ -1,88 +0,0 @@ -$icon-web-navigation-line-craft-1-109681: ( - x: 0, - y: 0, - width: 512, - height: 512, - total_width: 1536, - total_height: 1024, - image: "../images/icon.png", - offset_x: 0, - offset_y: 0 -);$icon-web-navigation-line-craft-2-109682: ( - x: 512, - y: 0, - width: 512, - height: 512, - total_width: 1536, - total_height: 1024, - image: "../images/icon.png", - offset_x: -512, - offset_y: 0 -);$icon-web-navigation-line-craft-3-109688: ( - x: 0, - y: 512, - width: 512, - height: 512, - total_width: 1536, - total_height: 1024, - image: "../images/icon.png", - offset_x: 0, - offset_y: -512 -);$icon-web-navigation-line-craft-4-109689: ( - x: 512, - y: 512, - width: 512, - height: 512, - total_width: 1536, - total_height: 1024, - image: "../images/icon.png", - offset_x: -512, - offset_y: -512 -);$icon-web-navigation-line-craft-5-109690: ( - x: 1024, - y: 0, - width: 512, - height: 512, - total_width: 1536, - total_height: 1024, - image: "../images/icon.png", - offset_x: -1024, - offset_y: 0 -); - -@mixin sprite($variable,$scale:1) { - $image: map_get($variable,image); - $offset_x: map_get($variable,offset_x) * $scale; - $offset_y: map_get($variable,offset_y) * $scale; - $width: map_get($variable,width) * $scale; - $height: map_get($variable,height) * $scale; - $total_width: map_get($variable,total_width) * $scale; - $total_height: map_get($variable,total_height) * $scale; - background-image: url($image); - background-position: #{$offset_x}px #{$offset_y}px; - background-size: #{$total_width}px #{$total_height}px; - width: #{$width}px; - height: #{$height}px; -} - - -.icon { - display: inline-block; - background-repeat: no-repeat; - - &.icon-web-navigation-line-craft-1-109681{ - @include sprite($icon-web-navigation-line-craft-1-109681, 1); - } - &.icon-web-navigation-line-craft-2-109682{ - @include sprite($icon-web-navigation-line-craft-2-109682, 1); - } - &.icon-web-navigation-line-craft-3-109688{ - @include sprite($icon-web-navigation-line-craft-3-109688, 1); - } - &.icon-web-navigation-line-craft-4-109689{ - @include sprite($icon-web-navigation-line-craft-4-109689, 1); - } - &.icon-web-navigation-line-craft-5-109690{ - @include sprite($icon-web-navigation-line-craft-5-109690, 1); - } -} \ No newline at end of file diff --git a/src/sass/style.scss b/src/sass/style.scss index d339bd5..7c57ad5 100644 --- a/src/sass/style.scss +++ b/src/sass/style.scss @@ -1,11 +1,18 @@ @charset "utf-8"; @import 'setting'; -//@import 'base/sanitize'; -//@import 'base/reset'; -//@import 'base/normalize'; +@import 'base/sanitize'; @import 'base/mixin'; +@import "base/placeholders"; @import 'base/base'; -@import 'layout/layout'; -@import 'sprites/icon'; +@import "lib/media-queries"; +@import "lib/clearfix"; +@import 'lib/flex'; + +// @import 'sprites/icon'; + +// @import "components/header"; + +@import 'layout/grid'; +@import 'layout/layout'; diff --git a/src/sprites/icon/.keep b/src/sprites/icon/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/sprites/icon/web-navigation-line-craft-1-109681.png b/src/sprites/icon/web-navigation-line-craft-1-109681.png deleted file mode 100644 index 61040de1f4e15f70cfe7d9fd0f99e433cb7e0544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9550 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 ZrsgJ=gLlN&4D#R2#?sEB)SPzo-v9-kbV~pL diff --git a/src/sprites/icon/web-navigation-line-craft-3-109688.png b/src/sprites/icon/web-navigation-line-craft-3-109688.png deleted file mode 100644 index 9aaeb9fef30643c37ce1a930c59b6c5ed3f76456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5907 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 Date: Wed, 16 Aug 2017 20:45:20 +0900 Subject: [PATCH 07/34] =?UTF-8?q?pjs=E3=81=AE=E3=83=91=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A3=E3=83=AB=E5=90=8D=E3=82=92header=E3=81=8B=E3=82=89hea?= =?UTF-8?q?d=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ejs | 2 +- src/view/{_header.ejs => _head.ejs} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/view/{_header.ejs => _head.ejs} (100%) diff --git a/src/index.ejs b/src/index.ejs index dcc0d66..92255e4 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -10,7 +10,7 @@ PAGE TITLE - <% include view/_header %> + <% include view/_head %> diff --git a/src/view/_header.ejs b/src/view/_head.ejs similarity index 100% rename from src/view/_header.ejs rename to src/view/_head.ejs From 0b5f3fad1c7ae8627b0283f0a6655ae096e5061c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 20:48:06 +0900 Subject: [PATCH 08/34] =?UTF-8?q?=E5=8F=A4=E3=81=84IE=E3=82=92=E8=80=83?= =?UTF-8?q?=E6=85=AE=E3=81=99=E3=82=8B=E5=BF=85=E8=A6=81=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=81html=E3=82=BF=E3=82=B0=E3=82=92?= =?UTF-8?q?=E7=B0=A1=E7=95=A5=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ejs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/index.ejs b/src/index.ejs index 92255e4..0d1739e 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -1,12 +1,5 @@ - - - - - + PAGE TITLE From 63384f97d164fb6177e3ffaa95ef9c053d6ae1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 20:50:31 +0900 Subject: [PATCH 09/34] =?UTF-8?q?eslintignore=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..e69de29 From 8a61b7fcc1fe39bfa198a6b7224c0fc7208ec10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 21:12:51 +0900 Subject: [PATCH 10/34] =?UTF-8?q?js=E3=81=AE=E3=83=87=E3=82=A3=E3=83=AC?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=AA=E6=A7=8B=E6=88=90=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/app.js | 11 +---------- src/js/components/.keep | 0 src/js/constants/index.js | 0 src/js/services/hoge-foo.js | 5 +++++ src/js/{app.spec.js => services/hoge-foo.spec.js} | 4 ++-- src/js/utils/.keep | 0 6 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 src/js/components/.keep create mode 100644 src/js/constants/index.js create mode 100644 src/js/services/hoge-foo.js rename src/js/{app.spec.js => services/hoge-foo.spec.js} (57%) create mode 100644 src/js/utils/.keep diff --git a/src/js/app.js b/src/js/app.js index 7d1b09c..9476dcb 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1,13 +1,4 @@ -/** - * @constructor - */ -export class App { - constructor(val) { - this.val = val; - } -} -let m = new App('main'); if (process.env.NODE_ENV === 'development') { - console.debug('main value:', m.val); + console.debug('development'); } diff --git a/src/js/components/.keep b/src/js/components/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/js/constants/index.js b/src/js/constants/index.js new file mode 100644 index 0000000..e69de29 diff --git a/src/js/services/hoge-foo.js b/src/js/services/hoge-foo.js new file mode 100644 index 0000000..167cb28 --- /dev/null +++ b/src/js/services/hoge-foo.js @@ -0,0 +1,5 @@ +export default class HogeFoo { + constructor() { + + } +} diff --git a/src/js/app.spec.js b/src/js/services/hoge-foo.spec.js similarity index 57% rename from src/js/app.spec.js rename to src/js/services/hoge-foo.spec.js index abcd40b..8ab723f 100644 --- a/src/js/app.spec.js +++ b/src/js/services/hoge-foo.spec.js @@ -1,5 +1,5 @@ -import './app'; -describe('app', () => { +import HogeFoo from './hoge-foo'; +describe('hoge-foo', () => { beforeEach(() => { }); diff --git a/src/js/utils/.keep b/src/js/utils/.keep new file mode 100644 index 0000000..e69de29 From b72e47a3288f588f11979460a660dfea0913a6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 21:17:17 +0900 Subject: [PATCH 11/34] 5.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab21ca9..96a7397 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.1", + "version": "5.0.2", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From 439cab1ab36fb23b877cc223c61dba2baecb5e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 21:18:26 +0900 Subject: [PATCH 12/34] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e49ac65..3c86fc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - -## [5.0.1](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.1) (2017-07-26) + +## [5.0.2](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.2) (2017-08-16) ### add From e9fe6eed87035e6ff624fae797c860c8523a4ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Wed, 16 Aug 2017 22:13:39 +0900 Subject: [PATCH 13/34] =?UTF-8?q?fix:=20sass-lint=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=B0=91=E3=81=97=E5=8E=B3=E3=81=97=E3=81=8F?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .sass-lint.yml | 12 ++++++++---- src/sass/base/_placeholders.scss | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.sass-lint.yml b/.sass-lint.yml index beeabc2..a48f1d9 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -32,6 +32,10 @@ rules: brace-style: - 1 - allow-single-line: true + class-name-format: + - 2 + - allow-leading-underscore: true + convention: hyphenatedlowercase clean-import-paths: - 1 - filename-extension: false @@ -69,16 +73,16 @@ rules: convention: hyphenatedlowercase mixins-before-declarations: 0 nesting-depth: - - 1 - - max-depth: 3 + - 2 + - max-depth: 1 no-color-literals: 0 no-css-comments: 0 no-debug: 1 no-duplicate-properties: 1 no-empty-rulesets: 1 no-extends: 0 - no-ids: 1 - no-important: 0 + no-ids: 2 + no-important: 2 no-invalid-hex: 1 no-mergeable-selectors: 0 no-misspelled-properties: diff --git a/src/sass/base/_placeholders.scss b/src/sass/base/_placeholders.scss index 1507f08..b807590 100644 --- a/src/sass/base/_placeholders.scss +++ b/src/sass/base/_placeholders.scss @@ -20,7 +20,7 @@ position: absolute; top: 0; right: 0; - width: 100% !important; - height: 100% !important; + width: 100% !important; // sass-lint:disable-line no-important + height: 100% !important; // sass-lint:disable-line no-important } } From cc21be7a168201f07cfa3918cc090dc4d2921cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sun, 17 Sep 2017 16:41:00 +0900 Subject: [PATCH 14/34] =?UTF-8?q?add:=20=E8=A4=87=E6=95=B0=E8=A1=8C?= =?UTF-8?q?=E3=82=923=E7=82=B9=E3=83=AA=E3=83=BC=E3=83=80=E3=81=A7?= =?UTF-8?q?=E7=9C=81=E7=95=A5=E3=81=99=E3=82=8Bmixin=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/base/_mixin.scss | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/sass/base/_mixin.scss b/src/sass/base/_mixin.scss index a99d3ea..6fadf13 100644 --- a/src/sass/base/_mixin.scss +++ b/src/sass/base/_mixin.scss @@ -30,3 +30,32 @@ @include sprite-height($sprite, $scale); @include sprite-size($sprite, $scale); } + +@mixin line-clamp($line-height, $font-size, $lines, $color){ + line-height: $line-height; + height: $font-size * $line-height * $lines + px; + overflow: hidden; + position: relative; + word-break: break-all; + text-align: justify; + &:before, + &:after { + position: absolute; + } + &:before { + content: '...'; + background: $color; + right: 0; + text-align: center; + width: 1em; + top: $font-size * $line-height * ($lines - 1) + px; + } + &:after { + content: ''; + height: 100%; + width: 100%; + background: 0; + z-index: 2; + background: $color; + } +} From b7c264a21a4a807d7f512442070c32d23a6ad4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sun, 17 Sep 2017 16:46:34 +0900 Subject: [PATCH 15/34] 5.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96a7397..35a368d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.2", + "version": "5.0.3", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From 9160b525ff49c91e7d9380eb1dec254cc43f9fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sun, 17 Sep 2017 16:47:50 +0900 Subject: [PATCH 16/34] update changelog --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c86fc2..440e806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ + +## [5.0.3](https://github.com/frontainer/frontplate/compare/v5.0.2...v5.0.3) (2017-09-17) + + +### add + +* 複数行を3点リーダで省略するmixinを追加 ([cc21be7a168201f07cfa3918cc090dc4d2921cee](https://github.com/frontainer/frontplate/commit/cc21be7a168201f07cfa3918cc090dc4d2921cee)) + +### fix + +* sass-lintの設定を少し厳しくした ([e9fe6eed87035e6ff624fae797c860c8523a4ab0](https://github.com/frontainer/frontplate/commit/e9fe6eed87035e6ff624fae797c860c8523a4ab0)) + + + ## [5.0.2](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.2) (2017-08-16) From 12bfb254f38500e30a5b01b6b66d057701b425fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sat, 30 Sep 2017 16:15:31 +0900 Subject: [PATCH 17/34] =?UTF-8?q?update:=20autoprefixer=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E3=83=96=E3=83=A9=E3=82=A6=E3=82=B6=E3=81=8CIE10=20&?= =?UTF-8?q?=20Android4.4=E4=BB=A5=E9=99=8D=E3=81=AB=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/style.config.js | 24 ++ config/style.config.production.js | 9 + frp.config.js | 2 +- package-lock.json | 495 ++++++++++++++++++++++++++++++ 4 files changed, 529 insertions(+), 1 deletion(-) create mode 100644 config/style.config.js create mode 100644 config/style.config.production.js create mode 100644 package-lock.json diff --git a/config/style.config.js b/config/style.config.js new file mode 100644 index 0000000..64649fb --- /dev/null +++ b/config/style.config.js @@ -0,0 +1,24 @@ +'use strict'; +module.exports = { + src: `${FRP_SRC}/sass/**/*.scss`, // 読み込むscss + dest: `${FRP_DEST}/assets/css`, // 出力先 + outputStyle: 'compact', + sourceMap: true, + plugins: [ // postcssプラグイン + require('autoprefixer')({ // autoprefixer(https://github.com/postcss/autoprefixer) + browsers: [ + 'ie >= 10', + 'Android >= 4.4' + ] + }) + ], + noGuide: false, + styleguide: { + title: 'StyleGuide', + verbose: false, + clean: true, + params: {}, + css: `../${FRP_DEST}/assets/css/style.css`, + // script: '../public/assets/js/app.js', + } +}; diff --git a/config/style.config.production.js b/config/style.config.production.js new file mode 100644 index 0000000..5cd607a --- /dev/null +++ b/config/style.config.production.js @@ -0,0 +1,9 @@ +'use strict'; +const conf = require('./style.config'); +const merge = require('webpack-merge'); +module.exports = merge(conf, { + sourceMap: false, + plugins: [ // postcssプラグイン + require('postcss-csso')() + ] +}); diff --git a/frp.config.js b/frp.config.js index 93e53b2..228a0d7 100644 --- a/frp.config.js +++ b/frp.config.js @@ -6,7 +6,7 @@ module.exports = function(production) { return { clean: {}, html: {}, - style: production ? {} : {}, + style: production ? require('./config/style.config.production') : require('./config/style.config'), script: production ? {} : {}, server: {}, copy: {}, diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0f7e2e1 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,495 @@ +{ + "name": "Frontplate", + "version": "5.0.3", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-eslint": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz", + "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0" + } + }, + "babel-helper-bindify-decorators": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz", + "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-explode-class": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz", + "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", + "dev": true, + "requires": { + "babel-helper-bindify-decorators": "6.24.1", + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "dev": true, + "requires": { + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-async-generators": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", + "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", + "dev": true + }, + "babel-plugin-syntax-class-properties": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz", + "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=", + "dev": true + }, + "babel-plugin-syntax-decorators": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz", + "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", + "dev": true + }, + "babel-plugin-syntax-dynamic-import": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-generator-functions": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", + "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-generators": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-class-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz", + "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-plugin-syntax-class-properties": "6.13.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0" + } + }, + "babel-plugin-transform-decorators": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz", + "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", + "dev": true, + "requires": { + "babel-helper-explode-class": "6.24.1", + "babel-plugin-syntax-decorators": "6.13.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-types": "6.26.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-object-rest-spread": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", + "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", + "dev": true, + "requires": { + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-runtime": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", + "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-preset-stage-2": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz", + "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", + "dev": true, + "requires": { + "babel-plugin-syntax-dynamic-import": "6.18.0", + "babel-plugin-transform-class-properties": "6.24.1", + "babel-plugin-transform-decorators": "6.24.1", + "babel-preset-stage-3": "6.24.1" + } + }, + "babel-preset-stage-3": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", + "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", + "dev": true, + "requires": { + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-generator-functions": "6.24.1", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-object-rest-spread": "6.26.0" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "2.5.1", + "regenerator-runtime": "0.11.0" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.9", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "core-js": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz", + "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "eslint-plugin-filenames": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-filenames/-/eslint-plugin-filenames-1.2.0.tgz", + "integrity": "sha1-runByQGJyV0uSZAsFg7O7+zZn1M=", + "dev": true, + "requires": { + "lodash.camelcase": "4.3.0", + "lodash.kebabcase": "4.1.1", + "lodash.snakecase": "4.1.1", + "lodash.upperfirst": "4.3.1" + } + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "dev": true, + "requires": { + "loose-envify": "1.3.1" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true + }, + "lodash.kebabcase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", + "dev": true + }, + "lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=", + "dev": true + }, + "lodash.upperfirst": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", + "integrity": "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=", + "dev": true + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, + "requires": { + "js-tokens": "3.0.2" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + } + } +} From 003f159d893b03e5d958e2b161861fed4c5b0041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sat, 30 Sep 2017 16:17:55 +0900 Subject: [PATCH 18/34] 5.0.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f7e2e1..90097e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.3", + "version": "5.0.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 35a368d..0320db6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.3", + "version": "5.0.4", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From 3895eeae54d48c6da6fbaf16f0b5aa8e867930ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Sat, 30 Sep 2017 16:48:18 +0900 Subject: [PATCH 19/34] update changelog --- CHANGELOG.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 440e806..e481db4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [5.0.4](https://github.com/frontainer/frontplate/compare/v5.0.3...v5.0.4) (2017-09-30) + + +### update + +* autoprefixerの対象ブラウザがIE10 & Android4.4以降になるよう変更 ([12bfb254f38500e30a5b01b6b66d057701b425fe](https://github.com/frontainer/frontplate/commit/12bfb254f38500e30a5b01b6b66d057701b425fe)) + + + ## [5.0.3](https://github.com/frontainer/frontplate/compare/v5.0.2...v5.0.3) (2017-09-17) @@ -13,7 +23,13 @@ -## [5.0.2](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.2) (2017-08-16) +## [5.0.2](https://github.com/frontainer/frontplate/compare/v5.0.1...v5.0.2) (2017-08-16) + + + + + +## [5.0.1](https://github.com/frontainer/frontplate/compare/v5.0.0...v5.0.1) (2017-07-26) ### add From cfffea94ba7ff377b5758fb16803df737d0813d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Mon, 2 Oct 2017 15:11:11 +0900 Subject: [PATCH 20/34] Update README.md --- docs/README.md | 320 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 320 insertions(+) create mode 100644 docs/README.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..c72c620 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,320 @@ +# liginc/frontplate + +`liginc/frontplate` is [frontainer/frontplate](https://github.com/frontainer/frontplate)'s fork project. + + +## Create New Project + +`$ frp create {project name} -g liginc/frontplate` +`$ cd {project name}` +`$ npm i` + +--- + +## Commands for development + + +### watch task + +``` +$ frp serve +``` + + +### build task (for development) + +``` +$ frp build +``` + + +### build task (for production) + +The production build will compress the file + +``` +$ frp build -p +``` + +An alias command `$ npm run production` is prepared, you can build it for production + +--- + +## Config File + +Build of frontplate-cli can be configured by [frp.config.js](https://github.com/liginc/frontplate/blob/master/frp.config.js). + +When customization is necessary, override the setting based on [the original file](https://github.com/frontainer/frontplate-cli/tree/master/config) and use it. + +As an example, `liginc/frontplate` overrides the style setting. + + +[https://github.com/liginc/frontplate/blob/master/frp.config.js](https://github.com/liginc/frontplate/blob/master/frp.config.js) +```js +module.exports = function(production) { + global.FRP_SRC = 'src'; + global.FRP_DEST = 'public'; + return { + clean: {}, + html: {}, + style: production ? require('./config/style.config.production') : require('./config/style.config'), + script: production ? {} : {}, + server: {}, + copy: {}, + sprite: [], + test: {} + } +}; +``` + +[https://github.com/liginc/frontplate/blob/master/config/style.config.js](https://github.com/liginc/frontplate/blob/master/config/style.config.js) +```js +module.exports = { + src: `${FRP_SRC}/sass/**/*.scss`, + dest: `${FRP_DEST}/assets/css`, + outputStyle: 'compact', + sourceMap: true, + plugins: [ // postcssプラグイン + require('autoprefixer')({ + browsers: [ // Customized here + 'ie >= 10', + 'Android >= 4.4' + ] + }) + ], + noGuide: false, + styleguide: { + title: 'StyleGuide', + verbose: false, + clean: true, + params: {}, + css: `../${FRP_DEST}/assets/css/style.css`, + // script: '../public/assets/js/app.js', + } +}; +``` + +--- + +## Customized according to project + +Introduction of some frequently used customization examples. + +### Global variables passed to ejs + +Variables passed to ejs can be managed with external files. + +#### Step1 + +frp.config.js +```js +module.exports = function(production) { + global.FRP_SRC = 'src'; + global.FRP_DEST = 'public'; + return { + clean: {}, + html: { + params: { + person: require('./ejs-data/person/seito') // add + } + }, + style: production ? require('./config/style.config.production') : require('./config/style.config'), + script: production ? {} : {}, + server: {}, + copy: {}, + sprite: [], + test: {} + } +}; + +``` + +#### Step2 + +Create a json file. + +./ejs-data/person/seito.js + +```js +module.exports = { + name: '堀口 誠人', + name_en: 'Seito Horiguchi', + job: 'フロントエンドエンジニア', + profile: `最近フロントエンドエンジニアになりました。 +第一回HTML5カルタ大会で優勝しました。 +休日の過ごし方は、"Jazz Barでスコッチを片手に『世界の終りとハードボイルド・ワンダーランド』を読む"です。`, + link: [ + { + title: 'こうして僕はLIGで最初のフロントエンドエンジニアになった/株式会社LIG 堀口誠人氏・林優一氏', + url: 'http://time.levtech.jp/article/a-lig-1/' + }, + { + title: 'SlideShare', + url: 'http://www.slideshare.net/horiguchiseito' + } + ] +}; +``` + +#### Step3 + +Mark up and build. + +index.ejs +```ejs +

<%- person.name %><%- person.name_en %>

+ + + +

<%- person.profile %>

+ +
    + <% for (var i = 0, len = person.link.length; i < len; i++) { %> + <% var item = person.link[i]; %> +
  • + <%= item.title %> +
    • + <% } %> +
+``` + +### Generate a sprite image + +Customize automatic generation of sprite images. +An example of generating icon.png and ribbon.png. + +`Recently, there are many cases using SVG sprite, so it's not used much.` + +* [svg-sprite](https://github.com/jkphl/svg-sprite) +* [IcoMoon App - Icon Font, SVG, PDF & PNG Generator](https://icomoon.io/app/) + +#### Step1 + +frp.config.js +```js +module.exports = function(production) { + global.FRP_SRC = 'src'; + global.FRP_DEST = 'public'; + return { + clean: {}, + html: { + params: { + person: require('./ejs-data/person/seito') + } + }, + style: production ? require('./config/style.config.production') : require('./config/style.config'), + script: production ? {} : {}, + server: {}, + copy: {}, + sprite: [ // add + { + src: `${FRP_SRC}/sprites/icon/*.{png,gif,jpg}`, + destImage: `${FRP_SRC}/images/icon.png`, + destCSS: `${FRP_SRC}/sass/sprites/_icon.scss`, + imgPath: '../images/icon.png', + padding: 2, + scale: 1.0, + mixin: true, + selector: true + }, + { + src: `${FRP_SRC}/sprites/ribbon/*.{png,gif,jpg}`, + destImage: `${FRP_SRC}/images/ribbon.png`, + destCSS: `${FRP_SRC}/sass/sprites/_ribbon.scss`, + imgPath: '../images/icon.png', + padding: 2, + scale: 1.0, + mixin: true, + selector: true + } + ], + test: {} + } +}; +``` + +#### Step2 + +Add images to `sprites/icon` directory and `sprites/ribbon` directory. +Execute the `$ frp build` command. + +### Specify the file to be copied + +By default, I copy files in `lib` directory and `images` directory. +If you add files to the lib folder, you don't need to change the config. + +```js +module.exports = { + // 'path/from': '/path/to' + [`${FRP_SRC}/lib/**/*`]: `${FRP_DEST}/assets/lib`, + [`${FRP_SRC}/images/**/*`]: `${FRP_DEST}/assets/images` +}; +``` + +### Multi Projects + +When desktop site and mobile site are independent. + + +#### Step1 + +Edit frp.config.js. + +```js +module.exports = function(production) { + global.FRP_SRC = 'src/pc'; + global.FRP_DEST = 'public/pc'; + return { + clean: {}, + html: {}, + style: production ? require('./config/style.config.production') : require('./config/style.config'), + script: production ? {} : {}, + server: {}, + copy: {}, + sprite: [], + test: {} + } +}; +``` + +Create frp.sp.config.js. + +```js +module.exports = function(production) { + global.FRP_SRC = 'src/sp'; + global.FRP_DEST = 'public/sp'; + return { + clean: {}, + html: {}, + style: production ? require('./config/style.config.production') : require('./config/style.config'), + script: production ? {} : {}, + server: {}, + copy: {}, + sprite: [], + test: {} + } +}; +``` + +#### Step2 + +Duplicate src directly under `src/pc` and `src/sp`. + +#### Step3 + +Build with frp.sp.config.js. + +`$ frp build -c frp.sp.config.js` + +Alternatively, you can execute commands interactively with the `frp` command. + + +```bash +$ frp +? choose execute command build +? choose config file (Use arrow keys) +❯ frp.config.js + frp.sp.config.js +``` + + From 269fe3af454f37a66224303ac18b013df666c20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Mon, 2 Oct 2017 18:11:46 +0900 Subject: [PATCH 21/34] =?UTF-8?q?Kaz=E3=81=95=E3=82=93=E6=A0=A1=E6=AD=A3?= =?UTF-8?q?=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index c72c620..2e41525 100644 --- a/docs/README.md +++ b/docs/README.md @@ -36,8 +36,6 @@ The production build will compress the file $ frp build -p ``` -An alias command `$ npm run production` is prepared, you can build it for production - --- ## Config File @@ -74,7 +72,7 @@ module.exports = { dest: `${FRP_DEST}/assets/css`, outputStyle: 'compact', sourceMap: true, - plugins: [ // postcssプラグイン + plugins: [ require('autoprefixer')({ browsers: [ // Customized here 'ie >= 10', @@ -240,8 +238,8 @@ Execute the `$ frp build` command. ### Specify the file to be copied -By default, I copy files in `lib` directory and `images` directory. -If you add files to the lib folder, you don't need to change the config. +By default, The files located under lib and images directory will be automatically copied to the destination. +So, generally you don't have to modify the config, unless you need to copy the files outside of those directories. ```js module.exports = { From bc87238eb5ee4cd061085b46becd31bf6be236b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Tue, 3 Oct 2017 10:30:47 +0900 Subject: [PATCH 22/34] =?UTF-8?q?fix:=20BEM=E8=A8=98=E6=B3=95=E3=81=8C?= =?UTF-8?q?=E8=A8=B1=E5=AE=B9=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84lint?= =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .sass-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sass-lint.yml b/.sass-lint.yml index a48f1d9..1a03d9d 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -35,7 +35,7 @@ rules: class-name-format: - 2 - allow-leading-underscore: true - convention: hyphenatedlowercase + convention: hyphenatedbem clean-import-paths: - 1 - filename-extension: false From 41c6db5055fbf3aabe394def5845c64fe126d044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Tue, 3 Oct 2017 11:31:14 +0900 Subject: [PATCH 23/34] 5.0.5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90097e9..b163389 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.4", + "version": "5.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0320db6..7445f3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.4", + "version": "5.0.5", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From 57d1825b2df28eb2169d51367b0c73cc28e83732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=B2=E8=91=89=20=E8=81=A1?= Date: Tue, 3 Oct 2017 11:31:44 +0900 Subject: [PATCH 24/34] update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e481db4..d4d1494 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [5.0.5](https://github.com/frontainer/frontplate/compare/v5.0.4...v5.0.5) (2017-10-03) + + +### fix + +* BEM記法が許容されないlintの設定だったので修正 ([bc87238eb5ee4cd061085b46becd31bf6be236b7](https://github.com/frontainer/frontplate/commit/bc87238eb5ee4cd061085b46becd31bf6be236b7)) + + + ## [5.0.4](https://github.com/frontainer/frontplate/compare/v5.0.3...v5.0.4) (2017-09-30) From a88b9ccf532c8a7c2a9d4b73c64b1ce0c4cb95b6 Mon Sep 17 00:00:00 2001 From: Inaba Satoshi Date: Thu, 5 Oct 2017 18:16:57 +0900 Subject: [PATCH 25/34] Update README.md --- docs/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 2e41525..3c55ef2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -137,6 +137,7 @@ Create a json file. module.exports = { name: '堀口 誠人', name_en: 'Seito Horiguchi', + thumbnailURL: 'https://cdn.liginc.co.jp/wp-content/uploads/2014/10/profile_detail711.jpg', job: 'フロントエンドエンジニア', profile: `最近フロントエンドエンジニアになりました。 第一回HTML5カルタ大会で優勝しました。 @@ -219,7 +220,7 @@ module.exports = function(production) { src: `${FRP_SRC}/sprites/ribbon/*.{png,gif,jpg}`, destImage: `${FRP_SRC}/images/ribbon.png`, destCSS: `${FRP_SRC}/sass/sprites/_ribbon.scss`, - imgPath: '../images/icon.png', + imgPath: '../images/ribbon.png', padding: 2, scale: 1.0, mixin: true, From c2f7623b59ad13509d540f5cfdbe8bd76b0f6819 Mon Sep 17 00:00:00 2001 From: y_hokkey Date: Wed, 25 Oct 2017 10:53:41 +0900 Subject: [PATCH 26/34] =?UTF-8?q?=E5=85=83=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=B8=E3=81=AEURL?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frp.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frp.config.js b/frp.config.js index 228a0d7..688fd9c 100644 --- a/frp.config.js +++ b/frp.config.js @@ -1,5 +1,6 @@ 'use strict'; // https://github.com/frontainer/frontplate-cli/wiki/6.%E8%A8%AD%E5%AE%9A +// https://github.com/frontainer/frontplate-cli/tree/master/config module.exports = function(production) { global.FRP_SRC = 'src'; global.FRP_DEST = 'public'; From 031dbcf019e75f129c36bb9b94b45a9c6240bafc Mon Sep 17 00:00:00 2001 From: Inaba Satoshi Date: Thu, 28 Dec 2017 16:09:52 +0900 Subject: [PATCH 27/34] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cliからテンプレート指定でのプロジェクト作成コマンドを追記 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6b6f9ba..727bc46 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ ## Usage +`$ frp create YOUR_PROJECT_NAME -g liginc/frontplate` + 詳しくは[wiki](https://github.com/frontainer/frontplate-cli/wiki)を参照ください https://github.com/frontainer/frontplate-cli/wiki From 59f3d651c680a2bbb88d985d7b9d0fd571b61ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=BE=E6=9C=AC=20=E5=92=8C=E9=A6=AC?= Date: Fri, 20 Apr 2018 10:14:11 +0900 Subject: [PATCH 28/34] =?UTF-8?q?flex-wrap=20=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/lib/_flex.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sass/lib/_flex.scss b/src/sass/lib/_flex.scss index 098d3b7..5207381 100644 --- a/src/sass/lib/_flex.scss +++ b/src/sass/lib/_flex.scss @@ -6,6 +6,9 @@ content: none; } } +.flex-wrap { + flex-wrap: wrap; +} .flex-fill { width: 100%; height: 100%; From ea6b21a8f01989f97a6a6eb975ddb2d79f26c6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=BE=E6=9C=AC=20=E5=92=8C=E9=A6=AC?= Date: Fri, 20 Apr 2018 10:14:27 +0900 Subject: [PATCH 29/34] =?UTF-8?q?=E8=A8=98=E8=BC=89=E3=83=9F=E3=82=B9?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sass/lib/_flex.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/lib/_flex.scss b/src/sass/lib/_flex.scss index 5207381..a27cfc7 100644 --- a/src/sass/lib/_flex.scss +++ b/src/sass/lib/_flex.scss @@ -29,7 +29,7 @@ box-pack: justify; } .flex-space-around { - justify-content: space-between; + justify-content: space-around; flex-pack: justify; box-pack: justify; } From 267568b1e7c09b477defe26da8eb4d3f7516b1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=20=E4=BD=B3=E4=BB=A3=E5=AD=90?= Date: Wed, 27 Jun 2018 18:06:26 +0900 Subject: [PATCH 30/34] =?UTF-8?q?js,css=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +++ config/style.config.js | 2 +- frp.config.js | 7 +- package-lock.json | 192 ++++++++++++++++++++--------------------- package.json | 4 +- src/index.ejs | 3 +- src/view/_head.ejs | 2 +- 7 files changed, 120 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index 727bc46..dc69309 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,15 @@ 詳しくは[wiki](https://github.com/frontainer/frontplate-cli/wiki)を参照ください https://github.com/frontainer/frontplate-cli/wiki + +## リリースについて + +js,cssの末尾に?ver=0.0.0 とリリースのタグのバージョンをつける仕様になってます。 +リリースの際に以下の手順でリリース対応お願いします。 + +1.package.jsonのバージョンを "version": "0.0.0"に変えてください。 + +2.npm run production で css,jsの末尾に?ver=0.0.0が付与されます。 + +3.今後のリリースには + diff --git a/config/style.config.js b/config/style.config.js index 64649fb..305b81f 100644 --- a/config/style.config.js +++ b/config/style.config.js @@ -5,7 +5,7 @@ module.exports = { outputStyle: 'compact', sourceMap: true, plugins: [ // postcssプラグイン - require('autoprefixer')({ // autoprefixer(https://github.com/postcss/autoprefixer) + require('autoprefixer')({ //autoprefixer(https://github.com/postcss/autoprefixer) browsers: [ 'ie >= 10', 'Android >= 4.4' diff --git a/frp.config.js b/frp.config.js index 688fd9c..4385dc4 100644 --- a/frp.config.js +++ b/frp.config.js @@ -1,4 +1,5 @@ 'use strict'; +const patch = require('./package.json'); // https://github.com/frontainer/frontplate-cli/wiki/6.%E8%A8%AD%E5%AE%9A // https://github.com/frontainer/frontplate-cli/tree/master/config module.exports = function(production) { @@ -6,7 +7,11 @@ module.exports = function(production) { global.FRP_DEST = 'public'; return { clean: {}, - html: {}, + html: { + params: { + patch : '?ver=' + patch.version + } + }, style: production ? require('./config/style.config.production') : require('./config/style.config'), script: production ? {} : {}, server: {}, diff --git a/package-lock.json b/package-lock.json index b163389..0beb19a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.5", + "version": "5.0.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -22,9 +22,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" } }, "babel-eslint": { @@ -33,10 +33,10 @@ "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0" + "babel-code-frame": "^6.22.0", + "babel-traverse": "^6.23.1", + "babel-types": "^6.23.0", + "babylon": "^6.17.0" } }, "babel-helper-bindify-decorators": { @@ -45,9 +45,9 @@ "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-builder-binary-assignment-operator-visitor": { @@ -56,9 +56,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-explode-assignable-expression": { @@ -67,9 +67,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-explode-class": { @@ -78,10 +78,10 @@ "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", "dev": true, "requires": { - "babel-helper-bindify-decorators": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-bindify-decorators": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -90,11 +90,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -103,8 +103,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-remap-async-to-generator": { @@ -113,11 +113,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-messages": { @@ -126,7 +126,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-syntax-async-functions": { @@ -183,9 +183,9 @@ "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-generators": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-generators": "^6.5.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-async-to-generator": { @@ -194,9 +194,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-class-properties": { @@ -205,10 +205,10 @@ "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-class-properties": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" + "babel-helper-function-name": "^6.24.1", + "babel-plugin-syntax-class-properties": "^6.8.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-decorators": { @@ -217,11 +217,11 @@ "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", "dev": true, "requires": { - "babel-helper-explode-class": "6.24.1", - "babel-plugin-syntax-decorators": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" + "babel-helper-explode-class": "^6.24.1", + "babel-plugin-syntax-decorators": "^6.13.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-exponentiation-operator": { @@ -230,9 +230,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-object-rest-spread": { @@ -241,8 +241,8 @@ "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.26.0" + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" } }, "babel-plugin-transform-runtime": { @@ -251,7 +251,7 @@ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", "dev": true, "requires": { - "babel-runtime": "6.26.0" + "babel-runtime": "^6.22.0" } }, "babel-preset-stage-2": { @@ -260,10 +260,10 @@ "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", "dev": true, "requires": { - "babel-plugin-syntax-dynamic-import": "6.18.0", - "babel-plugin-transform-class-properties": "6.24.1", - "babel-plugin-transform-decorators": "6.24.1", - "babel-preset-stage-3": "6.24.1" + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-preset-stage-3": "^6.24.1" } }, "babel-preset-stage-3": { @@ -272,11 +272,11 @@ "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-generator-functions": "6.24.1", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-object-rest-spread": "6.26.0" + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-generator-functions": "^6.24.1", + "babel-plugin-transform-async-to-generator": "^6.24.1", + "babel-plugin-transform-exponentiation-operator": "^6.24.1", + "babel-plugin-transform-object-rest-spread": "^6.22.0" } }, "babel-runtime": { @@ -285,8 +285,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.1", - "regenerator-runtime": "0.11.0" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, "babel-template": { @@ -295,11 +295,11 @@ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, "babel-traverse": { @@ -308,15 +308,15 @@ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" } }, "babel-types": { @@ -325,16 +325,16 @@ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, "babylon": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=", "dev": true }, "chalk": { @@ -343,11 +343,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "core-js": { @@ -359,7 +359,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -392,7 +392,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "has-ansi": { @@ -401,7 +401,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "invariant": { @@ -410,7 +410,7 @@ "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "js-tokens": { @@ -455,7 +455,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "ms": { @@ -476,7 +476,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { diff --git a/package.json b/package.json index 7445f3f..3d2b1fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.5", + "version": "0.0.0", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { @@ -14,7 +14,7 @@ "test": "frp task test", "build": "frp build", "serve": "frp serve", - "production": "frp build -p", + "production": "frp build -p && npm version ", "changelog": "conventional-changelog -p eslint -i CHANGELOG.md -w -s -r 0" }, "repository": { diff --git a/src/index.ejs b/src/index.ejs index 0d1739e..e9b3a63 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -4,8 +4,9 @@ PAGE TITLE <% include view/_head %> + <%- patch %> - + diff --git a/src/view/_head.ejs b/src/view/_head.ejs index c4b8715..affaa02 100644 --- a/src/view/_head.ejs +++ b/src/view/_head.ejs @@ -13,6 +13,6 @@ - + From ef2519a918539e18f92f78df276b5f3fbd94e934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=20=E4=BD=B3=E4=BB=A3=E5=AD=90?= Date: Wed, 27 Jun 2018 18:06:35 +0900 Subject: [PATCH 31/34] 0.0.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0beb19a..5bdbb7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "5.0.6", + "version": "0.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3d2b1fe..1b4b1d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "0.0.0", + "version": "0.0.1", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From d7318e106995ce458894631a21af7c954e8fb4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=20=E4=BD=B3=E4=BB=A3=E5=AD=90?= Date: Wed, 27 Jun 2018 18:13:31 +0900 Subject: [PATCH 32/34] Revert "0.0.1" This reverts commit ef2519a918539e18f92f78df276b5f3fbd94e934. --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bdbb7e..0beb19a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "0.0.1", + "version": "5.0.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1b4b1d3..3d2b1fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "0.0.1", + "version": "0.0.0", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": { From f6c458659a0b4b50b9b8856481c76c3eb2c321d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=20=E4=BD=B3=E4=BB=A3=E5=AD=90?= Date: Wed, 27 Jun 2018 18:56:41 +0900 Subject: [PATCH 33/34] =?UTF-8?q?README=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dc69309..1df3c71 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,23 @@ https://github.com/frontainer/frontplate-cli/wiki -## リリースについて - -js,cssの末尾に?ver=0.0.0 とリリースのタグのバージョンをつける仕様になってます。 -リリースの際に以下の手順でリリース対応お願いします。 - -1.package.jsonのバージョンを "version": "0.0.0"に変えてください。 - -2.npm run production で css,jsの末尾に?ver=0.0.0が付与されます。 - -3.今後のリリースには +## リリースについて + +js,cssの末尾に?ver=0.0.0 とリリースのタグのバージョンをつける仕様になってます。 +リリースの際に以下の手順でリリース対応お願いします。 + +1.package.jsonのバージョンを "version": "0.0.0"に変えてください。 + +2.npm run production で css,jsがproduction buildされた後に + npm versionが起動されjs,cssの末尾に?ver=0.0.0が付与されます。 + 同時に同じ文字列のgitタグも付与されコミットされます。 + +3. バージョンの上げ方は以下のとおりになります。 +npm run production patch … ?ver=0.0.1 +npm run production minor … ?ver=0.1.0 +npm run production major … ?ver=1.0.0 + +■問題点 +・開発中にnpm run productionを毎度してしまうとバージョンが上がり続けると同時にgitタグの方も上がり続けてしまうのが懸念です。 +・開発中には普通のfrp build -c frp.config.js -p を使っていただいてgitタグを使用する際にnpm run productionを使用する From d1474bc6e7492fb20cf165d90a19d54ecb48ffdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=20=E4=BD=B3=E4=BB=A3=E5=AD=90?= Date: Wed, 27 Jun 2018 19:41:35 +0900 Subject: [PATCH 34/34] =?UTF-8?q?README=E3=81=AE=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=80=81package.json=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1df3c71..239b7f1 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ js,cssの末尾に?ver=0.0.0 とリリースのタグのバージョンをつけ npm versionが起動されjs,cssの末尾に?ver=0.0.0が付与されます。 同時に同じ文字列のgitタグも付与されコミットされます。 -3. バージョンの上げ方は以下のとおりになります。 +3.バージョンの上げ方は以下のとおりになります。 npm run production patch … ?ver=0.0.1 npm run production minor … ?ver=0.1.0 npm run production major … ?ver=1.0.0 diff --git a/package.json b/package.json index 3d2b1fe..6850a09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Frontplate", - "version": "0.0.0", + "version": "5.0.5", "description": "フロントエンド開発の効率をあげるフルスタックテンプレート", "dependencies": {}, "devDependencies": {