chore(next): Add Next.js to fxa and initial setup

This commit is contained in:
Lisa Chan 2023-06-14 14:42:07 -04:00
Родитель 96882cea19
Коммит d4bf24117c
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 9052E177BBC5E764
45 изменённых файлов: 2659 добавлений и 381 удалений

3
.gitignore поставляемый
Просмотреть файл

@ -160,3 +160,6 @@ process.yml
**/config/gql/allowlist
configs/gql/allowlist
!configs/gql/allowlist/gql-playground.json
# Next.js
.next

Просмотреть файл

@ -12,7 +12,7 @@ fi
mkdir -p artifacts
echo "building shared fxa projects..."
if ! yarn workspaces foreach --verbose --include fxa-auth-client --include fxa-react --include fxa-shared run build > artifacts/build-shared.log;
if ! nx run-many --targets=fxa-auth-client,fxa-react,fxa-shared --all build --verbose > artifacts/build-shared.log;
then
echo -e "\n###########################################################\n"
echo "# fxa couldn't build shared projects. see ./artifacts/build-shared.log for details"
@ -20,8 +20,8 @@ then
exit 1
fi
echo "${COMMAND} fxa services..."
if yarn workspaces foreach --topological-dev --verbose --exclude fxa-dev-launcher --exclude fxa run "$COMMAND" > artifacts/start.log;
echo "${COMMAND} fxa services and nx projects..."
if nx run-many --verbose --exclude fxa-dev-launcher --exclude fxa --targets="$COMMAND" > artifacts/start.log;
then
pm2 ls
else

Просмотреть файл

@ -0,0 +1,34 @@
{
"extends": [
"plugin:@nx/react-typescript",
"next",
"next/core-web-vitals",
"../../../.eslintrc.json"
],
"ignorePatterns": ["!**/*", ".next/**/*"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@next/next/no-html-link-for-pages": [
"error",
"apps/payments/next/pages"
]
}
},
{
"files": ["*.ts", "*.tsx"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"rules": {}
}
],
"rules": {
"@next/next/no-html-link-for-pages": "off"
},
"env": {
"jest": true
}
}

Просмотреть файл

@ -0,0 +1,3 @@
export async function GET(request: Request) {
return new Response('Hello, from API!');
}

Просмотреть файл

@ -0,0 +1,404 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
html {
-webkit-text-size-adjust: 100%;
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif,
Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
line-height: 1.5;
tab-size: 4;
scroll-behavior: smooth;
}
body {
font-family: inherit;
line-height: inherit;
margin: 0;
}
h1,
h2,
p,
pre {
margin: 0;
}
*,
::before,
::after {
box-sizing: border-box;
border-width: 0;
border-style: solid;
border-color: currentColor;
}
h1,
h2 {
font-size: inherit;
font-weight: inherit;
}
a {
color: inherit;
text-decoration: inherit;
}
pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
Liberation Mono, Courier New, monospace;
}
svg {
display: block;
vertical-align: middle;
shape-rendering: auto;
text-rendering: optimizeLegibility;
}
pre {
background-color: rgba(55, 65, 81, 1);
border-radius: 0.25rem;
color: rgba(229, 231, 235, 1);
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
Liberation Mono, Courier New, monospace;
overflow: scroll;
padding: 0.5rem 0.75rem;
}
.shadow {
box-shadow: 0 0 #0000, 0 0 #0000, 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
}
.rounded {
border-radius: 1.5rem;
}
.wrapper {
width: 100%;
}
.container {
margin-left: auto;
margin-right: auto;
max-width: 768px;
padding-bottom: 3rem;
padding-left: 1rem;
padding-right: 1rem;
color: rgba(55, 65, 81, 1);
width: 100%;
}
#welcome {
margin-top: 2.5rem;
}
#welcome h1 {
font-size: 3rem;
font-weight: 500;
letter-spacing: -0.025em;
line-height: 1;
}
#welcome span {
display: block;
font-size: 1.875rem;
font-weight: 300;
line-height: 2.25rem;
margin-bottom: 0.5rem;
}
#hero {
align-items: center;
background-color: hsla(214, 62%, 21%, 1);
border: none;
box-sizing: border-box;
color: rgba(55, 65, 81, 1);
display: grid;
grid-template-columns: 1fr;
margin-top: 3.5rem;
}
#hero .text-container {
color: rgba(255, 255, 255, 1);
padding: 3rem 2rem;
}
#hero .text-container h2 {
font-size: 1.5rem;
line-height: 2rem;
position: relative;
}
#hero .text-container h2 svg {
color: hsla(162, 47%, 50%, 1);
height: 2rem;
left: -0.25rem;
position: absolute;
top: 0;
width: 2rem;
}
#hero .text-container h2 span {
margin-left: 2.5rem;
}
#hero .text-container a {
background-color: rgba(255, 255, 255, 1);
border-radius: 0.75rem;
color: rgba(55, 65, 81, 1);
display: inline-block;
margin-top: 1.5rem;
padding: 1rem 2rem;
text-decoration: inherit;
}
#hero .logo-container {
display: none;
justify-content: center;
padding-left: 2rem;
padding-right: 2rem;
}
#hero .logo-container svg {
color: rgba(255, 255, 255, 1);
width: 66.666667%;
}
#middle-content {
align-items: flex-start;
display: grid;
gap: 4rem;
grid-template-columns: 1fr;
margin-top: 3.5rem;
}
#learning-materials {
padding: 2.5rem 2rem;
}
#learning-materials h2 {
font-weight: 500;
font-size: 1.25rem;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
.list-item-link {
align-items: center;
border-radius: 0.75rem;
display: flex;
margin-top: 1rem;
padding: 1rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 100%;
}
.list-item-link svg:first-child {
margin-right: 1rem;
height: 1.5rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 1.5rem;
}
.list-item-link > span {
flex-grow: 1;
font-weight: 400;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
.list-item-link > span > span {
color: rgba(107, 114, 128, 1);
display: block;
flex-grow: 1;
font-size: 0.75rem;
font-weight: 300;
line-height: 1rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
.list-item-link svg:last-child {
height: 1rem;
transition-property: all;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 1rem;
}
.list-item-link:hover {
color: rgba(255, 255, 255, 1);
background-color: hsla(162, 47%, 50%, 1);
}
.list-item-link:hover > span {
}
.list-item-link:hover > span > span {
color: rgba(243, 244, 246, 1);
}
.list-item-link:hover svg:last-child {
transform: translateX(0.25rem);
}
#other-links {
}
.button-pill {
padding: 1.5rem 2rem;
transition-duration: 300ms;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
align-items: center;
display: flex;
}
.button-pill svg {
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
flex-shrink: 0;
width: 3rem;
}
.button-pill > span {
letter-spacing: -0.025em;
font-weight: 400;
font-size: 1.125rem;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
.button-pill span span {
display: block;
font-size: 0.875rem;
font-weight: 300;
line-height: 1.25rem;
}
.button-pill:hover svg,
.button-pill:hover {
color: rgba(255, 255, 255, 1) !important;
}
#nx-console:hover {
background-color: rgba(0, 122, 204, 1);
}
#nx-console svg {
color: rgba(0, 122, 204, 1);
}
#nx-repo:hover {
background-color: rgba(24, 23, 23, 1);
}
#nx-repo svg {
color: rgba(24, 23, 23, 1);
}
#nx-cloud {
margin-bottom: 2rem;
margin-top: 2rem;
padding: 2.5rem 2rem;
}
#nx-cloud > div {
align-items: center;
display: flex;
}
#nx-cloud > div svg {
border-radius: 0.375rem;
flex-shrink: 0;
width: 3rem;
}
#nx-cloud > div h2 {
font-size: 1.125rem;
font-weight: 400;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
#nx-cloud > div h2 span {
display: block;
font-size: 0.875rem;
font-weight: 300;
line-height: 1.25rem;
}
#nx-cloud p {
font-size: 1rem;
line-height: 1.5rem;
margin-top: 1rem;
}
#nx-cloud pre {
margin-top: 1rem;
}
#nx-cloud a {
color: rgba(107, 114, 128, 1);
display: block;
font-size: 0.875rem;
line-height: 1.25rem;
margin-top: 1.5rem;
text-align: right;
}
#nx-cloud a:hover {
text-decoration: underline;
}
#commands {
padding: 2.5rem 2rem;
margin-top: 3.5rem;
}
#commands h2 {
font-size: 1.25rem;
font-weight: 400;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
#commands p {
font-size: 1rem;
font-weight: 300;
line-height: 1.5rem;
margin-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
}
details {
align-items: center;
display: flex;
margin-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
width: 100%;
}
details pre > span {
color: rgba(181, 181, 181, 1);
display: block;
}
summary {
border-radius: 0.5rem;
display: flex;
font-weight: 400;
padding: 0.5rem;
cursor: pointer;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
summary:hover {
background-color: rgba(243, 244, 246, 1);
}
summary svg {
height: 1.5rem;
margin-right: 1rem;
width: 1.5rem;
}
#love {
color: rgba(107, 114, 128, 1);
font-size: 0.875rem;
line-height: 1.25rem;
margin-top: 3.5rem;
opacity: 0.6;
text-align: center;
}
#love svg {
color: rgba(252, 165, 165, 1);
width: 1.25rem;
height: 1.25rem;
display: inline;
margin-top: -0.25rem;
}
@media screen and (min-width: 768px) {
#hero {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
#hero .logo-container {
display: flex;
}
#middle-content {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}

Просмотреть файл

@ -0,0 +1,22 @@
import ExampleHeader from '../components/ExampleHeader';
import './global.css';
export const metadata = {
title: 'Welcome to payments/next',
description: 'Generated by create-nx-workspace',
};
export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="en">
<body>
<ExampleHeader />
{children}
</body>
</html>
);
}

Просмотреть файл

@ -0,0 +1,414 @@
export default async function Index() {
/*
* Replace the elements below with your own.
*
* Note: The corresponding styles are in the ./index.css file.
*/
return (
<>
<div className="wrapper pt-16">
<div className="container">
<div id="welcome">
<h1>
<span> Hello there, </span>
Welcome payments/next 👋
</h1>
</div>
<div id="hero" className="rounded">
<div className="text-container">
<h2>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
/>
</svg>
<span>You&apos;re up and running</span>
</h2>
<a href="#commands"> What&apos;s next? </a>
</div>
<div className="logo-container">
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M11.987 14.138l-3.132 4.923-5.193-8.427-.012 8.822H0V4.544h3.691l5.247 8.833.005-3.998 3.044 4.759zm.601-5.761c.024-.048 0-3.784.008-3.833h-3.65c.002.059-.005 3.776-.003 3.833h3.645zm5.634 4.134a2.061 2.061 0 0 0-1.969 1.336 1.963 1.963 0 0 1 2.343-.739c.396.161.917.422 1.33.283a2.1 2.1 0 0 0-1.704-.88zm3.39 1.061c-.375-.13-.8-.277-1.109-.681-.06-.08-.116-.17-.176-.265a2.143 2.143 0 0 0-.533-.642c-.294-.216-.68-.322-1.18-.322a2.482 2.482 0 0 0-2.294 1.536 2.325 2.325 0 0 1 4.002.388.75.75 0 0 0 .836.334c.493-.105.46.36 1.203.518v-.133c-.003-.446-.246-.55-.75-.733zm2.024 1.266a.723.723 0 0 0 .347-.638c-.01-2.957-2.41-5.487-5.37-5.487a5.364 5.364 0 0 0-4.487 2.418c-.01-.026-1.522-2.39-1.538-2.418H8.943l3.463 5.423-3.379 5.32h3.54l1.54-2.366 1.568 2.366h3.541l-3.21-5.052a.7.7 0 0 1-.084-.32 2.69 2.69 0 0 1 2.69-2.691h.001c1.488 0 1.736.89 2.057 1.308.634.826 1.9.464 1.9 1.541a.707.707 0 0 0 1.066.596zm.35.133c-.173.372-.56.338-.755.639-.176.271.114.412.114.412s.337.156.538-.311c.104-.231.14-.488.103-.74z" />
</svg>
</div>
</div>
<div id="middle-content">
<div id="learning-materials" className="rounded shadow">
<h2>Learning materials</h2>
<a
href="https://nx.dev/getting-started/intro?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
/>
</svg>
<span>
Documentation
<span> Everything is in there </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://blog.nrwl.io/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
/>
</svg>
<span>
Blog
<span> Changelog, features & events </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
role="img"
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<title>YouTube</title>
<path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z" />
</svg>
<span>
YouTube channel
<span> Nx Show, talks & tutorials </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
/>
</svg>
<span>
Interactive tutorials
<span> Create an app, step-by-step </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://nxplaybook.com/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M12 14l9-5-9-5-9 5 9 5z" />
<path d="M12 14l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14z" />
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M12 14l9-5-9-5-9 5 9 5zm0 0l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14zm-4 6v-7.5l4-2.222"
/>
</svg>
<span>
Video courses
<span> Nx custom courses </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
</div>
<div id="other-links">
<a
id="nx-console"
className="button-pill rounded shadow"
href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<title>Visual Studio Code</title>
<path d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z" />
</svg>
<span>
Install Nx Console
<span>Plugin for VSCode</span>
</span>
</a>
<div id="nx-cloud" className="rounded shadow">
<div>
<svg
id="nx-cloud-logo"
role="img"
xmlns="http://www.w3.org/2000/svg"
stroke="currentColor"
fill="transparent"
viewBox="0 0 24 24"
>
<path
strokeWidth="2"
d="M23 3.75V6.5c-3.036 0-5.5 2.464-5.5 5.5s-2.464 5.5-5.5 5.5-5.5 2.464-5.5 5.5H3.75C2.232 23 1 21.768 1 20.25V3.75C1 2.232 2.232 1 3.75 1h16.5C21.768 1 23 2.232 23 3.75Z"
/>
<path
strokeWidth="2"
d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z"
/>
</svg>
<h2>
NxCloud
<span>Enable faster CI & better DX</span>
</h2>
</div>
<p>
You can activate distributed tasks executions and caching by
running:
</p>
<pre>nx connect-to-nx-cloud</pre>
<a
href="https://nx.app/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
{' '}
What is Nx Cloud?{' '}
</a>
</div>
<a
id="nx-repo"
className="button-pill rounded shadow"
href="https://github.com/nrwl/nx?utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
</svg>
<span>
Nx is open source
<span> Love Nx? Give us a star! </span>
</span>
</a>
</div>
</div>
<div id="commands" className="rounded shadow">
<h2>Next steps</h2>
<p>Here are some things you can do with Nx:</p>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
Add UI library
</summary>
<pre>
<span># Generate UI lib</span>
nx g @nx/next:library ui
<span># Add a component</span>
nx g @nx/next:component button --project=ui
</pre>
</details>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
View interactive project graph
</summary>
<pre>nx graph</pre>
</details>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
Run affected commands
</summary>
<pre>
<span># see what&apos;s been affected by changes</span>
nx affected:graph
<span># run tests for current changes</span>
nx affected:test
<span># run e2e tests for current changes</span>
nx affected:e2e
</pre>
</details>
</div>
<p id="love">
Carefully crafted with
<svg
fill="currentColor"
stroke="none"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"
/>
</svg>
</p>
</div>
</div>
</>
);
}

Просмотреть файл

@ -0,0 +1,13 @@
import { render, screen } from '@testing-library/react';
import '@testing-library/jest-dom';
import ExampleHeader from '.';
describe('Example Header', () => {
it('renders the example header', () => {
render(<ExampleHeader />);
const exampleHeader = screen.getByTestId('header');
expect(exampleHeader).toBeVisible();
});
});

Просмотреть файл

@ -0,0 +1,23 @@
import Image from 'next/image';
import firefoxLogo from '../../images/firefox-logo-combined.svg';
const ExampleHeader = () => {
return (
<header
className="bg-white fixed flex justify-between items-center shadow h-16 left-0 top-0 mx-auto my-0 px-4 py-0 w-full z-10 tablet:h-20"
role="banner"
data-testid="header"
>
<Image
src={firefoxLogo}
alt="Firefox logo"
className="object-contain"
data-testid="branding"
width={120}
height={120}
/>
</header>
);
};
export default ExampleHeader;

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

После

Ширина:  |  Высота:  |  Размер: 13 KiB

6
apps/payments/next/index.d.ts поставляемый Normal file
Просмотреть файл

@ -0,0 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
declare module '*.svg' {
const content: any;
export const ReactComponent: any;
export default content;
}

Просмотреть файл

@ -0,0 +1,10 @@
/* eslint-disable */
export default {
displayName: 'payments-next',
preset: '../../../jest.preset.js',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
};

5
apps/payments/next/next-env.d.ts поставляемый Normal file
Просмотреть файл

@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.

Просмотреть файл

@ -0,0 +1,22 @@
//@ts-check
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { composePlugins, withNx } = require('@nx/next');
/**
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
**/
const nextConfig = {
nx: {
// Set this to true if you would like to use SVGR
// See: https://github.com/gregberge/svgr
svgr: false,
},
};
const plugins = [
// Add more Next.js plugins to this list if needed.
withNx,
];
module.exports = composePlugins(...plugins)(nextConfig);

Просмотреть файл

@ -0,0 +1,22 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const PATH = process.env.PATH.split(':')
.filter((p) => !p.includes(process.env.TMPDIR))
.join(':');
module.exports = {
apps: [
{
name: 'payments-next',
script: 'nx serve payments-next',
max_restarts: '1',
min_uptime: '2m',
env: {
PATH,
},
filter_env: ['npm_'],
},
],
};

Просмотреть файл

@ -0,0 +1,10 @@
const { join } = require('path');
module.exports = {
plugins: {
tailwindcss: {
config: join(__dirname, 'tailwind.config.js'),
},
autoprefixer: {},
},
};

Просмотреть файл

@ -0,0 +1,83 @@
{
"name": "payments-next",
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/payments/next",
"projectType": "application",
"targets": {
"build": {
"executor": "@nx/next:build",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"outputPath": "dist/apps/payments/next",
"postcssConfig": "apps/payments/next/postcss.config.js"
},
"configurations": {
"development": {
"outputPath": "apps/payments/next"
},
"production": {}
}
},
"serve": {
"executor": "@nx/next:server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "payments-next:build",
"dev": true,
"port": 3035,
"postcssConfig": "apps/payments/next/postcss.config.js"
},
"configurations": {
"development": {
"buildTarget": "payments-next:build:development",
"dev": true
},
"production": {
"buildTarget": "payments-next:build:production",
"dev": false
}
}
},
"export": {
"executor": "@nx/next:export",
"options": {
"buildTarget": "payments-next:build:production"
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/payments/next/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/payments/next/**/*.{ts,tsx,js,jsx}"]
}
},
"start": {
"command": "pm2 start apps/payments/next/pm2.config.js"
},
"stop": {
"command": "pm2 stop apps/payments/next/pm2.config.js"
},
"restart": {
"command": "pm2 restart apps/payments/next/pm2.config.js"
},
"delete": {
"command": "pm2 delete apps/payments/next/pm2.config.js"
}
},
"tags": []
}

Просмотреть файл

Двоичные данные
apps/payments/next/public/favicon.ico Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 15 KiB

Просмотреть файл

@ -0,0 +1,16 @@
const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
const { join } = require('path');
module.exports = {
content: [
join(
__dirname,
'{src,pages,components,app}/**/*!(*.stories|*.spec).{ts,tsx,html}'
),
...createGlobPatternsForDependencies(__dirname),
],
theme: {
extend: {},
},
plugins: [],
};

Просмотреть файл

@ -0,0 +1,13 @@
import { render, screen } from '@testing-library/react';
import '@testing-library/jest-dom';
import Index from '../../app/page';
describe('Page', () => {
it('renders Page as expected', async () => {
render(await Index());
const header = screen.getByRole('heading', { level: 1 });
expect(header).toHaveTextContent('Hello there, Welcome payments/next 👋');
});
});

Просмотреть файл

@ -0,0 +1,37 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"jsx": "preserve",
"noEmit": true,
"isolatedModules": true,
"plugins": [
{
"name": "next"
}
],
"types": [
"jest",
"node"
],
"lib": [
"dom",
"dom.iterable",
"esnext"
]
},
"include": [
"**/*.ts",
"**/*.tsx",
"**/*.js",
"**/*.jsx",
"../../../apps/payments/next/.next/types/**/*.ts",
"../../../dist/apps/payments/next/.next/types/**/*.ts",
"next-env.d.ts"
],
"exclude": [
"node_modules",
"jest.config.ts",
"src/**/*.spec.ts",
"src/**/*.test.ts"
]
}

Просмотреть файл

@ -0,0 +1,21 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"],
"jsx": "react"
},
"include": [
"jest.config.ts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx",
"src/**/*.d.ts"
]
}

Просмотреть файл

@ -7,5 +7,4 @@ export default {
'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../../coverage/libs/payments/paypal',
};

13
nx.json
Просмотреть файл

@ -46,5 +46,18 @@
"workspaceLayout": {
"appsDir": "apps",
"libsDir": "libs"
},
"generators": {
"@nx/react": {
"application": {
"babel": true
}
},
"@nx/next": {
"application": {
"style": "none",
"linter": "eslint"
}
}
}
}

Просмотреть файл

@ -44,6 +44,7 @@
"knex": "^2.4.2",
"lint-staged": "^13.2.0",
"mysql": "^2.18.1",
"next": "13.4.1",
"node-fetch": "^2.6.7",
"nps": "^5.10.0",
"objection": "^3.0.1",
@ -89,9 +90,12 @@
]
},
"devDependencies": {
"@nx/eslint-plugin": "^16.3.2",
"@nx/jest": "16.3.1",
"@nx/js": "^16.3.1",
"@nx/js": "^16.3.2",
"@nx/next": "^16.3.2",
"@nx/node": "^16.3.1",
"@nx/react": "16.3.2",
"@nx/workspace": "16.5.2",
"@storybook/html-webpack5": "^7.0.23",
"@storybook/react-webpack5": "^7.0.23",
@ -104,10 +108,16 @@
"@types/react-test-renderer": "^18",
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"autoprefixer": "^10.4.14",
"babel-jest": "^29.4.1",
"eslint": "^7.32.0",
"eslint-config-next": "13.4.1",
"eslint-plugin-fxa": "workspace:*",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"jest-environment-node": "^29.4.1",
@ -117,11 +127,12 @@
"nx": "16.3.1",
"nx-cloud": "latest",
"persistgraphql": "^0.3.11",
"postcss": "^8.4.14",
"postcss": "^8.4.26",
"react-test-renderer": "^18.2.0",
"stylelint": "^15.10.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended-scss": "^12.0.0",
"tailwindcss": "^3.3.3",
"ts-jest": "29.1.0",
"ts-node": "^10.9.1",
"typescript": "^5.0.4"

Просмотреть файл

@ -3,7 +3,7 @@
"version": "0.0.0",
"description": "FxA Admin Panel",
"scripts": {
"build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css --postcss",
"build-css": "npx tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css --postcss",
"build-client": "tsc --build ../fxa-react && tsc --build && NODE_ENV=production yarn build-css && SKIP_PREFLIGHT_CHECK=true PUBLIC_URL=/ INLINE_RUNTIME_CHUNK=false CI=false NODE_OPTIONS=--openssl-legacy-provider rescripts build",
"build-server": "tsc -p server/tsconfig.json",
"extract-gql": "persistgraphql src ../../configs/gql/allowlist/fxa-admin-panel.json --js --extension=ts",
@ -69,7 +69,6 @@
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.57.1",
"autoprefixer": "^10.4.7",
"chance": "^1.1.8",
"eslint": "^7.32.0",
"eslint-config-react-app": "^6.0.0",
@ -80,11 +79,9 @@
"jest": "27.5.1",
"jest-watch-typeahead": "0.6.5",
"pm2": "^5.3.0",
"postcss": "^8.4.14",
"postcss-import": "^15.1.0",
"prettier": "^2.3.1",
"supertest": "^6.3.0",
"tailwindcss": "^3.3.1",
"tailwindcss-textshadow": "^2.1.3",
"ts-jest": "^29.1.0",
"typescript": "^4.9.3",

Просмотреть файл

@ -14,10 +14,8 @@ import crypto from 'crypto';
import {
setupAuthDatabase,
setupDatabase,
setupOAuthDatabase,
setupProfileDatabase,
} from 'fxa-shared/db';
import { Profile } from 'fxa-shared/db/models/profile';
const toRandomBuff = (size: number) =>
uuidTransformer.to(crypto.randomBytes(size).toString('hex'));

Просмотреть файл

@ -4,7 +4,7 @@
"description": "Firefox Accounts Content Server",
"scripts": {
"build": "tsc --build ../fxa-react && yarn l10n-prime && yarn build-css && NODE_ENV=production grunt build",
"build-css": "tailwindcss --postcss -i ./app/styles/tailwind.css -o ./app/styles/tailwind.out.css",
"build-css": "npx tailwindcss --postcss -i ./app/styles/tailwind.css -o ./app/styles/tailwind.out.css",
"compile": "tsc --noEmit",
"clean": "git clean -fXd",
"glean-generate": "yarn glean translate ../fxa-shared/metrics/glean/fxa-ui-pings.yaml ../fxa-shared/metrics/glean/fxa-ui-metrics.yaml -f javascript -o app/scripts/lib/glean",
@ -52,7 +52,6 @@
"@sentry/integrations": "^6.19.1",
"@sentry/node": "^6.19.1",
"asmcrypto.js": "^0.22.0",
"autoprefixer": "^10.4.7",
"babel-loader": "^9.1.2",
"backbone": "^1.4.1",
"backbone.cocktail": "0.5.15",
@ -177,7 +176,6 @@
"jsqr": "1.4.0",
"otplib": "^11.0.1",
"pm2": "^5.3.0",
"postcss": "^8.4.14",
"postcss-assets": "^6.0.0",
"postcss-import": "^15.1.0",
"prettier": "^2.3.1",
@ -187,7 +185,6 @@
"sinon": "4.5.0",
"sinon-chai": "^3.7.0",
"sinon-express-mock": "^2.2.1",
"tailwindcss": "^3.3.1",
"ts-loader": "^8.4.0",
"upng-js": "2.1.0",
"url-loader": "4.1.1",

Просмотреть файл

@ -3,7 +3,7 @@
"version": "0.0.0",
"description": "Firefox Accounts Payments Service",
"scripts": {
"build-css": "tailwindcss --postcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css",
"build-css": "npx tailwindcss --postcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css",
"compile": "tsc --noEmit",
"postinstall": "yarn l10n:prime fxa-payments-server",
"clean": "git clean -fXd",
@ -75,7 +75,7 @@
"@types/node": "^18.14.2",
"@types/postcss-import": "^12",
"@types/react-redux": "^7.1.18",
"@types/react-stripe-elements": "^6.0.5",
"@types/react-stripe-elements": "^6.0.6",
"@types/react-transition-group": "^4.4.2",
"@types/sinon": "10.0.1",
"@types/storybook__addon-actions": "^5.2.1",
@ -86,7 +86,6 @@
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.57.1",
"audit-filter": "^0.5.0",
"autoprefixer": "^10.4.7",
"babel-eslint": "^10.1.0",
"babel-loader": "^9.1.2",
"browserslist": "^4.21.4",
@ -105,7 +104,6 @@
"jest": "27.5.1",
"nock": "^13.3.0",
"pm2": "^5.3.0",
"postcss": "^8.4.14",
"postcss-import": "15.1.0",
"prettier": "^2.3.1",
"redux-devtools-extension": "^2.13.9",
@ -113,7 +111,6 @@
"storybook": "^7.0.23",
"storybook-addon-mock": "4.0.0",
"supertest": "^6.3.0",
"tailwindcss": "^3.3.1",
"ts-jest": "^29.1.0",
"typescript": "^4.9.3",
"wait-for-expect": "^3.0.2",

Просмотреть файл

@ -160,7 +160,18 @@ export const App = ({
);
};
export class AppErrorBoundary extends React.Component {
interface AppErrorBoundaryProps {
children?: React.ReactNode;
}
interface AppErrorBoundaryState {
error: Error | undefined;
}
export class AppErrorBoundary extends React.Component<
AppErrorBoundaryProps,
AppErrorBoundaryState
> {
state: {
error: undefined | Error;
};

Просмотреть файл

@ -5,7 +5,7 @@ import ReactDOM from 'react-dom';
import { Localized } from '@fluent/react';
import * as apiClient from '../../lib/apiClient';
import { Customer, Plan, Profile } from '../../store/types';
import { Customer, Plan } from '../../store/types';
import { SubscriptionCreateAuthServerAPIs } from '../../routes/Product/SubscriptionCreate';
import { PaymentUpdateAuthServerAPIs } from '../../routes/Subscriptions/PaymentUpdateForm';
@ -155,6 +155,7 @@ export const PaypalButton = ({
},
[
apiClientOverrides,
checkoutType,
customer,
priceId,
productId,

Просмотреть файл

@ -4,8 +4,6 @@ import { PriceDetails, PriceDetailsProps } from '.';
import MockApp from '../../../.storybook/components/MockApp';
import { SignInLayout } from '../AppLayout';
import Stripe from 'stripe';
export default {
title: 'components/PriceDetails',
component: PriceDetails,
@ -16,17 +14,6 @@ const defaultProps: PriceDetailsProps = {
currency: 'USD',
};
type PriceDetailsProps2 = {
total: number;
currency: string;
tax?: number;
showTax?: boolean;
interval?: Stripe.Plan.Interval;
intervalCount?: number;
className?: string;
dataTestId?: string;
};
const storyWithParams = ({
locale = 'en',
props,

Просмотреть файл

@ -16,7 +16,6 @@ import {
SubsequentInvoicePreview,
} from 'fxa-shared/dto/auth/payments/invoice';
import { CouponDetails } from 'fxa-shared/dto/auth/payments/coupon';
import customer from './customer';
import { CheckoutType } from 'fxa-shared/subscriptions/types';
// TODO: Use a better type here

Просмотреть файл

@ -10,7 +10,7 @@ import {
} from '@stripe/stripe-js';
import { CheckoutType } from 'fxa-shared/subscriptions/types';
import { SubscriptionCreateAuthServerAPIs } from '../routes/Product/SubscriptionCreate';
import { Customer, Plan, Profile } from '../store/types';
import { Customer, Plan } from '../store/types';
import {
handlePasswordlessSignUp,
PasswordlessSignupHandlerParam,

Просмотреть файл

@ -6,7 +6,18 @@ import React from 'react';
import AppErrorDialog from '../AppErrorDialog';
import sentryMetrics from 'fxa-shared/lib/sentry';
class AppErrorBoundary extends React.Component {
interface AppErrorBoundaryProps {
children?: React.ReactNode;
}
interface AppErrorBoundaryState {
error: Error | undefined;
}
class AppErrorBoundary extends React.Component<
AppErrorBoundaryProps,
AppErrorBoundaryState
> {
state: {
error: undefined | Error;
};

Просмотреть файл

@ -12,7 +12,7 @@
"./lib/": "./lib/"
},
"scripts": {
"build-css": "tailwindcss -i ./styles/tailwind.css -o ./styles/tailwind.out.css",
"build-css": "npx tailwindcss -i ./styles/tailwind.css -o ./styles/tailwind.out.css",
"build-storybook": "yarn merge-ftl && NODE_ENV=production yarn build-css && NODE_OPTIONS=--openssl-legacy-provider storybook build && cp -r public/locales ./storybook-static/locales",
"build": "tsc --build && yarn merge-ftl",
"compile": "tsc --noEmit",
@ -39,7 +39,6 @@
"classnames": "^2.3.1",
"fetch-mock": "^9.11.0",
"fxa-shared": "workspace:*",
"postcss": "^8.4.23",
"react-helmet": "^6.1.0",
"react-transition-group": "^4.4.2",
"sinon": "^9.2.3",
@ -90,7 +89,6 @@
"rimraf": "^5.0.0",
"sass-loader": "^10.0.3",
"storybook": "^7.0.23",
"tailwindcss": "^3.3.1",
"ts-jest": "^29.1.0",
"typescript": "^4.9.3",
"webpack": "^5.84.1"

Просмотреть файл

@ -4,7 +4,7 @@
"homepage": "https://accounts.firefox.com/settings",
"private": true,
"scripts": {
"build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css --postcss",
"build-css": "npx tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css --postcss",
"build-storybook": "yarn merge-ftl && NODE_ENV=production STORYBOOK_BUILD=1 yarn build-css && yarn legal-clone && LOG_LEVEL=TRACE NODE_OPTIONS=--openssl-legacy-provider storybook build && cp -r public/locales ./storybook-static/locales",
"extract-gql": "persistgraphql src ../../configs/gql/allowlist/fxa-settings.json --js --extension=ts ",
"build": "tsc --build ../fxa-react && NODE_ENV=production yarn build-css && yarn legal-clone && yarn merge-ftl && SKIP_PREFLIGHT_CHECK=true INLINE_RUNTIME_CHUNK=false NODE_OPTIONS=--openssl-legacy-provider rescripts build",
@ -129,7 +129,6 @@
"@types/testing-library__react-hooks": "^4",
"@types/uuid": "^8",
"@types/webpack": "5.28.0",
"autoprefixer": "^10.4.7",
"babel-loader": "^9.1.2",
"babel-plugin-named-exports-order": "^0.0.2",
"css-loader": "^3.6.0",
@ -145,7 +144,6 @@
"jest-watch-typeahead": "0.6.5",
"mutationobserver-shim": "^0.3.7",
"pm2": "^5.3.0",
"postcss": "^8.4.14",
"postcss-assets": "^6.0.0",
"postcss-import": "^15.1.0",
"prop-types": "^15.8.1",
@ -153,7 +151,6 @@
"storybook": "^7.0.23",
"storybook-addon-rtl": "^0.5.0",
"style-loader": "^1.3.0",
"tailwindcss": "^3.3.1",
"webpack": "^5.84.1"
}
}

Просмотреть файл

@ -209,21 +209,23 @@ export const PageDeleteAccount = (_: RouteComponentProps) => {
))}
</ul>
<Localized id="pocket-delete-notice"
elems={{
a: (
<LinkExternal
href="https://help.getpocket.com/article/986-canceling-your-pocket-premium-subscription"
data-testid="link-pocket-delete-notice"
className="link-blue"
>
cancel your subscription
</LinkExternal>
),
}}
<Localized
id="pocket-delete-notice"
elems={{
a: (
<LinkExternal
href="https://help.getpocket.com/article/986-canceling-your-pocket-premium-subscription"
data-testid="link-pocket-delete-notice"
className="link-blue"
>
cancel your subscription
</LinkExternal>
),
}}
>
<p className="mb-4">
If you subscribe to Pocket Premium, please make sure that you <a>cancel your subscription</a> before deleting your account.
<p className="mb-4">
If you subscribe to Pocket Premium, please make sure that you{' '}
<a>cancel your subscription</a> before deleting your account.
</p>
</Localized>
<Localized id="delete-account-acknowledge">

Просмотреть файл

@ -7,7 +7,7 @@ import { screen } from '@testing-library/react';
import Security from '.';
import { mockAppContext, renderWithRouter } from '../../../models/mocks';
import { Account, AppContext } from '../../../models';
import { getFtlBundle, testAllL10n, testL10n } from 'fxa-react/lib/test-utils';
import { getFtlBundle, testAllL10n } from 'fxa-react/lib/test-utils';
import { FluentBundle } from '@fluent/bundle';
describe('Security', () => {

Просмотреть файл

@ -44,7 +44,7 @@ export class Random {
// 32-bit unsigned int for each element and map it to a float in [0,1).
// This requires 4 bytes of randomness per element.
const bytes = this.getRandomBytes(len);
const out = [];
const out: string[] = [];
for (let i = 0; i < len; i++) {
const r = bytes[i] / 2 ** 32;

Просмотреть файл

@ -23,7 +23,7 @@ export function useAccount() {
}
function getMissing(obj: any) {
const missingKeys = [];
const missingKeys: string[] = [];
for (const x of Object.keys(obj)) {
if (obj[x] == null) {
missingKeys.push(x);

Просмотреть файл

@ -11,7 +11,7 @@
"@testing-library/jest-dom"
],
"isolatedModules": true,
"noEmit": true
"noEmit": true,
},
"include": [
"src"

Просмотреть файл

@ -24,7 +24,7 @@
"useUnknownInCatchVariables": false,
"baseUrl": ".",
"paths": {
"@fxa/payments/paypal": ["libs/payments/paypal/src/index.ts"]
"@fxa/payments/paypal": ["libs/payments/paypal/src/index.ts"],
},
"typeRoots": [
"./types",

1730
yarn.lock

Разница между файлами не показана из-за своего большого размера Загрузить разницу