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

Upstream master #122

Merged
merged 41 commits into from
Jul 22, 2021
Merged

Upstream master #122

merged 41 commits into from
Jul 22, 2021

Conversation

aminya
Copy link
Member

@aminya aminya commented Jul 21, 2021

No description provided.

lgeiger and others added 30 commits November 3, 2019 02:53
The `atom.syntax` global doesn't exist. This PR renames it to `atom.grammars` to make the specs for a template repo pass.
Shell scripts are Unix-specific, and batch files are Windows-specific.

(Using the wrong line-endings can cause these scripts not to run.)

Setting this in .gitattributes should ensure files are checked out
locally (and published to the npm package registry)
with the correct line-endings.
…nd_2019

Better Support for Visual Studio 2017 and 2019
.gitattributes: Set platform-specific line-endings
feat: update the bundled Node version to match Atom-Electron 9
Deduping leaves you with missing packages when installing apm with
`npm ci`. Modern npm should dedupe automatically to some extent,
so running dedupe isn't really useful, something like 99% of the time.

If a user wants to ensure apm is installed with maximum deduping,
they can delete apm's `node_modules` and `package-lock.json` and then
re-install.

(cherry picked from commit e3218fb,
which was merged previously at the atom-community fork of apm.)
script: Remove automatic deduping from postinstall
To facilitate electron upgrade to version 11.4.7
@aminya aminya merged commit 363cbed into master Jul 22, 2021
@aminya aminya deleted the upstream_master branch July 22, 2021 16:23
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.

6 participants