8000 Electron and Tree-Sitter bump by mauricioszabo · Pull Request #386 · atom-community/atom · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Electron and Tree-Sitter bump #386

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

Closed
wants to merge 2,936 commits into from
Closed

Electron and Tree-Sitter bump #386

wants to merge 2,936 commits into from

Conversation

mauricioszabo
Copy link

I'm drafting this PR to get opinions on what to do. I actually wasn't able to make the build work reliably with npm and with the official instructions, so I migrated to yarn and a more "modern" tooling to allow building and distributing.

I'm going to enumerate what I did so this PR may become reviewable:

  1. Included all language-* packages in this repository. I actually merged back the history of the original packages, so the original commits are not lost
  2. Bumped tree-sitter and tree-sitter-* to their latest versions. To check that everything is working, I also:
  3. Created "visual tests" - that is, I actually open the editor, change the language, and check if the language is being correctly highlighted
  4. Bumped Electron to 12.
  5. Also made visual tests to check for Electron 12. This failed because of some hardcoded APM resource, so
  6. Made APM obey an env variable APM_PATH. This is partially working now: apm is found, but "core" packages are not being found on the settings tab. I found that while developing, this is not as much as a problem but the testcase for it fails :(.
  7. Changed the way we create binaries (not using the ./script/build that's kinda unreliable and using a tool called electron-build).
  8. Need to add some keys to package.json before packing the binary, otherwise APM does not find the "core" packages
  9. Make github package work again (it's broken for some reason)
  10. Check that apm is also installed on /usr/bin instead of only atom
  11. Make build (and tests) work on MacOSX
  12. Make build (and tests) work on Windows
  13. Generate RPM too
  14. Publish to GitHub releases?

darangi and others added 30 commits January 27, 2021 19:10
Add a lookahead for DELETE to avoid mistaking HTTP strings for SQL
Update tree-sitter-python + Add missing tree-sitter scopes
Adding '$' character for highlight-selected
* Revert pull requests #330 and #332

* Fix indent
Update readme with CI status
Update README with CI status badge
Update README with CI status badge
icecream17 pushed a commit to icecream17/atom that referenced this pull request Jun 25, 2022
To make atom-community#386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
@mauricioszabo mauricioszabo mentioned this pull request Jun 26, 2022
aminya pushed a commit that referenced this pull request Jul 3, 2022
To make #386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
aminya pushed a commit that referenced this pull request Jul 3, 2022
To make #386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
aminya pushed a commit that referenced this pull request Jul 9, 2022
To make #386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
aminya pushed a commit that referenced this pull request Jul 9, 2022
To make #386 reviewable,
that pr will be separated into many simpler prs. This is one of them.

This first commit does the following:
- update package.json
- update package-lock.json using `./script/build` which also seems to update `apm/package-lock.json`
- update packages/README.md
- clone all language packages. Specifically:
    - `mkdir packages/language-<all of them>`
    - `cd packages/about`
    - For all languages:
        - `cd ../language-<>`
        - `git clone language-<>`
        - Move all files except `.git` from `language-<>/language-<>`
          to `language-<>`
        - delete `language-<>/language-<>`

Since at first I accidentally updated `dependencies` then
`packageDependencies`, it appears that since the versions of language-c,
language-css, language-go, language-javascript, and language-sass don't
match, `dependencies` was reset for those versions.

[Those repos just happen to be precisely the ones that have tree-sitter v19](https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md), (sans language-sass),
which [currently breaks atom](atom#22129). So even though their repos are now
in `packages`, **I've decided to not use them**.

This is done by updating `packageDependencies` only for non-breaking
languages.
@ghost ghost closed this by deleting the head repository Oct 6, 2022
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0