Skip to content

Commit

Permalink
Merge branch 'main' into Add-Spanish-Localizations
Browse files Browse the repository at this point in the history
  • Loading branch information
katherinejensen00 committed Nov 19, 2024
2 parents 43d6b53 + cba0e36 commit d5c4bd0
Show file tree
Hide file tree
Showing 17 changed files with 4,110 additions and 4,300 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/improvement_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ Describe the details of the new improvement.

**Implementation idea**
Describe the work needed for the new improvement.

**Testing ideas**
Describe what it would be useful to test either manually or automatically. Include any details that would help someone get to the right spot and/or information about what kinds of results to expect.
12 changes: 12 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@ jobs:
- name: Build
run: npm run build

- name: Verify no files changed after build
id: verify-changed-files
uses: tj-actions/verify-changed-files@v20

- name: Report file changes
if: steps.verify-changed-files.outputs.files_changed == 'true'
env:
CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
run: |
echo "Error - changed files after build: $CHANGED_FILES"
exit 1
- name: dotnet unit tests
run: dotnet test c-sharp-tests/c-sharp-tests.csproj

Expand Down
9 changes: 2 additions & 7 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

echo "Lint checking..."
# generate papi.d.ts as part of lint:staged
echo "Format and stylelint fixes..."
npm run lint:staged
echo "Lint check finished"

echo "Type checking..."
npm run typecheck
echo "Type check finished"
echo "Format and stylelint fixes finished"

echo "If the following fails run npm run editor:unlink"
npx yalc check
2 changes: 1 addition & 1 deletion extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"update-from-templates": "tsx ./lib/update-from-templates.ts"
},
"lint-staged": {
"*.{cjs,js,jsx,ts,tsx}": ["prettier --write", "cross-env NODE_ENV=development eslint --cache"],
"*.{cjs,js,jsx,ts,tsx}": ["prettier --write"],
"*.json": ["prettier --parser json --write"],
"*.{css,scss}": ["stylelint --fix"],
"*.{html,md,yml}": ["prettier --single-quote --write"]
Expand Down
2 changes: 1 addition & 1 deletion lib/papi-dts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"typecheck": "tsc -p ./tsconfig.lint.json"
},
"lint-staged": {
"*.{cjs,js,jsx,ts,tsx}": ["prettier --write", "cross-env NODE_ENV=development eslint --cache"],
"*.{cjs,js,jsx,ts,tsx}": ["prettier --write"],
"*.json": ["prettier --parser json --write"],
"*.{html,md,yml}": ["prettier --single-quote --write"]
},
Expand Down
66 changes: 28 additions & 38 deletions lib/platform-bible-react/dist/index.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/platform-bible-react/dist/index.cjs.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion lib/platform-bible-react/dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,12 @@ export interface MarkdownRendererProps {
/** The markdown string to render */
markdown: string;
className?: string;
/**
* The [`target` attribute for `a` html
* tags](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#target). Defaults to not
* adding a `target` to `a` tags
*/
anchorTarget?: string;
}
/**
* This component renders markdown content given a markdown string. It uses typography styles from
Expand All @@ -1200,7 +1206,7 @@ export interface MarkdownRendererProps {
* @param id Optional unique identifier
* @returns A div containing the rendered markdown content.
*/
export function MarkdownRenderer({ id, markdown, className }: MarkdownRendererProps): import("react/jsx-runtime").JSX.Element;
export function MarkdownRenderer({ id, markdown, className, anchorTarget, }: MarkdownRendererProps): import("react/jsx-runtime").JSX.Element;
export declare enum DropdownMenuItemType {
Check = 0,
Radio = 1
Expand Down
Loading

0 comments on commit d5c4bd0

Please sign in to comment.