Skip to content

Commit

Permalink
Merge branch 'main' into feature/validate-parent-language
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/client.ts
#	src/helpers/page-tree.ts
#	src/next.ts
#	src/queries/index.ts
#	src/validators/parent-validator.ts
  • Loading branch information
tstikvoort committed Jul 12, 2024
2 parents b9220f4 + 7da01a8 commit 1f9f986
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/build-lint-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Build, lint, and test

on: [push]

jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Build typescript
run: npm run tsc

- name: Run ESLint
run: npm run lint

# TODO Uncomment when tests are added
# - name: Run tests
# run: npm test

- name: Build package
run: npm run build
2 changes: 0 additions & 2 deletions src/helpers/page-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ const mapPageTreeItems = (
pagesWithPublishedState.filter(page => page.parent?._ref === parentId);

return getChildPages(parentId).map(page => {
// const language = getLanguageFieldName(config);

const pagePath = parentPath
? `${parentPath === '/' ? '' : parentPath}/${page.slug?.current}`
: getRootPageSlug(page, config);
Expand Down

0 comments on commit 1f9f986

Please sign in to comment.