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

Merge decaffinated master into rebrand #29

Merged
merged 46 commits into from
Sep 4, 2022

Conversation

Spiker985
Copy link
Member

Because this branch was originally cherry-picked and it's last commit was 0fdf1ed, it was missing quite a few files from master.

The only merge conflict was src/context-menu-manager.coffee which was deleted from master, and originally had an A[a]tom -> P[p]ulsar rename within one of the comments.

All other files were auto-merged together.

Confirmed yarn install && yarn build && yarn start did function, and load the editor.

icecream17 and others added 27 commits June 25, 2022 19:58
To make atom-community/atom#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/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.
Co-authored-by: confused_techie <dev@lhbasics.com>
Co-authored-by: Steven Nguyen <nguyeste008@students.garlandisd.net>
remove all references to atom or atom community
Decaffeinate all the core editor's files
Copy link
Member

@confused-Techie confused-Techie left a comment

Choose a reason for hiding this comment

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

Apologies about having so many suggestions here, but for being a rebrand effort its best to be as thorough as possible, right? Now realistically I got about halfway through your PR, down to packages/langauge-git/package.json is where I ended with making suggestions. I'm hoping to go back through these all.

I've tried to make things as easy as possible by using commit suggestions, so they can be one click applied if deemed applicable.

Some standouts here, the now bundled repos, package.json has lots of data still relating to previous usage, now an example of how these where handled by upstream can be found on the welcome package, where any repository key points to https://github.com/pulsar-edit/pulsar. So I would think we want to do the same.

Additionally many of these packages include build information, which can likely be removed, as that will be inherited by whatever build info is available for the editor itself.

docs/dev/README.md Outdated Show resolved Hide resolved
@@ -36,7 +36,7 @@
"atom-select-list": "^0.8.1",
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to take this opportunity to rename this item to pulsar-select-list, we would need to publish it to npm under the new name, but might be a good idea.

Copy link
Member Author

Choose a reason for hiding this comment

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

At this juncture I was going to leave all existing packages, and internal references alone, while still replacing the moniker at necessarily non-key intersections.

Primarily just to pare down the count of references

@@ -36,7 +36,7 @@
"atom-select-list": "^0.8.1",
"autocomplete-atom-api": "https://codeload.github.com/atom/autocomplete-atom-api/legacy.tar.gz/refs/tags/v0.10.7",
Copy link
Member

Choose a reason for hiding this comment

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

Same note here about rebranding the Repository name. Additionally for all packages pointing to codeload.github.com/atom should these note be changed to pulsar-edit as all original Atom repos have been successfully forked to puslar-edit

packages/language-c/CONTRIBUTING.md Outdated Show resolved Hide resolved
@@ -0,0 +1,40 @@
<!--
Copy link
Member

Choose a reason for hiding this comment

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

If you like, we have an updated, rebranded, and reworked language version of this bug report template available here, which likely can be copied wholesale as the contents of this document.

packages/language-git/CONTRIBUTING.md Outdated Show resolved Hide resolved
@@ -0,0 +1,40 @@
<!--
Copy link
Member

Choose a reason for hiding this comment

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

packages/language-git/README.md Outdated Show resolved Hide resolved
packages/language-git/README.md Outdated Show resolved Hide resolved
packages/language-git/README.md Outdated Show resolved Hide resolved
@confused-Techie
Copy link
Member

Since speaking with @Spiker985 previously he is fine with me going ahead and merging recommendations on the Markdown files themselves, so I will clear those out of my requested changes. Otherwise as its been open for nearly a week, and there doesn't seem to be any other issues found how do we feel about merging into main @pulsar-edit/core @pulsar-edit/documentation

@confused-Techie
Copy link
Member

How do we feel about merging some JSON data rebranding into this PR, then commit to main? If anyone else wants to go ahead and approve it we could probably commit afterwards

@confused-Techie
Copy link
Member

I'm gonna go ahead and merge this into the rebrand branch for pulsar-edit/pulsar. So that does mean this will afterwards have to be merged to main.

But its been up for some time, and while I think there can still be advantages of modifying the JSON and some other aspects I will leave those up to another PR as this one is already large enough.

Otherwise as for testing our expected failure rate of 55 Editor Tests and 22 Package Tests this does fall short on some of those. But it looks like this PR was created before those goals were set or expected.

Its current stats look like so:

  • ubuntu
    • Editor: 63
    • Package: 22
  • mac
    • Editor: Truncated
    • Package: 22
  • windows
    • Editor: 38
    • Package: Failed to Install

So while on Ubuntu the Editor experiences more errors than we like, on Windows its the exact opposite of what we would expect, so I will merge in hopes these can be ironed out before merging to main.

@confused-Techie confused-Techie merged commit 4bd4b88 into pulsar-edit:rebrand Sep 4, 2022
@Spiker985 Spiker985 deleted the rebrand branch November 26, 2022 06:15
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.

5 participants