diff --git a/README.md b/README.md index 0b91c9aa6..fb7b2c262 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ This repo contains the source code and documentation powering [reactjs.org](http 1. Node: any 12.x version starting with v12.0.0 or greater 1. Yarn v1: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/) 1. A fork of the repo (for any contributions) -1. A clone of the [reactjs.org repo](https://github.com/reactjs/reactjs.org) on your local machine +1. A clone of the [reactjs.org repo](https://github.com/reactjs/ur.reactjs.org) on your local machine ### Installation -1. `cd reactjs.org` to go into the project root +1. `cd ur.reactjs.org` to go into the project root 1. `yarn` to install the website's npm dependencies ### Running locally @@ -26,11 +26,11 @@ This repo contains the source code and documentation powering [reactjs.org](http ### Guidelines -The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections. +The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/ur.reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections. ### Create a branch -1. `git checkout main` from any folder in your local `reactjs.org` repository +1. `git checkout main` from any folder in your local `ur.reactjs.org` repository 1. `git pull origin main` to ensure you have the latest main code 1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch diff --git a/content/community/courses.md b/content/community/courses.md index 7e532bbd1..f83c2c60c 100644 --- a/content/community/courses.md +++ b/content/community/courses.md @@ -1,60 +1,69 @@ --- id: courses -title: Courses +title: نصاب layout: community sectionid: community permalink: community/courses.html --- -## Free Courses {#free-courses} +## مفت نصاب {#free-courses} -- [Glitch: React Starter Kit](https://glitch.com/glimmer/post/react-starter-kit) - A free, 5-part video course with interactive code examples that will help you learn React. -- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codecademy's introductory course for React. +- [Glitch: React Starter Kit](https://glitch.com/glimmer/post/react-starter-kit/) - متعامل کوڈ کی مثالوں کے ساتھ ۵ حصوں پر مبنی ایک مفت ویڈیو کورس جوآپ کو React سیکھنے میں مدد دے گا۔ -- [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - This series will explore the basic fundamentals of React to get you started. +- [Codecademy: React 101](https://www.codecademy.com/learn/react-101) - Codeacademy کا React کے لیے تعارفی کورس -- [React Crash Course 2018](https://www.youtube.com/watch?v=Ke90Tje7VS0) - A beginner-friendly crash course through the most important React topics. +- [Egghead.io: Start Learning React](https://egghead.io/courses/start-learning-react) - یہ سبق آموز سلسلہ آپ کو React لائبریری کی بنیادی باتیں سکھائے گا ۔ -- [Frontend Armory: React Fundamentals](https://frontarm.com/courses/react-fundamentals/) - Learn React without the buzzwords. +- [React Crash Course 2018](https://www.youtube.com/watch?v=Ke90Tje7VS0) - React لائبریری کے انتہائی اہم موضوعات کی وضاحت کرنے والے ابتدائیہ افراد کے لئے ایک خصوصی تربیتی کورس ۔ -- [Egghead.io: The Beginner's Guide to ReactJS](https://egghead.io/courses/the-beginner-s-guide-to-react) - Free course for React newbies and those looking to get a better understanding of React fundamentals. +- [React Armory: Learn React by Itself](https://reactarmory.com/guides/learn-react-by-itself) - React کے وسائل کے ساتھ ، آپ رمزيہ الفاظ کے بغیر React سیکھ سکتے ہیں ۔ -- [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - Recordings from three days of a free online React bootcamp. +- [Egghead.io: The Beginner's Guide to ReactJS ](https://egghead.io/courses/the-beginner-s-guide-to-reactjs) - React کے نئے طلباء اور React کے بنیادی اصولوں کی بہتر تفہیم حاصل کرنے کے خواہاں افراد کے لئے مفت کورس ۔ -- [Scrimba: Learn React for free](https://scrimba.com/g/glearnreact) - 48 hands-on video tutorials building react apps. +- [Free React Bootcamp](https://tylermcginnis.com/free-react-bootcamp/) - React کے مفت تربیتی کیمپ کی تین دن کی مفت آن لائن ریکارڈنگ ۔ + +- [Scrimba: Learn React for free](https://scrimba.com/g/glearnreact) - React app کی تعمیر میں 48 ویڈیو سبق ۔ - [University of Helsinki: Full Stack Open MOOC](https://fullstackopen.com/en/) - Learn to build web applications with React. Available in English, Spanish, Chinese and Finnish. -## Paid Courses {#paid-courses} +## ادا کردہ سبق {#paid-courses} +<<<<<<< HEAD +- [Egghead.io](https://egghead.io/browse/frameworks/react) - React اور بہت سے دوسرے عنوانات پر مختصر تدریسی ویڈیوز ۔ +======= - [Meta Front-End Developer Professional Certificate](https://www.coursera.org/professional-certificates/meta-front-end-developer) - Launch your career as a front-end developer. Build job-ready skills for an in-demand career and earn a credential from Meta. No degree or prior experience required to get started. - [Egghead.io](https://egghead.io/browse/frameworks/react) - Short instructional videos on React and many other topics. +>>>>>>> c883f623d597852b49f9314bb8133442ef9d3298 -- [Frontend Masters](https://frontendmasters.com/learn/react/) - Video courses on React. +- [Frontend Masters](https://frontendmasters.com/courses/) - React لائبریری اور دیگر Frontend فریم ورک کو سیکھنے کے لئے ویڈیو کورسز کی تربیت کرنا ۔ -- [Fullstack React](https://www.fullstackreact.com/) - The up-to-date, in-depth, complete guide to React and friends. +- [Fullstack React](https://www.fullstackreact.com/) - تازہ ترین ، گہرائی میں ، مکمل رہنمای کے ساتھ React دستیاب ھے ۔ دستیاب ھے ۔ -- [Pure React](https://daveceddia.com/pure-react/) - A step-by-step guide to mastering React. +- [Pure React](https://daveceddia.com/pure-react/) - React میں مہارت حاصل کرنے کے لئے ایک قدم بہ قدم رہنما ۔ -- [React for Beginners](https://reactforbeginners.com/) - Learn React in just a couple of afternoons. +- [React for Beginners](https://reactforbeginners.com/) - صرف چند دن میں React سیکھین ۔ + +- [React for Designers](https://designcode.io/react) - React کا 6 گھنٹے کا کورس ڈیزائنرز کے ذریعہ ، ڈیزائنرز کے لئے۔ -- [React for Designers](https://designcode.io/react) - A 6-hour React course for designers, by designers. +- [React Essentials for Designers](https://learnreact.design) - React +ڈیزائنرز کے لئے تیار کردہ کورسز: بنیادی اصول ، قابلیت ، حدود اور ان کا ڈیزائن سے کس طرح تعلق ہے ۔ + +- [Essential React](https://learnreact.com/lessons/2018-essential-react-1-overview) - کوڈ لکھ کر سیکھنا پسند کرنے والوں کے لئے ایک تعلیمی نصاب ، یہ کورس انہیں جلدی سیکھنے اور جدید ترین ایپلیکیشنز بنانے کے قابل بنائے گا ۔ -- [React Essentials for Designers](https://learnreact.design) - React courses tailored for designers: the fundamentals, capabilities, limitations and how they relate to design. -- [Essential React](https://learnreact.com/lessons/2018-essential-react-1-overview) - A crash course for doers, moving fast from "Hello World" to advanced component composition. +- [React Training: Advanced React.js](https://courses.reacttraining.com/p/advanced-react) - React میں اپنی صلاحیتوں کو ترقی دیں ۔ -- [React Training: Advanced React.js](https://courses.reacttraining.com/p/advanced-react) - Take your React skills to the next level. +- [Tyler McGinnis](https://tylermcginnis.com/courses) - Tyler McGinnis کے ساتھ سیکھیں ، جو ماہانہ تربیتی سیشن پیش کرتا ہے۔ ان کورسز میں بنیادی باتیں سیکھنا بھی شامل ہے ۔ +<<<<<<< HEAD +- [Mastering React](https://codewithmosh.com/p/mastering-react/) - React لائبریری کے ساتھ انٹرایکٹو ایپلی کیشنز بنائیں ۔ +======= - [Tyler McGinnis](https://ui.dev/) - Tyler McGinnis provides access to his courses for a monthly fee. Courses include "React Fundamentals" and "Universal React". +>>>>>>> 2310e15532aba273d713996a4c6ef04247dff764 -- [Mastering React](https://codewithmosh.com/p/mastering-react/) - Build professional interactive apps with React. - -- [React Tutorial](https://react-tutorial.app) - Learn React step by step in an interactive environment with flashcards. - -- [Road to React](https://www.roadtoreact.com/) - Your journey to master React in JavaScript. +- [Road to React](https://www.roadtoreact.com/) - React میں عبور حاصل کرنے کے لیے آپ کا سفر ۔ -- [Epic React](https://epicreact.dev/) - Confidently Ship Well-Architected Production Ready React Apps Like a Pro +- [Epic React](https://epicreact.dev/) - اعتماد کے ساتھ اعلی میعار کی پروڈکشن ایپلی کیشنز بنائیں diff --git a/content/docs/handling-events.md b/content/docs/handling-events.md index 6f2e6ed6d..e06c4551f 100644 --- a/content/docs/handling-events.md +++ b/content/docs/handling-events.md @@ -1,6 +1,6 @@ --- id: handling-events -title: Handling Events +title: Event Handling کی ترتیب permalink: docs/handling-events.html prev: state-and-lifecycle.html next: conditional-rendering.html @@ -8,12 +8,12 @@ redirect_from: - "docs/events-ko-KR.html" --- -Handling events with React elements is very similar to handling events on DOM elements. There are some syntax differences: +React اور DOM دونوں میں event handling کی ترتیب ایک دوسرے سے مشابہت رکھتی ہے لیکن ان دونوں کے لکھنے کا انداز مختلف ہے -* React events are named using camelCase, rather than lowercase. -* With JSX you pass a function as the event handler, rather than a string. +* React events کو lowercase کے بجائے camelCase میں لکھا جاتا ہے +* JSX میں آپ event handler کو string کے بجائے function کے طور پر پیش کرتے ہیں -For example, the HTML: +مثلاً یہ HTML ```html ``` -is slightly different in React: +React میں یوں لکھا جائے گا ```js{1} ``` -The above two lines are equivalent, and use [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions) and [`Function.prototype.bind`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/Function/bind) respectively. +یہ دونوں ترتیبات برابر ہیں جو کہ [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions) اور [`Function.prototype.bind`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/Function/bind) کا استعمال کر رہی ہیں -In both cases, the `e` argument representing the React event will be passed as a second argument after the ID. With an arrow function, we have to pass it explicitly, but with `bind` any further arguments are automatically forwarded. +یہاں `e` argument ایک React event ہے جو کی ID کے بعد دوسرے argument کی طرح پیش کیا جائے گا، ایک arrow function کے ساتھ ہم اسے واضح طور پر پیش کریں گے جب کہ `bind` کے استعمال میں باقی arguments خود بخود آگے پیش کر دیئے جائیں گے diff --git a/src/components/ButtonLink/ButtonLink.js b/src/components/ButtonLink/ButtonLink.js index 0732aa05f..c7bffd18d 100644 --- a/src/components/ButtonLink/ButtonLink.js +++ b/src/components/ButtonLink/ButtonLink.js @@ -39,7 +39,9 @@ const ButtonLink = ({children, type, ...rest}) => { return ( {children} - {type === 'secondary' && } + {type === 'secondary' && ( + + )} ); }; diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js index dbf21abde..dd2f9a33e 100644 --- a/src/components/CodeEditor/CodeEditor.js +++ b/src/components/CodeEditor/CodeEditor.js @@ -77,6 +77,7 @@ class CodeEditor extends Component { return (
{ '& p': { marginTop: 15, - marginRight: 40, + marginLeft: 40, lineHeight: 1.7, [media.greaterThan('xlarge')]: { diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js index 143fb7dda..78783d1ca 100644 --- a/src/components/Layout/Layout.js +++ b/src/components/Layout/Layout.js @@ -35,6 +35,7 @@ class Template extends Component { return (
( cssProps={{ verticalAlign: -2, display: 'inline-block', - marginLeft: 5, + marginRight: 5, color: colors.subtle, }} /> diff --git a/src/components/LayoutFooter/Footer.js b/src/components/LayoutFooter/Footer.js index 06bc37697..d075602f8 100644 --- a/src/components/LayoutFooter/Footer.js +++ b/src/components/LayoutFooter/Footer.js @@ -22,6 +22,7 @@ import ossLogoPng from 'images/oss_logo.png'; const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
( flexWrap: 'wrap', [media.between('small', 'medium')]: { - paddingRight: layoutHasSidebar ? 240 : null, + paddingLeft: layoutHasSidebar ? 240 : null, }, [media.between('large', 'largerSidebar')]: { - paddingRight: layoutHasSidebar ? 280 : null, + paddingLeft: layoutHasSidebar ? 280 : null, }, [media.between('largerSidebar', 'sidebarFixed', true)]: { - paddingRight: layoutHasSidebar ? 380 : null, + paddingLeft: layoutHasSidebar ? 380 : null, }, }}>
( }, [media.greaterThan('xlarge')]: { width: 'calc(100% / 3 * 2)', - paddingLeft: 40, + paddingRight: 40, }, }}> @@ -109,10 +110,11 @@ const Footer = ({layoutHasSidebar = false}: {layoutHasSidebar: boolean}) => (
specifics - + paddingLeft: 40, [media.greaterThan('xlarge')]: { width: 'calc(100% / 3)', order: -1, diff --git a/src/components/LayoutHeader/DocSearch.js b/src/components/LayoutHeader/DocSearch.js index 3f9fc2af6..a86c0af8c 100644 --- a/src/components/LayoutHeader/DocSearch.js +++ b/src/components/LayoutHeader/DocSearch.js @@ -46,7 +46,7 @@ class DocSearch extends Component<{}, State> { paddingRight: '0.25rem', [media.lessThan('expandedSearch')]: { justifyContent: 'flex-end', - marginRight: 10, + marginLeft: 10, }, // TODO: Something like this could show the full search box in more cases // but it currently breaks its expanding animation. @@ -59,6 +59,7 @@ class DocSearch extends Component<{}, State> { }, }}> { fontWeight: 300, fontFamily: 'inherit', position: 'relative', - padding: '4px 4px 4px 29px', + padding: '5px 29px 5px 5px', backgroundImage: 'url(/search.svg)', backgroundSize: '16px 16px', backgroundRepeat: 'no-repeat', backgroundPositionY: 'center', - backgroundPositionX: '4px', + backgroundPositionX: '98%', ':focus': { outline: 0, @@ -86,10 +87,10 @@ class DocSearch extends Component<{}, State> { fontSize: 16, width: '16px', transition: 'width 0.2s ease, padding 0.2s ease', - paddingLeft: '16px', + paddingRight: '16px', ':focus': { - paddingLeft: '29px', + paddingRight: '29px', width: '8rem', outline: 'none', }, diff --git a/src/components/LayoutHeader/Header.js b/src/components/LayoutHeader/Header.js index e4ac955fd..919b06d53 100644 --- a/src/components/LayoutHeader/Header.js +++ b/src/components/LayoutHeader/Header.js @@ -32,6 +32,7 @@ const ContainerWrapper = ({children}) => ( const Header = ({location}: {location: Location}) => (
( }, }} to="/"> - ( }}> React +
diff --git a/src/components/StickyResponsiveSidebar/StickyResponsiveSidebar.js b/src/components/StickyResponsiveSidebar/StickyResponsiveSidebar.js index cdcbbfd14..254c118c1 100644 --- a/src/components/StickyResponsiveSidebar/StickyResponsiveSidebar.js +++ b/src/components/StickyResponsiveSidebar/StickyResponsiveSidebar.js @@ -77,8 +77,8 @@ class StickyResponsiveSidebar extends Component { [media.lessThan('small')]: smallScreenSidebarStyles, [media.greaterThan('medium')]: { - marginRight: -999, - paddingRight: 999, + marginLeft: -999, + paddingLeft: 999, backgroundColor: '#f7f7f7', }, @@ -94,8 +94,8 @@ class StickyResponsiveSidebar extends Component { height: 'calc(100vh - 60px)', overflowY: 'auto', WebkitOverflowScrolling: 'touch', - marginRight: -999, - paddingRight: 999, + marginLeft: -999, + paddingLeft: 999, backgroundColor: '#f7f7f7', opacity: '1 !important', }, @@ -109,7 +109,7 @@ class StickyResponsiveSidebar extends Component { }, [media.greaterThan('sidebarFixed')]: { - borderLeft: '1px solid #ececec', + borderRight: '1px solid #ececec', }, }}>
{ display: 'none', // gets overriden at small screen sizes cursor: 'pointer', position: 'fixed', - right: 20, + left: 20, zIndex: 3, borderRadius: '50%', border: '1px solid rgba(255, 255, 255, 0.1)', @@ -185,14 +185,14 @@ class StickyResponsiveSidebar extends Component { diff --git a/src/pages/index.js b/src/pages/index.js index 3e16f93cb..5f6befb16 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -203,23 +203,23 @@ class Home extends Component { display: 'flex', flexDirection: 'column', flex: '0 1 33%', - marginLeft: 40, + marginRight: 40, '&:first-of-type': { - marginLeft: 0, + marginRight: 0, [media.lessThan('medium')]: { - marginLeft: 10, + marginRight: 10, }, }, [media.lessThan('medium')]: { display: 'inline-block', verticalAlign: 'top', - marginLeft: 0, + marginRight: 0, whiteSpace: 'normal', width: '75%', - marginRight: 20, + marginLeft: 20, paddingBottom: 40, '&:first-of-type': { @@ -329,13 +329,13 @@ const CtaItem = ({children, primary = false}) => ( }, [media.greaterThan('xlarge')]: { - paddingLeft: 40, + paddingRight: 40, }, '&:first-child': { - textAlign: 'right', + textAlign: 'left', paddingRight: 7, - paddingLeft: 7, + paddingLeft: 15, [media.lessThan('small')]: { marginBottom: 10, }, @@ -345,7 +345,7 @@ const CtaItem = ({children, primary = false}) => ( paddingRight: 7, paddingLeft: 7, [media.greaterThan('small')]: { - paddingLeft: 15, + paddingRight: 15, }, [media.lessThan('small')]: { marginBottom: 10, diff --git a/src/templates/components/NavigationFooter/NavigationFooter.js b/src/templates/components/NavigationFooter/NavigationFooter.js index 6672ec3cb..669a52b83 100644 --- a/src/templates/components/NavigationFooter/NavigationFooter.js +++ b/src/templates/components/NavigationFooter/NavigationFooter.js @@ -26,15 +26,15 @@ const NavigationFooter = ({next, prev, location}) => { halign="space-between" css={{ [media.between('small', 'medium')]: { - paddingRight: 240, + paddingLeft: 240, }, [media.between('large', 'largerSidebar')]: { - paddingRight: 280, + paddingLeft: 280, }, [media.between('largerSidebar', 'sidebarFixed', true)]: { - paddingRight: 380, + paddingLeft: 380, }, }}> diff --git a/src/templates/components/Sidebar/Section.js b/src/templates/components/Sidebar/Section.js index 5c2983175..4bfcccdce 100644 --- a/src/templates/components/Sidebar/Section.js +++ b/src/templates/components/Sidebar/Section.js @@ -47,7 +47,6 @@ class Section extends React.Component { }, }, }}> - {section.title} + {section.title}
    +
      {item.subitems.map(subitem => (
    • {createLink({ diff --git a/src/templates/components/Sidebar/Sidebar.js b/src/templates/components/Sidebar/Sidebar.js index 13ab56061..f54b5c439 100644 --- a/src/templates/components/Sidebar/Sidebar.js +++ b/src/templates/components/Sidebar/Sidebar.js @@ -38,11 +38,11 @@ class Sidebar extends Component { halign="stretch" css={{ width: '100%', - paddingLeft: 20, + paddingRight: 20, position: 'relative', [media.greaterThan('largerSidebar')]: { - paddingLeft: 40, + paddingRight: 40, }, [media.lessThan('small')]: { diff --git a/src/theme.js b/src/theme.js index 65071aae6..e00397053 100644 --- a/src/theme.js +++ b/src/theme.js @@ -144,17 +144,17 @@ const sharedStyles = { flexDirection: 'column', [media.between('small', 'sidebarFixed')]: { - borderLeft: '1px solid #ececec', - marginLeft: 80, + borderRight: '1px solid #ececec', + marginRight: 80, }, [media.between('small', 'largerSidebar')]: { flex: '0 0 200px', - marginLeft: 80, + marginRight: 80, }, [media.between('small', 'medium')]: { - marginLeft: 40, + marginRight: 40, }, [media.greaterThan('largerSidebar')]: { @@ -163,7 +163,7 @@ const sharedStyles = { [media.greaterThan('sidebarFixed')]: { position: 'fixed', - right: 0, + left: 0, width: 300, zIndex: 2, }, @@ -221,6 +221,7 @@ const sharedStyles = { marginBottom: 25, paddingLeft: 15, paddingRight: 15, + direction: 'ltr', [media.lessThan('small')]: { marginLeft: -20, @@ -272,6 +273,8 @@ const sharedStyles = { '& p > code, & li > code': { background: hex2rgba(colors.note, 0.2), color: colors.text, + direction: 'ltr', + display: 'inline-block', }, '& p > code, & li > code, & p > a > code, & li > a > code': { @@ -392,7 +395,7 @@ const sharedStyles = { marginTop: 20, fontSize: 16, color: colors.text, - paddingLeft: 20, + paddingRight: 20, '& p, & p:first-of-type': { fontSize: 16, @@ -409,7 +412,7 @@ const sharedStyles = { }, '& ol, & ul': { - marginLeft: 20, + marginRight: 20, marginTop: 10, }, }, @@ -428,10 +431,10 @@ const sharedStyles = { '& blockquote': { backgroundColor: hex2rgba('#ffe564', 0.3), - borderLeftColor: colors.note, - borderLeftWidth: 9, - borderLeftStyle: 'solid', - padding: '20px 45px 20px 26px', + borderRightColor: colors.note, + borderRightWidth: 9, + borderRightStyle: 'solid', + padding: '20px 26px 20px 45px', marginBottom: 30, marginTop: 20, marginLeft: -30, diff --git a/src/utils/createLink.js b/src/utils/createLink.js index efefe0b2a..0fe659a70 100644 --- a/src/utils/createLink.js +++ b/src/utils/createLink.js @@ -102,14 +102,14 @@ const activeLinkCss = { const activeLinkBefore = { width: 4, height: 25, - borderLeft: `4px solid ${colors.brand}`, - paddingLeft: 16, + borderRight: `4px solid ${colors.brand}`, + paddingRight: 16, position: 'absolute', - left: 0, + right: 0, marginTop: -3, [media.greaterThan('largerSidebar')]: { - left: 15, + right: 15, }, }; diff --git a/yarn.lock b/yarn.lock index c0b5ad996..27209ef0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11464,9 +11464,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== path-to-regexp@0.1.7: version "0.1.7" @@ -15309,9 +15309,15 @@ uri-js@^4.2.2: punycode "^2.1.0" urijs@^1.19.2: +<<<<<<< HEAD + version "1.19.2" + resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.2.tgz#f9be09f00c4c5134b7cb3cf475c1dd394526265a" + integrity sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w== +======= version "1.19.10" resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.10.tgz#8e2fe70a8192845c180f75074884278f1eea26cb" integrity sha512-EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg== +>>>>>>> 1d21630e126af0f4c04ff392934dcee80fc54892 urix@^0.1.0: version "0.1.0" @@ -15342,9 +15348,15 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.1.8, url-parse@^1.4.3: +<<<<<<< HEAD + version "1.4.7" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" + integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== +======= version "1.5.10" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== +>>>>>>> 1d21630e126af0f4c04ff392934dcee80fc54892 dependencies: querystringify "^2.1.1" requires-port "^1.0.0"