gatsby-core-theme 11.0.0 → 11.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/.ci.yml +24 -2
  2. package/.storybook/main.js +5 -4
  3. package/CHANGELOG.md +51 -0
  4. package/gatsby-config.js +1 -1
  5. package/gatsby-node.esm.js +1 -3
  6. package/jest.config.js +1 -1
  7. package/package.json +14 -14
  8. package/src/components/app.js +1 -0
  9. package/src/components/atoms/spotlights/index.js +1 -0
  10. package/src/components/molecules/main/index.js +1 -1
  11. package/src/components/organisms/head/head.test.js +1 -1
  12. package/src/components/organisms/head/index.js +2 -3
  13. package/src/helpers/api.js +6 -21
  14. package/src/helpers/processor/index.js +11 -0
  15. package/src/hooks/link/index.js +6 -6
  16. package/storybook/.ci.yml +6 -6
package/.ci.yml CHANGED
@@ -14,9 +14,9 @@ Theme Tests:
14
14
  - gatsby-theme/coverage/
15
15
  coverage: /All files\s*\|\s*([\d\.]+)/
16
16
  rules:
17
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
17
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta"'
18
18
  - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
19
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
19
+ - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
20
20
 
21
21
  Theme Publish:
22
22
  image: git.ilcd.rocks:4567/team-floyd/themes/gatsby-themes:node14
@@ -37,5 +37,27 @@ Theme Publish:
37
37
  only:
38
38
  refs:
39
39
  - master
40
+ variables:
41
+ - $PIPELINE != "content-trigger"
42
+
43
+ Theme Beta Publish:
44
+ image: git.ilcd.rocks:4567/team-floyd/themes/gatsby-themes:node14
45
+ stage: publish-beta
46
+ tags:
47
+ - floyd-runner-test
48
+ before_script:
49
+ - git config --global http.sslverify false
50
+ - git config --global user.email "floyd@gig.com"
51
+ - git config --global user.name "floyd"
52
+ script:
53
+ - export HUSKY=0
54
+ - yarn config set cache-folder .yarn
55
+ - yarn
56
+ - cd gatsby-theme/
57
+ - npx semantic-release
58
+ when: manual
59
+ only:
60
+ refs:
61
+ - beta
40
62
  variables:
41
63
  - $PIPELINE != "content-trigger"
package/.storybook/main.js CHANGED
@@ -5,6 +5,7 @@ module.exports = {
5
5
  '../../**/**/src/**/*.stories.@(js|jsx|ts|tsx)',
6
6
  ],
7
7
  addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
8
+ framework: '@storybook/react',
8
9
  core: {
9
10
  builder: 'webpack5',
10
11
  },
@@ -47,11 +48,11 @@ module.exports = {
47
48
  'gatsby-page-utils': path.resolve(__dirname, '../../node_modules/gatsby-page-utils/dist'),
48
49
  };
49
50
 
50
- // config.resolve.alias['$virtual/lazy-client-sync-requires'] = path.resolve(
51
- // `./__mocks__/virtual-lazy-client-sync-requires.js`
52
- // );
51
+ config.resolve.alias['$virtual/lazy-client-sync-requires'] = path.resolve(
52
+ `./__mocks__/virtual-lazy-client-sync-requires.js`
53
+ );
53
54
 
54
- // config.resolve.mainFields = ['browser', 'module', 'main'];
55
+ config.resolve.mainFields = ['browser', 'module', 'main'];
55
56
  return config;
56
57
  },
57
58
  };
package/CHANGELOG.md CHANGED
@@ -1,3 +1,54 @@
1
+ ## [11.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.2...v11.0.3) (2022-08-24)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * add react helmet ([3a3f907](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3a3f9072e2c258abe1ede1f171054a3d520d83c5))
7
+ * add react helmet ([3df48b9](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3df48b987679639227156f066d77d8b77a5e3545))
8
+
9
+
10
+ * Merge branch 'jetmir-revert-react-helemt' into 'master' ([3a442fd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/3a442fddd02a66856732195d48159db0fae2dbff))
11
+
12
+ ## [11.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.1...v11.0.2) (2022-08-23)
13
+
14
+
15
+ ### Bug Fixes
16
+
17
+ * added noindex nofollow to sports tracker pages ([44daaff](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44daaffb912832db11afb93cc55c6ed9a3416c52))
18
+
19
+
20
+ * Merge branch 'tm-3035-helmet-fixes' into 'master' ([2870a87](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2870a875733f43f753ac39ca968f0bd976720472))
21
+
22
+ ## [11.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.0...v11.0.1) (2022-08-23)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * add filed in main section for feedback counter ([ff3f8d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ff3f8d67e3eaf968ac39b8a3a5eb243a6d3edeed))
28
+ * aithor box ([7e01efc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7e01efc0683664102bf31fa9f9a517433fc993d3))
29
+ * aithor box ([a6fe211](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a6fe211c04d8e9aab0f1c9e0538a1d4907b92cd9))
30
+ * api urls changes ([26a005c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/26a005c19bbe18a6197c124213fa8de996750402))
31
+ * changed site ([802a65d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/802a65de7f800cf0dfe24078509e94ce5dc1a7f8))
32
+ * changed site to irishluck ([905495f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/905495febf58fb0d729e76047214033de4c8d513))
33
+ * publish beta pipeline ([adf73e8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/adf73e89ff71d9d610d98f0b6e898ad12192834e))
34
+ * publish beta pipeline ([9cd3923](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9cd3923d690b6e7ab846fd3fc6aaf7b81c776ae6))
35
+ * publish beta pipeline ([fe158b3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fe158b3908b53a489d48a76ba53f8dd979983e51))
36
+ * publish beta pipeline ([e0ba3e6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e0ba3e61fb80906de6563199d09a51eff1db9c65))
37
+ * publish beta pipeline ([b6bf4a0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b6bf4a0b5ab08c276fbfb95039f40e81b22e1245))
38
+ * publish beta pipeline ([edbd377](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/edbd3777ca3a86edb5517969a6de875f8ab39915))
39
+ * remove the extra / ([ce57259](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ce572598c753605b1237d639ea8d409bb7c07da4))
40
+ * tests fixes after upgrade ([d43145a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d43145a5fbbb69f9b07489399dc4d07b97ced7e6))
41
+ * update gatsby api url and url during build ([ba554dd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ba554ddaa25c34bdd396250c615521c1c2e97259))
42
+ * updated gatsby version ([7cc884b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7cc884b8fba89c62374d4ada6895daec25a4ad8b))
43
+ * upgrade tests fix ([6b42efb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b42efb251d96430a7318ca129e7b3118a219f4a))
44
+ * upgraded gatsby, storbook ([d499750](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d49975004563aab2e7f0b5a7eea6b815bdff086c))
45
+
46
+
47
+ * Merge branch 'tm-3034-change-hercules-sorted-api' into 'master' ([942bd61](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/942bd61b7b3311af50b31a28e19ae8c8fc549f2e))
48
+ * Merge branch 'tm-2987-gatsby-upgrade' into 'master' ([d808d42](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d808d429c3bc69c57b5cf3e5d03a25b8f3553944))
49
+ * Merge branch 'tm-2815-do-you-recommend' into 'master' ([ed5d1a2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ed5d1a24974c1251590ddf8b3c6fa364ba0a2109))
50
+ * Merge branch 'master' into tm-2987-gatsby-upgrade ([b91fe5f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b91fe5f544d4364762fa04331952782b958f9179))
51
+
1
52
  # [11.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v10.0.1...v11.0.0) (2022-08-17)
2
53
 
3
54
 
package/gatsby-config.js CHANGED
@@ -42,7 +42,7 @@ module.exports = {
42
42
  ],
43
43
  },
44
44
  },
45
- `gatsby-plugin-preact`,
45
+ // `gatsby-plugin-preact`,
46
46
  `gatsby-plugin-image`,
47
47
  ],
48
48
  };
package/gatsby-node.esm.js CHANGED
@@ -116,9 +116,6 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
116
116
  process.env.GATSBY_SITE_NAME = String(themeOptions.siteName);
117
117
  if (process.env.GATSBY_PREVIEW_MODE === 'true') {
118
118
  console.log(chalk.magenta('info') + chalk.whiteBright(' preview mode enabled'));
119
- console.log(
120
- chalk.magenta('info') + chalk.whiteBright(` preview path: ${process.env.GATSBY_PREVIEW_URL} `)
121
- );
122
119
  createPage({
123
120
  path: '/',
124
121
  component: require.resolve(appName),
@@ -290,6 +287,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
290
287
  siteInfo,
291
288
  provider,
292
289
  isTracker: true,
290
+ meta_robots: ['noindex', 'nofollow'],
293
291
  },
294
292
  });
295
293
  });
package/jest.config.js CHANGED
@@ -30,7 +30,7 @@ module.exports = {
30
30
  'src/components/app.js',
31
31
  // ''
32
32
  ],
33
- transformIgnorePatterns: [`node_modules/(?!(gatsby|gatsby-script)/)`],
33
+ transformIgnorePatterns: [`node_modules/(?!(gatsby|gatsby-script|gatsby-link)/)`],
34
34
  globals: {
35
35
  __PATH_PREFIX__: ``,
36
36
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gatsby-core-theme",
3
- "version": "11.0.0",
3
+ "version": "11.0.3",
4
4
  "description": "Gatsby Theme NPM Package",
5
5
  "main": "index.js",
6
6
  "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",
@@ -29,16 +29,16 @@
29
29
  "dotenv": "^8.2.0",
30
30
  "eslint": "^7.20.0",
31
31
  "esm": "^3.2.25",
32
- "gatsby": "^4.17.0",
32
+ "gatsby": "^4.20.0",
33
33
  "gatsby-image": "^3.11.0",
34
34
  "gatsby-plugin-image": "^2.10.1",
35
35
  "gatsby-plugin-loadable-components-ssr": "^4.2.0",
36
36
  "gatsby-plugin-manifest": "^4.10.2",
37
37
  "gatsby-plugin-postcss": "^5.11.0",
38
- "gatsby-plugin-preact": "^6.10.1",
39
- "gatsby-plugin-react-helmet": "^5.10.0",
38
+ "gatsby-plugin-preact": "^6.20.0",
40
39
  "gatsby-plugin-sass": "^5.11.0",
41
40
  "gatsby-plugin-sharp": "^4.10.2",
41
+ "gatsby-plugin-react-helmet": "^5.10.0",
42
42
  "gatsby-plugin-sitemap": "^5.10.2",
43
43
  "gatsby-plugin-webfonts": "^2.2.1",
44
44
  "gatsby-source-filesystem": "^4.10.1",
@@ -48,11 +48,11 @@
48
48
  "lodash": "^4.17.15",
49
49
  "normalize.css": "^8.0.1",
50
50
  "postcss": "^8.2.10",
51
- "preact": "^10.7.0",
52
- "preact-render-to-string": "^5.1.20",
51
+ "preact": "^10.10.2",
52
+ "preact-render-to-string": "^5.2.1",
53
53
  "prop-types": "15.7.2",
54
- "react": "^17.0.2",
55
- "react-dom": "^17.0.2",
54
+ "react": "^18.2.0",
55
+ "react-dom": "^18.2.0",
56
56
  "react-google-recaptcha": "^2.1.0",
57
57
  "react-helmet": "^6.0.0",
58
58
  "react-lazyload": "^3.2.0",
@@ -69,12 +69,12 @@
69
69
  "@semantic-release/gitlab-config": "^8.0.0",
70
70
  "@semantic-release/npm": "^7.1.3",
71
71
  "@semantic-release/release-notes-generator": "^9.0.3",
72
- "@storybook/addon-actions": "^6.4.20",
73
- "@storybook/addon-essentials": "^6.4.20",
74
- "@storybook/addon-links": "^6.4.20",
75
- "@storybook/builder-webpack5": "^6.4.20",
76
- "@storybook/manager-webpack5": "^6.4.20",
77
- "@storybook/react": "^6.4.20",
72
+ "@storybook/addon-actions": "^6.5.10",
73
+ "@storybook/addon-essentials": "^6.5.10",
74
+ "@storybook/addon-links": "^6.5.10",
75
+ "@storybook/builder-webpack5": "^6.5.10",
76
+ "@storybook/manager-webpack5": "^6.5.10",
77
+ "@storybook/react": "^6.5.10",
78
78
  "@testing-library/jest-dom": "^5.16.3",
79
79
  "@testing-library/react": "^12.1.4",
80
80
  "babel-jest": "^26.6.3",
package/src/components/app.js CHANGED
@@ -70,6 +70,7 @@ const App = ({ pageContext }) => {
70
70
  page={isPreview ? previewContext.page : pageContext.page}
71
71
  siteInfo={isPreview ? previewContext.siteInfo : pageContext.siteInfo}
72
72
  />
73
+
73
74
  <Body pageContext={isPreview ? previewContext : pageContext} />
74
75
  </TranslationsProvider>
75
76
  );
package/src/components/atoms/spotlights/index.js CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable no-nested-ternary */
1
2
  /* eslint-disable jsx-a11y/label-has-associated-control */
2
3
  /* eslint-disable react/no-danger */
3
4
  /* eslint-disable camelcase */
package/src/components/molecules/main/index.js CHANGED
@@ -9,7 +9,7 @@ const Main = ({ section = {}, pageContext = {} }) => {
9
9
  const { page } = pageContext;
10
10
  const SearchPage = page.path === 's' ? loadable(() => import(`~pages/search`)) : null;
11
11
  const HtmlSitemap = page.path === 'sitemap' ? loadable(() => import(`~atoms/sitemap`)) : null;
12
- const AuthorBox = page.author ? loadable(() => import(`~atoms/author-box`)) : null;
12
+ const AuthorBox = page.author_id ? loadable(() => import(`~atoms/author-box`)) : null;
13
13
  const NotFound = page?.path?.includes('404') ? loadable(() => import(`~atoms/not-found`)) : null;
14
14
 
15
15
  return (
package/src/components/organisms/head/head.test.js CHANGED
@@ -56,7 +56,7 @@ describe('Head Component', () => {
56
56
  expect(container).toBeTruthy();
57
57
  await waitFor(() => {
58
58
  expect(document.title).toEqual('my meta title');
59
- expect(document.documentElement.lang).toEqual('en');
59
+ // expect(document.documentElement.lang).toEqual('en');
60
60
  expect(document.querySelectorAll('link[rel=preconnect]')).toHaveLength(3);
61
61
  expect(document.getElementsByTagName('meta')[0].getAttribute('content')).toEqual(
62
62
  'my meta description'
package/src/components/organisms/head/index.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import React from 'react';
2
- import { Helmet } from 'react-helmet';
3
2
  import PropTypes from 'prop-types';
4
3
 
5
4
  import { schemaGenerator } from '~helpers/schema';
@@ -41,7 +40,7 @@ const Head = ({ page = {}, siteInfo }) => {
41
40
  const pageImage = getPageImage(page) ? getPageImage(page) : imagePrettyUrl(siteInfo?.site_logo);
42
41
  // When google re-indexes dev NSA and IRL, remove lines 28, 41, 42, 43 and process.env.GATSBY_ACTIVE_ENV !== 'development' from lines 24, 25, 27, 29, 43
43
42
  return (
44
- <Helmet>
43
+ <>
45
44
  <title>{page.meta_title}</title>
46
45
  <html lang={getLanguage(page.language)} />
47
46
  <meta name="description" content={page.meta_description} />
@@ -76,7 +75,7 @@ const Head = ({ page = {}, siteInfo }) => {
76
75
  </script>
77
76
  )
78
77
  )}
79
- </Helmet>
78
+ </>
80
79
  );
81
80
  };
82
81
 
package/src/helpers/api.js CHANGED
@@ -3,27 +3,18 @@ import chalk from 'chalk';
3
3
  import processor from './processor';
4
4
 
5
5
  const API_URL = process.env.GATSBY_API_URL;
6
- const PREVIEW_URL = process.env.GATSBY_PREVIEW_URL;
7
6
 
8
7
  /* eslint no-console: ["error", { allow: ["log"] }] */
9
8
 
10
9
  export async function getPreview(siteName, page = null, themeOptions) {
11
10
  return new Promise((resolve, reject) => {
12
- const basicAuth =
13
- process.env.GATSBY_ACTIVE_ENV === 'production'
14
- ? {
15
- auth: {
16
- username: 'previewpages',
17
- password: 'YeV3AhJo',
18
- },
19
- }
20
- : {};
21
-
22
11
  axios
23
- .get(`${PREVIEW_URL}?site_name=${siteName}&path=${page}&preview=1`, basicAuth)
12
+ .get(
13
+ `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}&path=${page}&preview=1&relations=1`
14
+ )
24
15
  .then((response) => {
25
16
  console.log(response);
26
- const processed = processor.run(response.data, themeOptions);
17
+ const processed = processor.run(response.data.result, themeOptions);
27
18
  const siteMarket = Object.keys(processed.site_markets)[0];
28
19
  resolve({
29
20
  marketSections: processed.market_sections[siteMarket],
@@ -37,7 +28,7 @@ export async function getPreview(siteName, page = null, themeOptions) {
37
28
  }
38
29
 
39
30
  export async function getData(siteName, page = null) {
40
- let path = `${API_URL}/v0.1/sites/pages/sorted?site_name=${siteName}`;
31
+ let path = `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}`;
41
32
 
42
33
  if (page) {
43
34
  path += `&path=${page}`;
@@ -48,13 +39,7 @@ export async function getData(siteName, page = null) {
48
39
  const start = new Date();
49
40
  return new Promise((resolve, reject) => {
50
41
  axios
51
- .get(path, {
52
- headers: {
53
- 'Content-Type': 'application/json',
54
- 'X-ID': 'cf16589b8e1ad64dd6e98983f8334e6d',
55
- 'X-Signature': 'FYD7jWimIguFjrg8D9ibS6wIRMK53/bEqh6VrwXbNbc=',
56
- },
57
- })
42
+ .get(path)
58
43
  .then((response) => {
59
44
  const end = new Date() - start;
60
45
  console.log(chalk.green('success') + chalk.whiteBright(` calling hercules - %dms`), end);
package/src/helpers/processor/index.js CHANGED
@@ -203,6 +203,12 @@ export default {
203
203
  const languageKey = Object.keys(data.relations.translations)[0];
204
204
  const translations = data.relations.translations[languageKey];
205
205
  const searchTemplatesAcitve = [];
206
+ let templateFeadbackCounter = null;
207
+
208
+ // create the list of templates that the feedback module will display
209
+ templateFeadbackCounter = Object.keys(data.templates).filter(
210
+ (res) => data.templates[res].feedback_counter
211
+ );
206
212
 
207
213
  // Check what templates should add in the search result
208
214
  Object.keys(data.templates).forEach((el) => {
@@ -305,6 +311,11 @@ export default {
305
311
  if (!page.sections.main) {
306
312
  return;
307
313
  }
314
+
315
+ page.sections.main.feedbackCounter = templateFeadbackCounter.includes(
316
+ `${page.template_id}`
317
+ );
318
+
308
319
  if (item.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET) {
309
320
  page.sections.main.modules.push(cloneDeep(prefilledMarketModules[item.value_id]));
310
321
  } else {
package/src/hooks/link/index.js CHANGED
@@ -1,11 +1,11 @@
1
1
  import React from 'react';
2
2
  // eslint-disable-next-line import/no-extraneous-dependencies
3
- import GatsbyLink from 'gatsby-link';
3
+ import { Link } from 'gatsby';
4
4
  import { navigate } from '@reach/router';
5
5
  import PropTypes from 'prop-types';
6
6
  import { previewFormat, previewPath, formatPath } from '~helpers/path';
7
7
 
8
- function Link({
8
+ function LinkCustom({
9
9
  children = <></>,
10
10
  to = '',
11
11
  activeClassName = '',
@@ -36,20 +36,20 @@ function Link({
36
36
  {children}
37
37
  </a>
38
38
  ) : (
39
- <GatsbyLink
39
+ <Link
40
40
  to={formatPath(to)}
41
41
  activeClassName={activeClassName}
42
42
  partiallyActive={partiallyActive}
43
43
  {...other}
44
44
  >
45
45
  {children}
46
- </GatsbyLink>
46
+ </Link>
47
47
  )}
48
48
  </>
49
49
  );
50
50
  }
51
51
 
52
- Link.propTypes = {
52
+ LinkCustom.propTypes = {
53
53
  to: PropTypes.string.isRequired,
54
54
  children: PropTypes.oneOfType([PropTypes.node, PropTypes.element, PropTypes.any]),
55
55
  activeClassName: PropTypes.string,
@@ -57,4 +57,4 @@ Link.propTypes = {
57
57
  gtmClass: PropTypes.string,
58
58
  };
59
59
 
60
- export default Link;
60
+ export default LinkCustom;
package/storybook/.ci.yml CHANGED
@@ -16,9 +16,9 @@ Storybook Build:
16
16
  paths:
17
17
  - gatsby-theme/storybook/public/
18
18
  rules:
19
- - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
20
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
21
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
19
+ - if: '($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "beta") && $PIPELINE == "automated"'
20
+ - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
21
+ - if: '($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
22
22
  - if: '$PIPELINE == "development"'
23
23
 
24
24
  Storybook Deploy:
@@ -45,9 +45,9 @@ Storybook Deploy:
45
45
  - demo/node_modules/
46
46
  policy: pull
47
47
  rules:
48
- - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
49
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
48
+ - if: '($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "beta") && $PIPELINE == "automated"'
49
+ - if: '($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
50
50
  when: manual
51
51
  allow_failure: true
52
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
52
+ - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
53
53
  - if: '$PIPELINE == "development"'