Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ali abbas/empty render issue #18

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release CI
on:
push:
branches:
- main
- master

jobs:
release:
Expand Down
33 changes: 33 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
{
<<<<<<< HEAD
"branch": "master",
"tagFormat": "v${version}",
"verifyConditions": [
{
"path": "@semantic-release/npm",
"pkgRoot": "dist"
},
{
"path": "@semantic-release/github"
}
],
"analyzeCommits": "@semantic-release/commit-analyzer",
"generateNotes": "@semantic-release/release-notes-generator",
"prepare": [
{
"path": "@semantic-release/npm",
"pkgRoot": "dist"
}
],
"publish": [
{
"path": "@semantic-release/npm",
"pkgRoot": "dist"
},
{
"path": "@semantic-release/github"
}
],
"success": [],
"fail": []
=======
"branches": ["main", "next"],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/npm",
"@semantic-release/github"
]
>>>>>>> 9778bfab4b5763f12a149123cb133211e736fc82
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "React toolkit for writing and testing react components",
"main": "dist/index.js",
"release": {
"branches": ["main", "next"]
"branches": ["master"]
},
"files": [
"/dist"
Expand Down
2 changes: 1 addition & 1 deletion src/testUtils/shallow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
out = new ReactShallowRenderer(Component);
} catch (error) {
if (!error.message.includes('ReactShallowRenderer')) {
console.log({ error, out });

Check warning on line 32 in src/testUtils/shallow.jsx

View workflow job for this annotation

GitHub Actions / tests

Unexpected console statement
}
out = ReactShallowRenderer.flatRender(Component);
}
Expand Down Expand Up @@ -63,7 +63,7 @@

isEmptyRender() {
const data = this.getRenderOutput();
return data === null;
return data === nul || data === false;

Check failure on line 66 in src/testUtils/shallow.jsx

View workflow job for this annotation

GitHub Actions / tests

'nul' is not defined
}

get snapshot() {
Expand Down
Loading