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

Add .prettierrc to teleport root #20448

Merged
merged 5 commits into from
Jan 19, 2023
Merged

Add .prettierrc to teleport root #20448

merged 5 commits into from
Jan 19, 2023

Conversation

avatus
Copy link
Contributor

@avatus avatus commented Jan 19, 2023

After the webapps merge, we lost access to our .prettierrc in the teleport/e directory. Moving the prettier files to teleport root lets both /web and e/web use the correct settings.

Would love a few sanity checks as well to make sure I don't have some weird local setup giving me a false positive

@github-actions github-actions bot requested review from lxea and timothyb89 January 19, 2023 22:17
@avatus avatus requested review from hatched and ryanclark January 19, 2023 22:17
@avatus avatus merged commit d9d61e8 into master Jan 19, 2023
@github-actions
Copy link

@avatus See the table below for backport results.

Branch Result
branch/v12 Create PR

@ravicious ravicious deleted the michaelmyers/add_prettierrc branch January 20, 2023 09:53
hatched pushed a commit that referenced this pull request Jan 31, 2023
hatched added a commit that referenced this pull request Jan 31, 2023
* Move tsconfig.json to root dir, remove web Makefile and Dockerfile (#20399)

* Move tsconfig.json to root dir

At the moment, it looks like the TS language server has problems with
recognizing imports when editing files inside e/web.

I figured this is probably because tsconfig.json is in web, so the lang
server doesn't recognize it when editing files from e/web.

* Remove web/Dockerfile and web/Makefile

* Misc updates to readme

* Fix links in readme

* Remove web/packages/build from ignored files (#20400)

* Run webassets build in Docker as current OS user (#20426)

Set the current user when running webassets builds. In this way, the build artifacts will have correct permissions.

* Add .prettierrc to teleport root (#20448)

* Add nodejs to the fips dockerfile. (#20487)

* Add BUILDARCH arg to fips dockerfile. (#20495)

* Update xterm-addon-fit (#20696)

This resolves an issue when starting an SSH session from the web UI,
and also fixes the out-of-date lock file.

* Move storybook to root package.json and fix config so e components are rendered. (#20723)

* Resolve issues to enable passing CI tests. (#20582)

* Move lint commands to root package.json

* Correctly resolve e-teleport paths.

* Fix prettier issues.

* move eslint configuration files to root.

* resolve lint errors.

* bump e

* Move jest, eslint & prettier to the root (#20698)

* Move jest, eslint & prettier to the root

* Update e ref

---------

Co-authored-by: Rafał Cieślak <[email protected]>
Co-authored-by: Jakub Nyckowski <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
Co-authored-by: Ryan Clark <[email protected]>
hatched pushed a commit that referenced this pull request Feb 3, 2023
hatched added a commit that referenced this pull request Feb 3, 2023
* Changes necessary to get v10 building after the webapps merge.

* move tsconfig.json to root dir, remove web makefile and dockerfile.

* Remove web/packages/build from ignored files (#20400)

* Run webassets build in Docker as current OS user (#20426)

Set the current user when running webassets builds. In this way, the build artifacts will have correct permissions.

* Add .prettierrc to teleport root (#20448)

* Add nodejs to the fips dockerfile. (#20487)

* Conditionally build the UI if there are changes. (#20489)

* Conditionally build the UI if there are changes.

`ensure-webassets` and `ensure-webassets-e` will now build the UI if the
hash-of-hashes has changed since the last time the webassets were built.

* Update Makefile

Co-authored-by: Jeff Pihach <[email protected]>

* Check for the existence of the make command.

* Choose a shasum exec from a preconfigured list or use an override.

* Shellcheck fix.

* Remove yarn.lock from sha calculation.

* Recalc SHA on successful build.

* Fix linting issues.

* Use Python instead of shasum.

* Remove unnecessary comments from sh file.

* Unconditionally rebuild if Python executable is not found.

* Revert "Unconditionally rebuild if Python executable is not found."

This reverts commit 9d2b0e3.

* Revert "Remove unnecessary comments from sh file."

This reverts commit 600e028.

* Revert use of Python, use simplified shell scripting.

* Linting fixes.

* Apply suggestions from code review

Co-authored-by: Edoardo Spadolini <[email protected]>

* Remove reference to realpath as apparently the MacOS builder doesn't have it.

* calculate_sha must return 0.

* Use echo in calculate_sha or else set -o pipefail causes failures.

* Suppress SC2005.

---------

Co-authored-by: Jeff Pihach <[email protected]>
Co-authored-by: Edoardo Spadolini <[email protected]>

* Add BUILDARCH arg to fips dockerfile. (#20495)

* Resolve issues to enable passing CI tests. (#20582)

* Move lint commands to root package.json

* Correctly resolve e-teleport paths.

* Fix prettier issues.

* move eslint configuration files to root.

* resolve lint errors.

* Update xterm-addon-fit (#20696)

This resolves an issue when starting an SSH session from the web UI,
and also fixes the out-of-date lock file.

* Move jest, eslint & prettier to the root (#20698)

* Move jest, eslint & prettier to the root

* Update e ref

* Move storybook to root package.json and fix config so e components are rendered. (#20723)

* update yarn lock.

---------

Co-authored-by: Rafał Cieślak <[email protected]>
Co-authored-by: Jakub Nyckowski <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Michael Wilson <[email protected]>
Co-authored-by: Edoardo Spadolini <[email protected]>
Co-authored-by: Zac Bergquist <[email protected]>
Co-authored-by: Ryan Clark <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants