Skip to content

feat(translation/jp): 20231129 update #3272

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

Merged
merged 672 commits into from
Nov 30, 2023
Merged

Conversation

rdlabo
Copy link
Collaborator

@rdlabo rdlabo commented Nov 29, 2023

No description provided.

liamdebeasi and others added 30 commits June 9, 2023 12:33
Co-authored-by: zhangshengjie <zhangshengjie@users.noreply.github.com>
Adds a new line before the table to allow the markdown to render properly
* docs: fix indentation in 5-adding-mobile.md

* Also change in v7 docs

---------

Co-authored-by: Shawn Taylor <shawn@ionic.io>
* add playgrounds

* lint

* Update static/usage/v7/select/customization/custom-toggle-icons/index.md

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>

* Update static/usage/v7/select/customization/icon-flip-behavior/index.md

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>

* fix icon usage for React and Vue

* rename toggleIconWhenOpen to expandedIcon

---------

Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
chore: release ionic 7.1 docs
fixed wording mistakes
Co-authored-by: Maria Hutt <maria@ionic.io>
Co-authored-by: reslear <reslear@users.noreply.github.com>
Co-authored-by: dillionmegida <dillionmegida@users.noreply.github.com>
* Add prompts and generate vue file

* Generate other files

* Use variables in headers

* Add readme

* Add prompt with option to generate css files

* Add version to prompt and modify files accordingly

* Update readme

* Address PR review

* Add hint for component name casing

* Add Angular TS option

* Reformat to use advanced prompting

* Refactor where markdown output comes from

* Remove default value for path; add validation

* Add validation for component name

---------

Co-authored-by: Amanda Johnston <90629384+amandaejohnston@users.noreply.github.com>
* Add renovate.json

* chore: remove invalid setting

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sean Perkins <sean@ionic.io>
renovate bot and others added 10 commits November 27, 2023 10:26
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Set return order of usePhotoGallery the same as expected in Tab2
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---------

Co-authored-by: Shawn Taylor <shawn@ionic.io>
Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
# Conflicts:
#	docs/api/reorder.md
#	docusaurus.config.js
#	package-lock.json
#	package.json
#	src/theme/DocPage/index.tsx
@rdlabo rdlabo requested review from a team and mapsandapps as code owners November 29, 2023 08:18
Copy link

vercel bot commented Nov 29, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ionic-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 30, 2023 10:01am

# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/CI.yml
#	docs/angular/build-options.md
#	docs/react/testing/introduction.md
#	package-lock.json
#	renovate.json
#	scripts/data/translated-api.json
#	scripts/data/translated-cache.json
#	scripts/data/translated-cli.json
#	src/components/page/reference/ReleaseNotes/release-notes.json
#	src/styles/components/_doc-sidebar.scss
#	src/theme/DocItem/Layout/index.tsx
#	src/theme/NavbarItem/LocaleDropdownNavbarItem/styles.module.css
#	src/translate/.detection/cli/start.readme.md
#	src/translate/cli/start.readme.md
#	static/code/stackblitz/v6/react/index.html
#	static/code/stackblitz/v6/react/package-lock.json
#	static/code/stackblitz/v6/react/package.json
#	static/code/stackblitz/v6/vue/package-lock.json
#	static/code/stackblitz/v7/react/index.html
#	static/code/stackblitz/v7/react/package-lock.json
#	static/code/stackblitz/v7/react/package.json
#	static/code/stackblitz/v7/vue/package-lock.json
#	static/icons/arrow-forward-outline.svg
@rdlabo
Copy link
Collaborator Author

rdlabo commented Nov 29, 2023

deployment has failed to Vercel. This is odd because the same code works fine in Netlify.

https://ionicframework.jp/docs/

Can you tell me what the Vercel error log shows?

@rdlabo rdlabo requested a review from liamdebeasi November 29, 2023 08:51
@liamdebeasi
Copy link
Contributor

Thanks for opening the PR! Here is the error log:

npm ERR! code ERESOLVE
npm ERR! ERESOLVE could not resolve
npm ERR! 
npm ERR! While resolving: @prismicio/react@2.7.1
npm ERR! Found: react@17.0.2
npm ERR! node_modules/react
npm ERR!   react@"^17.0.1" from the root project
npm ERR!   peerOptional react@">= 16.8.0 < 19.0.0" from @docsearch/react@3.5.2
npm ERR!   node_modules/@docsearch/react
npm ERR!     @docsearch/react@"^3.1.1" from @docusaurus/theme-search-algolia@2.4.3
npm ERR!     node_modules/@docusaurus/theme-search-algolia
npm ERR!       @docusaurus/theme-search-algolia@"2.4.3" from @docusaurus/preset-classic@2.4.3
npm ERR!       node_modules/@docusaurus/preset-classic
npm ERR!         @docusaurus/preset-classic@"^2.4.3" from the root project
npm ERR!   37 more (@docusaurus/core, @docusaurus/mdx-loader, ...)
npm ERR! 
npm ERR! Could not resolve dependency:
npm ERR! peer react@"^18" from @prismicio/react@2.7.1
npm ERR! node_modules/@prismicio/react
npm ERR!   @prismicio/react@"^2.2.0" from the root project
npm ERR! 
npm ERR! Conflicting peer dependency: react@18.2.0
npm ERR! node_modules/react
npm ERR!   peer react@"^18" from @prismicio/react@2.7.1
npm ERR!   node_modules/@prismicio/react
npm ERR!     @prismicio/react@"^2.2.0" from the root project
npm ERR! 
npm ERR! Fix the upstream dependency conflict, or retry
npm ERR! this command with --force or --legacy-peer-deps
npm ERR! to accept an incorrect (and potentially broken) dependency resolution.
npm ERR! 
npm ERR! 
npm ERR! For a full report see:
npm ERR! /vercel/.npm/_logs/2023-11-29T08_37_51_385Z-eresolve-report.txt
npm ERR! A complete log of this run can be found in: /vercel/.npm/_logs/2023-11-29T08_37_51_385Z-debug-0.log
Error: Command "npm install" exited with 1

It looks like @prismicio/react dropped React 17 as a peer dependency in a minor release: https://github.com/prismicio/prismic-react/blob/a012ad0969be91c5ff9d24410b92f7ed71e591db/package.json#L107

The resolved version in main's package-lock.json is @prismicio/react@2.3.0 which has support for React 17. However, your branch has @prismicio/react@2.7.1 in package-lock.json which does not support React 17.

It looks like the package-lock.json changed in a86d8ae. I'll work with the team to get this instance updated to React 18 so we can use the latest dependencies. In the meantime, can you make sure the package-lock.json in this branch matches the one in main?

@rdlabo
Copy link
Collaborator Author

rdlabo commented Nov 30, 2023

@liamdebeasi Thanks for the review.

Can you confirm that the package-lock.json in this branch matches the one in the main branch?

That's right! Copying the package-lock.json from the main branch to this branch fixed it.
This pull request is not a problem now!

Copy link
Contributor

@liamdebeasi liamdebeasi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@rdlabo rdlabo merged commit 00b4aac into translation/jp Nov 30, 2023
@rdlabo rdlabo deleted the translation/jp-20231129 branch November 30, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.