From 6ffa72e27359ed09f81dffda09e5b39842535ad1 Mon Sep 17 00:00:00 2001 From: Muhamad Fikri Alhawarizmi Date: Sat, 27 Jul 2019 10:46:52 +0700 Subject: [PATCH 1/7] make id of chunk style link unique --- src/client/index.jsx | 2 +- src/server/renderer.jsx | 2 +- src/shared/containers/AppChunk/index.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/index.jsx b/src/client/index.jsx index b732b3ff..8e6b4162 100644 --- a/src/client/index.jsx +++ b/src/client/index.jsx @@ -60,7 +60,7 @@ export default async function Launch({ moduleHot.addStatusHandler((status) => { if (status !== 'ready') return; const stamp = shortId(); - const links = document.querySelectorAll('link[rel=stylesheet][id="tru-style"]'); + const links = document.querySelectorAll('link[rel=stylesheet][id^="tru-style"]'); for (let i = 0; i < links.length; i += 1) { links[i].href = `${links[i].href.match(/[^?]*/)}?v=${stamp}`; } diff --git a/src/server/renderer.jsx b/src/server/renderer.jsx index 905cb8b6..a2e62f95 100644 --- a/src/server/renderer.jsx +++ b/src/server/renderer.jsx @@ -177,7 +177,7 @@ export default function factory(webpackConfig, options) { assets = assets.filter(asset => asset.endsWith('.css')); assets.forEach((asset) => { styles.push(( - `` + `` )); }); }); diff --git a/src/shared/containers/AppChunk/index.jsx b/src/shared/containers/AppChunk/index.jsx index 7be83c56..ee02595a 100644 --- a/src/shared/containers/AppChunk/index.jsx +++ b/src/shared/containers/AppChunk/index.jsx @@ -171,7 +171,7 @@ export default class SplitRoute extends React.Component { link = document.createElement('link'); link.setAttribute('data-chunk', chunkName); link.setAttribute('href', `${PUBLIC_PATH}/${chunkName}-${timestamp}.css`); - link.setAttribute('id', 'tru-style'); + link.setAttribute('id', `tru-style-${chunkName.replace('/', '-')}`); link.setAttribute('rel', 'stylesheet'); const head = document.getElementsByTagName('head')[0]; head.appendChild(link); From aec6149ce2f7cd5a8e3e95e682529ced0c5a9282 Mon Sep 17 00:00:00 2001 From: Afrisal Yodi Purnama Date: Mon, 29 Jul 2019 16:59:52 +0700 Subject: [PATCH 2/7] GenericLink add onkeydown event. --- src/shared/components/GenericLink.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/components/GenericLink.jsx b/src/shared/components/GenericLink.jsx index 75889237..161f54dd 100644 --- a/src/shared/components/GenericLink.jsx +++ b/src/shared/components/GenericLink.jsx @@ -19,6 +19,7 @@ export default function GenericLink(props) { enforceA, onClick, onMouseDown, + onKeyDown, openNewTab, replace, routerLinkType, @@ -37,6 +38,7 @@ export default function GenericLink(props) { href={to} onClick={onClick} onMouseDown={onMouseDown} + onKeyDown={onKeyDown} rel="noopener noreferrer" target={openNewTab ? '_blank' : ''} > @@ -72,6 +74,7 @@ GenericLink.defaultProps = { enforceA: false, onClick: null, onMouseDown: null, + onKeyDown: null, openNewTab: false, replace: false, to: '', @@ -83,6 +86,7 @@ GenericLink.propTypes = { enforceA: PT.bool, onClick: PT.func, onMouseDown: PT.func, + onKeyDown: PT.func, openNewTab: PT.bool, replace: PT.bool, routerLinkType: PT.func.isRequired, From 210329175c0afc2eb401466423b1ab09316cfba9 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 30 Jul 2019 15:22:28 +0530 Subject: [PATCH 3/7] fixing snapshots --- __tests__/__snapshots__/index.js.snap | 1 + .../server/__snapshots__/renderer.jsx.snap | 2 +- package-lock.json | 11184 ++++++++-------- src/shared/components/Button.jsx | 1 + 4 files changed, 5562 insertions(+), 5626 deletions(-) diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap index 89132387..4e2c56dc 100644 --- a/__tests__/__snapshots__/index.js.snap +++ b/__tests__/__snapshots__/index.js.snap @@ -81,6 +81,7 @@ Object { "animationEnd": [Function], "animationIteration": [Function], "animationStart": [Function], + "auxClick": [Function], "beforeInput": [Function], "blur": [Function], "canPlay": [Function], diff --git a/__tests__/server/__snapshots__/renderer.jsx.snap b/__tests__/server/__snapshots__/renderer.jsx.snap index bc0a17ec..be5a0a6a 100644 --- a/__tests__/server/__snapshots__/renderer.jsx.snap +++ b/__tests__/server/__snapshots__/renderer.jsx.snap @@ -163,7 +163,7 @@ exports[`Server-side rendering (SSR); injection of CSS chunks & Redux state 1`] id=\\"tru-style\\" rel=\\"stylesheet\\" /> - + Date: Tue, 30 Jul 2019 15:27:46 +0530 Subject: [PATCH 4/7] fixing snapshots --- .../shared/components/__snapshots__/GenericLink.jsx.snap | 7 ++++++- __tests__/shared/components/__snapshots__/Link.jsx.snap | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/__tests__/shared/components/__snapshots__/GenericLink.jsx.snap b/__tests__/shared/components/__snapshots__/GenericLink.jsx.snap index b8996124..187e34e0 100644 --- a/__tests__/shared/components/__snapshots__/GenericLink.jsx.snap +++ b/__tests__/shared/components/__snapshots__/GenericLink.jsx.snap @@ -5,6 +5,7 @@ exports[`Absolute link, starting with http:// 1`] = ` className={null} href="http://www.domain.com/test" onClick={null} + onKeyDown={null} onMouseDown={null} rel="noopener noreferrer" target="" @@ -18,6 +19,7 @@ exports[`Absolute link, starting with https:// 1`] = ` className={null} href="https://www.domain.com/test" onClick={[Function]} + onKeyDown={null} onMouseDown={null} rel="noopener noreferrer" target="" @@ -31,6 +33,7 @@ exports[`Anchor link 1`] = ` className={null} href="#anchor" onClick={null} + onKeyDown={null} onMouseDown={null} rel="noopener noreferrer" target="" @@ -45,7 +48,7 @@ exports[`Relative link 1`] = ` onClick={[Function]} type="button" > - {"to":"http/relative/link","className":null,"onMouseDown":null,"replace":false,"children":"RELATIVE LINK"} + {"to":"http/relative/link","className":null,"onMouseDown":null,"onKeyDown":null,"replace":false,"children":"RELATIVE LINK"} `; @@ -54,6 +57,7 @@ exports[`Relative link, with \`enforceA\` 1`] = ` className={null} href="https://github.com/relative/link" onClick={null} + onKeyDown={null} onMouseDown={null} rel="noopener noreferrer" target="" @@ -67,6 +71,7 @@ exports[`Relative link, with \`openNewTab\` 1`] = ` className={null} href="https://github.com/relative/link" onClick={null} + onKeyDown={null} onMouseDown={null} rel="noopener noreferrer" target="_blank" diff --git a/__tests__/shared/components/__snapshots__/Link.jsx.snap b/__tests__/shared/components/__snapshots__/Link.jsx.snap index 8cda8bad..fb8dd71b 100644 --- a/__tests__/shared/components/__snapshots__/Link.jsx.snap +++ b/__tests__/shared/components/__snapshots__/Link.jsx.snap @@ -5,6 +5,7 @@ exports[`Matches snapshots 1`] = ` className={null} enforceA={false} onClick={null} + onKeyDown={null} onMouseDown={null} openNewTab={false} replace={false} From 1f39d69f0175a843985ec88c3a740b7f37350713 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 30 Jul 2019 15:37:38 +0530 Subject: [PATCH 5/7] adding dist tag and updating npm version --- .circleci/config.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e452105..11e716f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish + - run: npm publish --tag=qa-accessibility workflows: version: 2 diff --git a/package.json b/package.json index 4c210834..fb082bb1 100644 --- a/package.json +++ b/package.json @@ -121,5 +121,5 @@ "mkDistDir:prod": "mkdir -p dist/prod/shared/utils && mkdir -p dist/prod/client", "test": "npm run lint && npm run jest" }, - "version": "0.7.8" + "version": "0.7.8-1" } From ce88f6eb202beafe620f85296b8b6b0ed2848281 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 30 Jul 2019 15:44:41 +0530 Subject: [PATCH 6/7] to make patches flexible --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11e716f1..d03f8e57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,6 @@ workflows: branches: ignore: /.*/ tags: - only: /v[0-9]+(\.[0-9]+)*/ + only: /v[0-9]+(\.[0-9]+)*(-[0-9]+)?/ requires: - test From d30056e081be50c23ee75bdeaea68d211d291240 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 30 Jul 2019 15:46:48 +0530 Subject: [PATCH 7/7] updated npm version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb082bb1..1aa83fe1 100644 --- a/package.json +++ b/package.json @@ -121,5 +121,5 @@ "mkDistDir:prod": "mkdir -p dist/prod/shared/utils && mkdir -p dist/prod/client", "test": "npm run lint && npm run jest" }, - "version": "0.7.8-1" + "version": "0.7.8-2" }