diff --git a/src/components/common/CopyFileButton.tsx b/src/components/common/CopyFileButton.tsx index d49e3d54..8a90485b 100644 --- a/src/components/common/CopyFileButton.tsx +++ b/src/components/common/CopyFileButton.tsx @@ -2,8 +2,9 @@ import React, { useState } from 'react' import styled from '@emotion/styled' import { Button, Popover } from 'antd' import type { ButtonProps } from 'antd' -import { getBinaryFileURL } from '../../utils' +import { getBinaryFileURL, USE_YARN_PLUGIN } from '../../utils' import { CopyOutlined } from '@ant-design/icons' +import { useSettings } from '../../SettingsProvider' const popoverContentOpts = { default: 'Copy raw contents', @@ -33,10 +34,14 @@ const CopyFileButton = styled( popoverContentOpts.default ) + const { + settings: { [USE_YARN_PLUGIN]: useYarnPlugin }, + } = useSettings() + const fetchContent = () => - fetch(getBinaryFileURL({ packageName, version, path })).then((response) => - response.text() - ) + fetch( + getBinaryFileURL({ packageName, version, path, useYarnPlugin }) + ).then((response) => response.text()) // .then((content) => replaceAppDetails(content, appName, appPackage)) const copyContent = () => { diff --git a/src/components/common/DownloadFileButton.tsx b/src/components/common/DownloadFileButton.tsx index 508498f4..98746c74 100644 --- a/src/components/common/DownloadFileButton.tsx +++ b/src/components/common/DownloadFileButton.tsx @@ -1,7 +1,8 @@ import React from 'react' import { Button, ButtonProps } from 'antd' import { DownloadOutlined } from '@ant-design/icons' -import { getBinaryFileURL } from '../../utils' +import { getBinaryFileURL, USE_YARN_PLUGIN } from '../../utils' +import { useSettings } from '../../SettingsProvider' interface DownloadFileButtonProps extends ButtonProps { open: boolean @@ -16,13 +17,17 @@ const DownloadFileButton = ({ packageName, ...props }: DownloadFileButtonProps) => { + const { + settings: { [USE_YARN_PLUGIN]: useYarnPlugin }, + } = useSettings() + return open ? ( diff --git a/src/utils.ts b/src/utils.ts index e0d97305..24d5d029 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -92,12 +92,13 @@ export const getBinaryFileURL = ({ language, version, path, -}: GetBinaryFileURLProps) => { + useYarnPlugin, +}: GetBinaryFileURLProps & { useYarnPlugin: boolean }) => { const branch = getBranch({ packageName, language, version }) return `https://raw.githubusercontent.com/${getRNDiffRepository({ packageName, - })}/release/${branch}/${path}` + })}/release/${useYarnPlugin ? 'yarn-plugin/' : ''}${branch}/${path}` } export const removeAppPathPrefix = (path: string, appName = DEFAULT_APP_NAME) =>