Skip to content

Commit

Permalink
merge conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
KMJ-007 committed Feb 21, 2024
2 parents 0a61c6e + fab09cc commit 14b24ca
Show file tree
Hide file tree
Showing 766 changed files with 13,591 additions and 26,347 deletions.
6 changes: 6 additions & 0 deletions .changeset/nasty-lemons-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@react-pdf/pdfkit": patch
"@react-pdf/image": patch
---

fix: bump jay-peg dependency to fix CJS module resolution error
5 changes: 5 additions & 0 deletions .changeset/ninety-glasses-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@react-pdf/renderer': minor
---

Pass \_INTERNAL\_\_LAYOUT\_\_DATA\_ to onRenderCallback in toBuffer
5 changes: 5 additions & 0 deletions .changeset/seven-bottles-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-pdf/layout": patch
---

fix: resolve styles on dynamic elements
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.gitignore
node_modules
lib
rollup.config.js
dist
packages/pdfkit
43 changes: 0 additions & 43 deletions .eslintrc.js

This file was deleted.

65 changes: 65 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"env": {
"browser": true,
"es6": true,
"node": true
},
"extends": [
"plugin:react/recommended",
"airbnb",
"prettier",
"plugin:react/jsx-runtime"
],
"globals": {
"URL": false,
"BROWSER": false,
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"plugins": ["react"],
"rules": {
"arrow-body-style": 0,
"default-case-last": 0,
"default-param-last": 0,
"func-names": 0,
"import/no-named-as-default": 0,
"import/no-unresolved": ["error", { "ignore": ["^yoga-layout"] }],
"no-cond-assign": 1,
"no-continue": 1,
"no-promise-executor-return": 0,
"no-underscore-dangle": 0,
"no-use-before-define": 1,
"prefer-destructuring": 1,
"prefer-exponentiation-operator": 1,
"prefer-object-spread": 0,
"react/destructuring-assignment": 0,
"react/function-component-definition": 0,
"react/jsx-filename-extension": 0,
"react/jsx-props-no-spreading": 0,
"react/jsx-no-useless-fragment": 0,
"react/prop-types": 0,
"react/state-in-constructor": 0
},
"overrides": [
{
"files": [
"**/*.test.js",
"**/*.test.jsx",
"**/tests/**/*.js",
"**/tests/**/*.jsx",
"rollup.config.js",
"vitest.config.js",
"vitest.*.config.js",
"vitest.setup.js"
],
"rules": {
"import/no-extraneous-dependencies": 0
}
}
]
}
20 changes: 10 additions & 10 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
- The use of sexualized language or imagery and unwelcome sexual attention or advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Expand Down
10 changes: 4 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
First, thank you for considering contributing to react-pdf!

We welcome any type of contribution, not only code. You can help with

- **QA**: file bug reports, the more details you can give the better (e.g. screenshots with the console open)
- **Marketing**: writing blog posts, howto's, printing stickers, ...
- **Community**: presenting the project at meetups, organizing a dedicated meetup for the local community, ...
Expand All @@ -13,7 +14,7 @@ We welcome any type of contribution, not only code. You can help with

## Your First Contribution

Working on your first Pull Request? You can learn how from this *free* series, [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).
Working on your first Pull Request? You can learn how from this _free_ series, [How to Contribute to an Open Source Project on GitHub](https://app.egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).

## Set up your development environment

Expand All @@ -30,12 +31,12 @@ git clone https://github.com/diegomura/react-pdf.git
cd react-pdf
```

### 2. Install Node 14
### 2. Install Node 18

If you have `nvm` installed all you have to do is

```sh
nvm install 14
nvm install 18
nvm use
```

Expand Down Expand Up @@ -100,7 +101,6 @@ yarn link react-dom
</pre>
</details>


## Submitting code

Any code change should be submitted as a pull request. The description should explain what the code does and give steps to execute it. The pull request should also contain tests.
Expand All @@ -127,12 +127,10 @@ You can also reach us at hello@react-pdf.opencollective.com.
Thank you to all the people who have already contributed to react-pdf!
<a href="/diegomura/react-pdf/graphs/contributors"><img src="https://opencollective.com/react-pdf/contributors.svg?width=890" /></a>


### Backers

Thank you to all our backers! [[Become a backer](https://opencollective.com/react-pdf#backer)]

<a href="https://opencollective.com/react-pdf#backers" target="_blank"><img src="https://opencollective.com/react-pdf/backers.svg?width=890"></a>


<!-- This `CONTRIBUTING.md` is based on @nayafia's template https://github.com/nayafia/contributing-template -->
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github: diegomura
open_collective: react-pdf
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior including code snippet (if applies):

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -26,9 +26,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. MacOS, Windows]
- Browser [e.g. chrome, safari]
- React-pdf version [e.g. v1.1.0]

- OS: [e.g. MacOS, Windows]
- Browser [e.g. chrome, safari]
- React-pdf version [e.g. v1.1.0]

<!-- Love react-pdf? Please consider supporting our collective:
👉 https://opencollective.com/react-pdf/donate -->
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: new feature
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down

0 comments on commit 14b24ca

Please sign in to comment.