From 589511bdf53314b49094f661e3c55c1e1b6a7d2b Mon Sep 17 00:00:00 2001 From: Leo Jeong Date: Wed, 17 Feb 2021 12:27:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=82=AC=EC=9D=B4=EB=93=9C=20=EB=B7=B0=20?= =?UTF-8?q?=EB=84=88=EB=B9=84=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20navi=20=EC=83=89?= =?UTF-8?q?=EC=83=81=20=EB=B3=80=EA=B2=BD=20(#238)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/Client/utils/LayoutReducer.ts | 2 +- src/layout/Navigations/NavigationArea/NavigationArea.styled.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/layout/Client/utils/LayoutReducer.ts b/src/layout/Client/utils/LayoutReducer.ts index c5c81933ca..6e5079a266 100644 --- a/src/layout/Client/utils/LayoutReducer.ts +++ b/src/layout/Client/utils/LayoutReducer.ts @@ -116,7 +116,7 @@ function LayoutReducer(state: LayoutState = defaultState, action: LayoutAction): case ActionType.SET_SIDE_WIDTH: { return { ...state, - sideWidth: action.payload, + sideWidth: state.showSideView ? state.sideWidth : action.payload, } } diff --git a/src/layout/Navigations/NavigationArea/NavigationArea.styled.ts b/src/layout/Navigations/NavigationArea/NavigationArea.styled.ts index 27e5515e1b..76fd042fe3 100644 --- a/src/layout/Navigations/NavigationArea/NavigationArea.styled.ts +++ b/src/layout/Navigations/NavigationArea/NavigationArea.styled.ts @@ -51,7 +51,6 @@ export const NavigationContainer = styled.div` width: ${({ showNavigation }) => (showNavigation === false ? '0px' : 'inherit')}; height: 100%; user-select: none; - background-color: ${({ foundation }) => foundation?.theme?.['bg-navi']}; ${({ foundation }) => foundation?.transition?.getTransitionsCSS( 'width', @@ -82,7 +81,7 @@ export const NavigationPresenter = styled.div` height: 100%; pointer-events: auto; /* TODO: Hovering Color Prop 추가 */ - background-color: ${({ showNavigation }) => (showNavigation === false && 'white')}; + background-color: ${({ foundation }) => foundation?.theme?.['bg-navi']}; border-radius: 0 ${({ showNavigation }) => !showNavigation && '10px 10px'} 0; opacity: ${({ showNavigation, isHover }) => ( From 0b7be47bb6d3bdea77c148890c304ab10b0cf137 Mon Sep 17 00:00:00 2001 From: Leo Jeong Date: Thu, 18 Feb 2021 13:30:16 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95=20-?= =?UTF-8?q?=20v0.3.4=20(#241)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 3970e52cf2..6b43f333cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@channel.io/design-system", - "version": "0.3.3", + "version": "0.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0f57fbf438..35c17b64b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@channel.io/design-system", - "version": "0.3.3", + "version": "0.3.4", "description": "Design System by Channel", "repository": { "type": "git", From 7c5cc2bcb88e0c3c71061c4e356fffa18160b3a2 Mon Sep 17 00:00:00 2001 From: MongWook Song Date: Thu, 18 Feb 2021 13:30:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?rollup=20config=20=EC=9D=98=20babelHelpers?= =?UTF-8?q?=EB=A5=BC=20runtime=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#?= =?UTF-8?q?239)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 명시적으로 babelHelpers 를 추가하여 warning 삭제 * babelHelper 를 runtime으로 변경하고 필요한 옵션 추가 * rollup bundle visualizer를 dev dep으로 추가 * 레오 리뷰 반영 trailing comma filename to gitignore --- .gitignore | 3 + babel.config.js | 2 + package-lock.json | 212 ++++++++++++++++++++++++++++++++++++++++------ package.json | 3 + rollup.config.js | 6 ++ 5 files changed, 202 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index f41017edd5..3c5eb3fc74 100644 --- a/.gitignore +++ b/.gitignore @@ -193,3 +193,6 @@ storybook-static/ # WebStorm .idea + +# Rollup Plugin Visualizer +stats.html \ No newline at end of file diff --git a/babel.config.js b/babel.config.js index 1d607b414f..0a71864292 100644 --- a/babel.config.js +++ b/babel.config.js @@ -7,6 +7,7 @@ module.exports = { ['@babel/preset-typescript', { isTSX: true, allExtensions: true }], ], plugins: [ + "@babel/plugin-transform-runtime", ["@babel/plugin-proposal-decorators", { legacy: true }], ['@babel/plugin-proposal-class-properties', { loose: false }], ['@babel/plugin-transform-classes', { loose: true }], @@ -25,6 +26,7 @@ module.exports = { ['@babel/preset-typescript', { isTSX: true, allExtensions: true }], ], plugins: [ + "@babel/plugin-transform-runtime", ["@babel/plugin-proposal-decorators", { legacy: true }], ['@babel/plugin-proposal-class-properties', { loose: false }], ['@babel/plugin-transform-classes', { loose: true }], diff --git a/package-lock.json b/package-lock.json index 6b43f333cc..80d49ca55f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2120,22 +2120,47 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", - "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", + "version": "7.12.15", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz", + "integrity": "sha512-OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "resolve": "^1.8.1", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.12.13", "semver": "^5.5.1" }, "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "@babel/helper-module-imports": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz", + "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==", + "dev": true, + "requires": { + "@babel/types": "^7.12.13" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz", + "integrity": "sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", + "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", "dev": true + }, + "@babel/types": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz", + "integrity": "sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.12.11", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } } } }, @@ -3621,20 +3646,11 @@ } }, "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", - "dev": true, + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz", + "integrity": "sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==", "requires": { "regenerator-runtime": "^0.13.4" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", - "dev": true - } } }, "@babel/runtime-corejs3": { @@ -9101,6 +9117,18 @@ "@babel/plugin-syntax-decorators": "^7.8.3" } }, + "@babel/plugin-transform-runtime": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", + "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.8.3", + "@babel/helper-plugin-utils": "^7.8.3", + "resolve": "^1.8.1", + "semver": "^5.5.1" + } + }, "@babel/preset-env": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz", @@ -18723,6 +18751,12 @@ "dev": true, "optional": true }, + "nanoid": { + "version": "3.1.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz", + "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -21448,8 +21482,7 @@ "regenerator-runtime": { "version": "0.13.7", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" }, "regenerator-transform": { "version": "0.14.4", @@ -22147,6 +22180,137 @@ "integrity": "sha512-AWdukIM1+k5JDdAqV/Cxd+nejvno2FVLVeZ74NKggm3Q5s9cbbcOgUPGdbxPi4BXu7xGaZ8HG12F+thImYu/0g==", "dev": true }, + "rollup-plugin-visualizer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.2.0.tgz", + "integrity": "sha512-xjfvoK4x0G7lBT3toMx8K/9tkCEWhRehnSJnn+PLY3Hjk8sNvyo407b68Cd3hdV9j42xcb8HXt0ZrmRi5NWeaQ==", + "dev": true, + "requires": { + "nanoid": "^3.0.1", + "open": "^7.0.3", + "source-map": "^0.7.3", + "yargs": "^16.0.3" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", + "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.5", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz", + "integrity": "sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==", + "dev": true + } + } + }, "rsvp": { "version": "4.8.5", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", diff --git a/package.json b/package.json index 35c17b64b5..b38ba110be 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/plugin-proposal-decorators": "^7.12.1", "@babel/plugin-transform-classes": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.15", "@babel/preset-env": "^7.12.11", "@babel/preset-react": "^7.12.10", "@babel/preset-typescript": "^7.12.7", @@ -127,6 +128,7 @@ "regenerator-runtime": "^0.13.7", "rollup": "^2.37.1", "rollup-plugin-peer-deps-external": "^2.2.4", + "rollup-plugin-visualizer": "^4.2.0", "styled-components": "^5.2.1", "stylelint": "^13.8.0", "ts-node": "^8.10.2", @@ -138,6 +140,7 @@ "styled-components": ">=5" }, "dependencies": { + "@babel/runtime": "^7.12.13", "antlr4": "^4.8.0", "core-decorators": "^0.20.0", "lodash-es": "^4.17.15", diff --git a/rollup.config.js b/rollup.config.js index 220f863372..46776fbf6a 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -3,6 +3,7 @@ import peerDepsExternal from 'rollup-plugin-peer-deps-external' import resolve from '@rollup/plugin-node-resolve' import babel from '@rollup/plugin-babel' import commonjs from '@rollup/plugin-commonjs' +import visualizer from 'rollup-plugin-visualizer' import packageJson from './package.json' @@ -29,8 +30,13 @@ export default { }), commonjs(), babel({ + babelHelpers: 'runtime', exclude: 'node_modules/**', extensions, }), + visualizer({ + filename: "stats.html", + }), ], + external: [/@babel\/runtime/], }