From fe7bd3029cc9cbd0a2df5696aadd7332e1a29fac Mon Sep 17 00:00:00 2001 From: Lukas Geiger Date: Sun, 3 Nov 2019 02:53:52 +0000 Subject: [PATCH 01/25] Fix textmate language template spec The `atom.syntax` global doesn't exist. This PR renames it to `atom.grammars` to make the specs for a template repo pass. --- .../spec/language-__package-name__-spec.coffee.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/language/spec/language-__package-name__-spec.coffee.template b/templates/language/spec/language-__package-name__-spec.coffee.template index d61889ac2..dbe015f9b 100644 --- a/templates/language/spec/language-__package-name__-spec.coffee.template +++ b/templates/language/spec/language-__package-name__-spec.coffee.template @@ -9,7 +9,7 @@ describe "__PackageName__ grammar", -> atom.packages.activatePackage("language-__package-name__") runs -> - grammar = atom.syntax.grammarForScopeName("source.__package-name__") + grammar = atom.grammars.grammarForScopeName("source.__package-name__") it "parses the grammar", -> expect(grammar).toBeTruthy() From 19a0791c479bf1348441b77f1d31e58d4c9187e6 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sat, 15 Aug 2020 14:17:03 -0400 Subject: [PATCH 02/25] .gitattributes: Set platform-specific line-endings 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. --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitattributes b/.gitattributes index 4a8a43783..6f8e7d35c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,7 @@ +# Shell scripts (Unix-style line endings) *.sh text eol=lf +bin/apm text eol=lf +bin/npm text eol=lf + +# Batch files (Windows-style line endings) +*.cmd text eol=crlf From d795141d72ee5e589f89671eabcc8f202cea46c1 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 23 Aug 2020 05:42:28 -0500 Subject: [PATCH 03/25] GitHub Actions --- .github/workflows/CI.yml | 45 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 34 ------------------------------ appveyor.yml | 2 +- 3 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 .github/workflows/CI.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 000000000..2ce6868fa --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,45 @@ +name: CI + +on: + - pull_request + - push + +jobs: + Test: + if: "!contains(github.event.head_commit.message, '[skip ci]')" + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - macos-latest + - windows-latest + node_version: + - 10 + - 12 + - 14 + steps: + - uses: actions/checkout@v2 + + - name: Install Node + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node_version }} + + - name: Install npm + run: npm install -g npm + + - name: Install dependencies + run: npm ci + + - if: "!contains(matrix.os, 'windows')" + name: Run tests 👩🏾‍💻 + run: ./bin/npm test + + Skip: + if: contains(github.event.head_commit.message, '[skip ci]') + runs-on: ubuntu-latest + steps: + - name: Skip CI 🚫 + run: echo skip ci diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2e0bde9b1..000000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: node_js -dist: trusty - -notifications: - email: - on_success: never - on_failure: change - -node_js: - - "10.20.1" - -before_install: npm install -g npm - -install: npm install - -script: ./bin/npm test - -git: - depth: 10 - -branches: - only: - - master - -addons: - apt: - packages: - - libsecret-1-dev - - g++-4.8 - sources: - - ubuntu-toolchain-r-test - -env: - - CXX=g++-4.8 diff --git a/appveyor.yml b/appveyor.yml index 5802a2f58..60cfc0d6a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ +# Used only to test x86 version: "{build}" image: Visual Studio 2015 platform: - x86 - - x64 environment: nodejs_version: "10.20.1" From 1089390f9ad1e50c628289b435fa1fb59e066d4a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 23 Aug 2020 04:02:09 -0500 Subject: [PATCH 04/25] use npm install --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2ce6868fa..4cff15ffd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,7 +31,7 @@ jobs: run: npm install -g npm - name: Install dependencies - run: npm ci + run: npm install - if: "!contains(matrix.os, 'windows')" name: Run tests 👩🏾‍💻 From cacfdd7937427ec6c9c8b311e3e8f00d02027865 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 23 Aug 2020 05:18:48 -0500 Subject: [PATCH 05/25] faster git clone on appveyor --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 60cfc0d6a..b442f7ea3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ # Used only to test x86 + +shallow_clone: true version: "{build}" image: Visual Studio 2015 From 7510d507c0e28411b46eff5a12874a541f4d7d35 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 23 Aug 2020 05:42:42 -0500 Subject: [PATCH 06/25] update badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 21757c738..707098e64 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # apm - Atom Package Manager -[![Linux Build Status](https://travis-ci.org/atom/apm.svg?branch=master)](https://travis-ci.org/atom/apm) -[![Windows Build Status](https://ci.appveyor.com/api/projects/status/j6ixw374a397ugkb/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/apm/branch/master) +![Build Status](https://github.com/atom-ide-community/apm/workflows/CI/badge.svg) +[![Windows x86 Build Status](https://ci.appveyor.com/api/projects/status/j6ixw374a397ugkb/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/apm/branch/master) [![Dependency Status](https://david-dm.org/atom/apm.svg)](https://david-dm.org/atom/apm) Discover and install Atom packages powered by [atom.io](https://atom.io) From fc32606d535ab85e8c94fe5260e7366d5ea16271 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 10 Dec 2020 11:35:16 -0600 Subject: [PATCH 07/25] Use github actions for windows x86 https://github.com/actions/setup-node/pull/194 --- .github/workflows/CI.yml | 9 ++++++++- README.md | 1 - appveyor.yml | 25 ++++--------------------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4cff15ffd..d4b61a318 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,13 +19,20 @@ jobs: - 10 - 12 - 14 + node_arch: + - x64 + include: + - os: windows-2016 + node_version: 12 + node_arch: x86 steps: - uses: actions/checkout@v2 - name: Install Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v2-beta with: node-version: ${{ matrix.node_version }} + architecture: ${{ matrix.node_arch }} - name: Install npm run: npm install -g npm diff --git a/README.md b/README.md index 707098e64..950439582 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # apm - Atom Package Manager ![Build Status](https://github.com/atom-ide-community/apm/workflows/CI/badge.svg) -[![Windows x86 Build Status](https://ci.appveyor.com/api/projects/status/j6ixw374a397ugkb/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/apm/branch/master) [![Dependency Status](https://david-dm.org/atom/apm.svg)](https://david-dm.org/atom/apm) Discover and install Atom packages powered by [atom.io](https://atom.io) diff --git a/appveyor.yml b/appveyor.yml index b442f7ea3..795da41c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,23 +1,6 @@ -# Used only to test x86 - -shallow_clone: true -version: "{build}" - -image: Visual Studio 2015 - -platform: - - x86 - -environment: - nodejs_version: "10.20.1" - -install: - - ps: Install-Product node $env:nodejs_version $env:platform - - npm install -g npm - - npm ci - +# empty appveyor build: off -test: off - -deploy: off +branches: + only: + - non-existing From 495e14ce8f9af1d97cbc923e39d7bf8e39d9bcd3 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 18 Jan 2021 13:19:20 -0600 Subject: [PATCH 08/25] fix: bump git-utils --- package-lock.json | 34 +++------------------------------- package.json | 2 +- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c9a98401..808c0bd10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1109,40 +1109,12 @@ } }, "git-utils": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.2.tgz", - "integrity": "sha512-3pen//xGs5ZJiXejUbx79FyRR58J6DgI7tL9Mc7YQeuF5ENXf/7k0K2M8h4JBlTKZcxxCr8MGA1Xcg4O4l/YjA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.7.1.tgz", + "integrity": "sha512-+mWdJDq9emWoq6GzzrGEB7SIBmAk0lNNv2wgNkgwTVZUkAFkWvgRsJ+Kvs3d1QQD6WG6vczti2WLpjmh2Twtlw==", "requires": { "fs-plus": "^3.0.0", "nan": "^2.14.0" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "fs-plus": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-3.1.1.tgz", - "integrity": "sha512-Se2PJdOWXqos1qVTkvqqjb0CSnfBnwwD+pq+z4ksT+e97mEShod/hrNg0TRCCsXPbJzcIq+NuzQhigunMWMJUA==", - "requires": { - "async": "^1.5.2", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2", - "underscore-plus": "1.x" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - } - } - } } }, "github-from-package": { diff --git a/package.json b/package.json index fa0f868d8..ac517cd40 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "colors": "~1.4.0", "first-mate": "^7.4.1", "fs-plus": "3.x", - "git-utils": "^5.6.2", + "git-utils": "^5.7.1", "glob": "^7.1.6", "hosted-git-info": "^3.0.7", "keytar": "^6.0.1", From 521b319d2da06e0ee46b2bc2c77a556c0bb76802 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Fri, 29 Jan 2021 11:57:53 -0600 Subject: [PATCH 09/25] Update setup-node --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d4b61a318..7af2a0ec8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v2 - name: Install Node - uses: actions/setup-node@v2-beta + uses: actions/setup-node@v2 with: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.node_arch }} From e67e927183c41c63a48a4d812138522099bf9dea Mon Sep 17 00:00:00 2001 From: chbk Date: Sat, 14 Dec 2019 15:22:49 +0100 Subject: [PATCH 10/25] Implement naming conventions --- templates/theme/index.less | 4 +- templates/theme/styles/base.less | 301 -------------------------- templates/theme/styles/editor.less | 56 +++++ templates/theme/styles/syntax.less | 337 +++++++++++++++++++++++++++++ 4 files changed, 396 insertions(+), 302 deletions(-) delete mode 100644 templates/theme/styles/base.less create mode 100644 templates/theme/styles/editor.less create mode 100644 templates/theme/styles/syntax.less diff --git a/templates/theme/index.less b/templates/theme/index.less index d076b67b5..8d0a86859 100644 --- a/templates/theme/index.less +++ b/templates/theme/index.less @@ -1 +1,3 @@ -@import "./styles/base.less"; +@import "styles/syntax-variables.less"; +@import "styles/syntax.less"; +@import "styles/editor.less"; diff --git a/templates/theme/styles/base.less b/templates/theme/styles/base.less deleted file mode 100644 index fcc09434e..000000000 --- a/templates/theme/styles/base.less +++ /dev/null @@ -1,301 +0,0 @@ -@import "syntax-variables"; - -atom-text-editor { - background-color: @syntax-background-color; - color: @syntax-text-color; - - .wrap-guide { - background-color: @syntax-wrap-guide-color; - } - - .indent-guide { - color: @syntax-indent-guide-color; - } - - .invisible-character { - color: @syntax-invisible-character-color; - } - - .gutter { - background-color: @syntax-gutter-background-color; - color: @syntax-gutter-text-color; - - .line-number { - &.cursor-line { - background-color: @syntax-gutter-background-color-selected; - color: @syntax-gutter-text-color-selected; - } - - &.cursor-line-no-selection { - color: @syntax-gutter-text-color-selected; - } - } - } - - .gutter .line-number.folded, - .gutter .line-number:after, - .fold-marker:after { - color: @light-gray; - } - - .invisible { - color: @syntax-text-color; - } - - .cursor { - color: @syntax-cursor-color; - } - - .selection .region { - background-color: @syntax-selection-color; - } -} - - -// Syntax styles - -.syntax--comment { - color: @light-gray; -} - -.syntax--keyword { - color: @purple; - - &.syntax--control { - color: @purple; - } - - &.syntax--operator { - color: @syntax-text-color; - } - - &.syntax--other.syntax--special-method { - color: @blue; - } - - &.syntax--other.syntax--unit { - color: @orange; - } -} - -.syntax--storage { - color: @purple; -} - -.syntax--constant { - color: @orange; - - &.syntax--character.syntax--escape { - color: @cyan; - } - - &.syntax--numeric { - color: @orange; - } - - &.syntax--other.syntax--color { - color: @cyan; - } - - &.syntax--other.syntax--symbol { - color: @green; - } -} - -.syntax--variable { - color: @red; - - &.syntax--interpolation { - color: darken(@red, 10%); - } - - &.syntax--parameter.syntax--function { - color: @syntax-text-color; - } -} - -.syntax--invalid.syntax--illegal { - background-color: @red; - color: @syntax-background-color; -} - -.syntax--string { - color: @green; - - - &.syntax--regexp { - color: @cyan; - - .syntax--source.syntax--ruby.syntax--embedded { - color: @orange; - } - } - - &.syntax--other.syntax--link { - color: @red; - } -} - -.syntax--punctuation { - &.syntax--definition { - &.syntax--comment { - color: @light-gray; - } - - &.syntax--string, - &.syntax--variable, - &.syntax--parameters, - &.syntax--array { - color: @syntax-text-color; - } - - &.syntax--heading, - &.syntax--identity { - color: @blue; - } - - &.syntax--bold { - color: @light-orange; - font-weight: bold; - } - - &.syntax--italic { - color: @purple; - font-style: italic; - } - } - - &.syntax--section.syntax--embedded { - color: darken(@red, 10%); - } - -} - -.syntax--support { - &.syntax--class { - color: @light-orange; - } - - &.syntax--function { - color: @cyan; - - &.syntax--any-method { - color: @blue; - } - } -} - -.syntax--entity { - &.syntax--name.syntax--function { - color: @blue; - } - &.syntax--name.syntax--type { - color: @light-orange; - text-decoration: underline; - } - - &.syntax--other.syntax--inherited-class { - color: @green; - } - &.syntax--name.syntax--class, &.syntax--name.syntax--type.syntax--class { - color: @light-orange; - } - - &.syntax--name.syntax--section { - color: @blue; - } - - &.syntax--name.syntax--tag { - color: @red; - text-decoration: underline; - } - - &.syntax--other.syntax--attribute-name { - color: @orange; - - &.syntax--id { - color: @blue; - } - } -} - -.syntax--meta { - &.syntax--class { - color: @light-orange; - } - - &.syntax--link { - color: @orange; - } - - &.syntax--require { - color: @blue; - } - - &.syntax--selector { - color: @purple; - } - - &.syntax--separator { - background-color: @gray; - color: @syntax-text-color; - } -} - -.syntax--none { - color: @syntax-text-color; -} - -.syntax--markup { - &.syntax--bold { - color: @orange; - font-weight: bold; - } - - &.syntax--changed { - color: @purple; - } - - &.syntax--deleted { - color: @red; - } - - &.syntax--italic { - color: @purple; - font-style: italic; - } - - &.syntax--heading .syntax--punctuation.syntax--definition.syntax--heading { - color: @blue; - } - - &.syntax--inserted { - color: @green; - } - - &.syntax--list { - color: @red; - } - - &.syntax--quote { - color: @orange; - } - - &.syntax--raw.syntax--inline { - color: @green; - } -} - -.syntax--source.syntax--gfm .syntax--markup { - -webkit-font-smoothing: auto; - &.syntax--heading { - color: @green; - } -} - - -// Mini editor - -atom-text-editor[mini] .scroll-view { - padding-left: 1px; -} diff --git a/templates/theme/styles/editor.less b/templates/theme/styles/editor.less new file mode 100644 index 000000000..8cd35dea3 --- /dev/null +++ b/templates/theme/styles/editor.less @@ -0,0 +1,56 @@ +// This defines styling rules for the editor. + +atom-text-editor { + background-color: @syntax-background-color; + color: @syntax-text-color; + + .wrap-guide { + background-color: @syntax-wrap-guide-color; + } + + .indent-guide { + color: @syntax-indent-guide-color; + } + + .invisible-character { + color: @syntax-invisible-character-color; + } + + .gutter { + background-color: @syntax-gutter-background-color; + color: @syntax-gutter-text-color; + + .line-number { + &.cursor-line { + background-color: @syntax-gutter-background-color-selected; + color: @syntax-gutter-text-color-selected; + } + + &.cursor-line-no-selection { + color: @syntax-gutter-text-color-selected; + } + } + } + + .gutter .line-number.folded, + .gutter .line-number:after, + .fold-marker:after { + color: @light-gray; + } + + .invisible { + color: @syntax-text-color; + } + + .cursor { + color: @syntax-cursor-color; + } + + .selection .region { + background-color: @syntax-selection-color; + } +} + +atom-text-editor[mini] .scroll-view { + padding-left: 1px; +} diff --git a/templates/theme/styles/syntax.less b/templates/theme/styles/syntax.less new file mode 100644 index 000000000..00d277579 --- /dev/null +++ b/templates/theme/styles/syntax.less @@ -0,0 +1,337 @@ +/* + This defines styling rules for syntax classes. + + See the naming conventions for a list of syntax classes: + https://flight-manual.atom.io/hacking-atom/sections/syntax-naming-conventions + + When styling rules conflict: + - The last rule overrides previous rules. + - The rule with most classes and pseudo-classes overrides the last rule. +*/ + +// if for return import +.syntax--keyword { + color: @purple; + + // global static let class + &.syntax--storage { + color: @purple; + } + + // int char float + &.syntax--type { + color: @purple; + text-decoration: underline; + } + + // and or new del + &.syntax--operator { + color: @very-light-gray; + } + + // super + &.syntax--function { + color: @red; + } + + // this self + &.syntax--variable { + color: @red; + } + + // = + && | << ? + &.syntax--symbolic { + color: @very-light-gray; + } +} + +// identifier +.syntax--entity { + color: @very-light-gray; + + // function(parameter) + &.syntax--parameter { + color: @very-light-gray; + } + + // self cls iota + &.syntax--support { + color: @red; + } + + // function method + &.syntax--function { + color: @blue; + + // len print + &.syntax--support { + color: @cyan; + } + } + + // add + &.syntax--operator { + color: @blue; + + // %>% <=> + &.syntax--symbolic { + color: @very-light-gray; + } + } + + // Class + &.syntax--type { + color: @light-orange; + text-decoration: underline; + + // String List + &.syntax--support { + color: @light-orange; + } + + // dict map float32 + &.syntax--fundamental { + color: @purple; + } + } + + // .class :pseudo-class + &.syntax--selector { + color: @light-orange; + + // #id + &.syntax--id { + color: @blue; + } + } + + // div span + &.syntax--tag { + color: @red; + text-decoration: underline; + } + + // href src alt + &.syntax--attribute { + color: @orange; + } + + // height position border + &.syntax--property { + color: @very-light-gray; + } +} + +// () [] {} => @ +.syntax--punctuation { + color: @very-light-gray; +} + +// "string" +.syntax--string { + color: @green; + + // :immutable + &.syntax--immutable { + color: @green; + } + + // ${variable} %().2f {0:<30} + &.syntax--part { + color: darken(@green, 15%); + } + + // /^reg[ex]?p/ + &.syntax--regexp { + color: @green; + + // ^ $ \b ? + i + &.syntax--language { + color: @cyan; + } + + // \1 + &.syntax--variable { + color: @cyan; + } + + // r" / + &.syntax--punctuation { + color: @green; + + // ( ) [^ ] (?= ) | + &.syntax--part { + color: @cyan; + } + } + } +} + +// literal +.syntax--constant { + color: @orange; + + // < 'a' + &.syntax--character { + color: @green; + + // \" \' \g \. + &.syntax--escape { + color: @green; + } + + // \u2661 \n \t \W . + &.syntax--code { + color: @cyan; + } + } + + // 4 1.3 0x29 + &.syntax--numeric { + color: @orange; + + // px % cm hz + &.syntax--unit { + color: @orange; + } + } + + // #b294bb + &.syntax--color { + color: @cyan; + } + + // true false nil + &.syntax--language { + color: @orange; + + // ... + &.syntax--symbolic { + color: @very-light-gray; + } + } +} + +// text +.syntax--text { + color: @very-light-gray; +} + +// __formatted__ +.syntax--markup { + color: @red; + + // # Heading + &.syntax--heading { + color: @blue; + } + + // - item + &.syntax--list { + color: @red; + } + + // > quote + &.syntax--quote { + color: @orange; + } + + // **bold** + &.syntax--bold { + color: @orange; + font-weight: bold; + } + + // *italic* + &.syntax--italic { + color: @purple; + font-style: italic; + } + + // __underline__ + &.syntax--underline { + color: @orange; + text-decoration: underline; + } + + // ~~strike~~ + &.syntax--strike { + color: @red; + } + + // `raw` + &.syntax--raw { + color: @green; + } + + // url.com (path) [reference] + &.syntax--link { + color: @orange; + } + + // {++ inserted ++} + &.syntax--inserted { + color: @green; + } + + // {== inserted ==} + &.syntax--highlighted { + color: @green; + } + + // {-- deleted --} + &.syntax--deleted { + color: @red; + } + + // {~~ from~>to ~~} + &.syntax--changed { + color: @orange; + } + + // {>> commented <<} + &.syntax--commented { + color: @light-gray; + } +} + +// /* comment */ +.syntax--comment { + color: @light-gray; + + // @param TODO NOTE + &.syntax--caption { + color: lighten(@light-gray, 5); + font-weight: bold; + text-decoration: underline; + } + + // variable function type + &.syntax--term { + color: lighten(@light-gray, 5); + font-weight: bold; + } + + // { } / . + &.syntax--punctuation { + color: @light-gray; + font-weight: normal; + text-decoration: none; + } +} + +// 0invalid +.syntax--invalid:not(.syntax--punctuation) { + + // §illegal + &.syntax--illegal { + background-color: @red; + color: @syntax-background-color; + } + + // obsolete() + &.syntax--deprecated { + color: @red; + text-decoration: underline; + } +} From de1782aea6b5ba6ec99b1cd282510797f9577f58 Mon Sep 17 00:00:00 2001 From: chbk Date: Tue, 17 Mar 2020 16:50:37 +0100 Subject: [PATCH 11/25] Update specs --- spec/init-spec.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/init-spec.coffee b/spec/init-spec.coffee index 5d4d64228..7c6835b52 100644 --- a/spec/init-spec.coffee +++ b/spec/init-spec.coffee @@ -128,8 +128,10 @@ describe "apm init", -> runs -> expect(fs.existsSync(themePath)).toBeTruthy() expect(fs.existsSync(path.join(themePath, 'styles'))).toBeTruthy() - expect(fs.existsSync(path.join(themePath, 'styles', 'base.less'))).toBeTruthy() + expect(fs.existsSync(path.join(themePath, 'styles', 'colors.less'))).toBeTruthy() expect(fs.existsSync(path.join(themePath, 'styles', 'syntax-variables.less'))).toBeTruthy() + expect(fs.existsSync(path.join(themePath, 'styles', 'syntax.less'))).toBeTruthy() + expect(fs.existsSync(path.join(themePath, 'styles', 'editor.less'))).toBeTruthy() expect(fs.existsSync(path.join(themePath, 'index.less'))).toBeTruthy() expect(fs.existsSync(path.join(themePath, 'README.md'))).toBeTruthy() expect(fs.existsSync(path.join(themePath, 'package.json'))).toBeTruthy() From ea78e5fe3843dd467c05f740b6c72a9d27e0d466 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 25 Feb 2021 23:04:20 -0600 Subject: [PATCH 12/25] fix: update async package --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c9a98401..8e4c300d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -167,9 +167,9 @@ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" }, "asynckit": { "version": "0.4.0", diff --git a/package.json b/package.json index fa0f868d8..ea442a84f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "@atom/plist": "0.4.4", "asar-require": "0.3.0", - "async": "~0.9.2", + "async": "^3.2.0", "colors": "~1.4.0", "first-mate": "^7.4.1", "fs-plus": "3.x", From 1b413e590fcfa84812e773ec36b48f3eeb7f5a23 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 27 Feb 2021 04:28:17 -0600 Subject: [PATCH 13/25] fix: detectSeries third callback not passing err --- src/install.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/install.coffee b/src/install.coffee index bc4fac45b..383d9f72c 100644 --- a/src/install.coffee +++ b/src/install.coffee @@ -518,16 +518,17 @@ class Install extends Command ] cloneFirstValidGitUrl: (urls, cloneDir, options, callback) -> - async.detectSeries urls, (url, next) => + async.detectSeries(urls, (url, next) => @cloneNormalizedUrl url, cloneDir, options, (error) -> - next(not error) - , (result) -> - if not result + next(null, not error) + , (err, result) -> + if err or not result invalidUrls = "Couldn't clone #{urls.join(' or ')}" invalidUrlsError = new Error(invalidUrls) callback(invalidUrlsError) else callback() + ) cloneNormalizedUrl: (url, cloneDir, options, callback) -> # Require here to avoid circular dependency From 5456b1b6e686a2ffb66231b55a5b1b8ca99dceb0 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 6 Mar 2021 01:06:37 -0600 Subject: [PATCH 14/25] feat: update the bundled Node version to match Atom-Electron 9 https://www.electronjs.org/blog/electron-9-0 --- BUNDLED_NODE_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUNDLED_NODE_VERSION b/BUNDLED_NODE_VERSION index e23e7f3a9..521af0504 100644 --- a/BUNDLED_NODE_VERSION +++ b/BUNDLED_NODE_VERSION @@ -1 +1 @@ -v12.4.0 +v12.14.0 From 3756fe9c9349ee135f1e1c69c95cae7554f273ad Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 6 Mar 2021 15:03:21 -0600 Subject: [PATCH 15/25] use v12.14.1 to match atom --version --- BUNDLED_NODE_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUNDLED_NODE_VERSION b/BUNDLED_NODE_VERSION index 521af0504..cae54a258 100644 --- a/BUNDLED_NODE_VERSION +++ b/BUNDLED_NODE_VERSION @@ -1 +1 @@ -v12.14.0 +v12.14.1 From 217c5cbeecfd1d89b7539edb2f9c8188fb51fb4f Mon Sep 17 00:00:00 2001 From: sadick254 Date: Wed, 28 Apr 2021 15:58:58 +0300 Subject: [PATCH 16/25] 2.6.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f458212d9..b1845e730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom-package-manager", - "version": "2.6.1", + "version": "2.6.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ba377b7e2..6a62474fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom-package-manager", "description": "Atom package manager", - "version": "2.6.1", + "version": "2.6.2", "license": "MIT", "repository": { "type": "git", From b91b030eee51842488bbbeecca6ab3254ad398d1 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Wed, 28 Apr 2021 16:18:02 +0300 Subject: [PATCH 17/25] :arrow_up: Bump keytar@7.7.0 --- package-lock.json | 56 +++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1845e730..1477eff14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -214,9 +214,9 @@ } }, "bl": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", - "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "requires": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -1252,9 +1252,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "interpret": { "version": "1.4.0", @@ -1408,12 +1408,12 @@ } }, "keytar": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/keytar/-/keytar-6.0.1.tgz", - "integrity": "sha512-1Ihpf2tdM3sLwGMkYHXYhVC/hx5BDR7CWFL4IrBA3IDZo0xHhS2nM+tU9Y+u/U7okNfbVkwmKsieLkcWRMh93g==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", + "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", "requires": { "node-addon-api": "^3.0.0", - "prebuild-install": "5.3.4" + "prebuild-install": "^6.0.0" } }, "klaw": { @@ -1623,9 +1623,9 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, "node-abi": { - "version": "2.19.3", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz", - "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz", + "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==", "requires": { "semver": "^5.4.1" }, @@ -1638,9 +1638,9 @@ } }, "node-addon-api": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz", - "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" }, "node-gyp": { "version": "5.1.1", @@ -4958,25 +4958,24 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "prebuild-install": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz", - "integrity": "sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz", + "integrity": "sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==", "requires": { "detect-libc": "^1.0.3", "expand-template": "^2.0.3", "github-from-package": "0.0.0", "minimist": "^1.2.3", - "mkdirp": "^0.5.1", + "mkdirp-classic": "^0.5.3", "napi-build-utils": "^1.0.1", - "node-abi": "^2.7.0", + "node-abi": "^2.21.0", "noop-logger": "^0.1.1", "npmlog": "^4.0.1", "pump": "^3.0.0", "rc": "^1.2.7", "simple-get": "^3.0.3", "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0", - "which-pm-runs": "^1.0.0" + "tunnel-agent": "^0.6.0" }, "dependencies": { "minimist": { @@ -5439,9 +5438,9 @@ } }, "tar-stream": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz", - "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "requires": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -5659,11 +5658,6 @@ "isexe": "^2.0.0" } }, - "which-pm-runs": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", - "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=" - }, "wide-align": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", diff --git a/package.json b/package.json index 6a62474fb..f5f298998 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "git-utils": "^5.7.1", "glob": "^7.1.6", "hosted-git-info": "^3.0.7", - "keytar": "^6.0.1", + "keytar": "^7.7.0", "mv": "2.1.1", "ncp": "~2.0.0", "npm": "^6.14.9", From 7be56b8c544a6922e19809d6587ea6282dbba895 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 13 Jan 2021 17:11:54 -0500 Subject: [PATCH 18/25] script: Remove automatic deduping from postinstall 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 e3218fb440adb0f3a9f05b0739599c9f38dbc8af, which was merged previously at the atom-community fork of apm.) --- script/postinstall.cmd | 9 --------- script/postinstall.sh | 8 -------- 2 files changed, 17 deletions(-) diff --git a/script/postinstall.cmd b/script/postinstall.cmd index f3608d84b..29ee9c5ac 100644 --- a/script/postinstall.cmd +++ b/script/postinstall.cmd @@ -9,12 +9,3 @@ echo. for /f "delims=" %%i in ('.\bin\node.exe -p "process.version + ' ' + process.arch"') do set bundledVersion=%%i echo ^>^> Rebuilding apm dependencies with bundled Node !bundledVersion! call .\bin\npm.cmd rebuild - -if defined NO_APM_DEDUPE ( - echo. - echo ^>^> Deduplication disabled -) else ( - echo. - echo ^>^> Deduping apm dependencies - call .\bin\npm.cmd dedupe -) \ No newline at end of file diff --git a/script/postinstall.sh b/script/postinstall.sh index 222a25b4c..3427f514e 100755 --- a/script/postinstall.sh +++ b/script/postinstall.sh @@ -8,11 +8,3 @@ node script/download-node.js echo echo ">> Rebuilding apm dependencies with bundled Node $(./bin/node -p "process.version + ' ' + process.arch")" ./bin/npm rebuild - -echo -if [ -z "${NO_APM_DEDUPE}" ]; then - echo ">> Deduping apm dependencies" - ./bin/npm dedupe -else - echo ">> Deduplication disabled" -fi From 5153fe1d387359da83967582138090b04462b365 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Sat, 12 Jun 2021 12:23:26 +0300 Subject: [PATCH 19/25] Update bundled node version to 12.18.3 To facilitate electron upgrade to version 11.4.7 --- BUNDLED_NODE_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUNDLED_NODE_VERSION b/BUNDLED_NODE_VERSION index cae54a258..83f2a92e9 100644 --- a/BUNDLED_NODE_VERSION +++ b/BUNDLED_NODE_VERSION @@ -1 +1 @@ -v12.14.1 +v12.18.3 From e21b21b875979f7ff1034427ca9a3ed191aa0044 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Sat, 12 Jun 2021 18:58:50 +0300 Subject: [PATCH 20/25] 2.6.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1477eff14..5a6295f8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom-package-manager", - "version": "2.6.2", + "version": "2.6.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f5f298998..9136fa9c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom-package-manager", "description": "Atom package manager", - "version": "2.6.2", + "version": "2.6.3", "license": "MIT", "repository": { "type": "git", From 6de21053d2f23047785944e195f0016e07aedc80 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Mon, 21 Jun 2021 22:20:50 +0300 Subject: [PATCH 21/25] Bump git-utils@5.7.2 --- package-lock.json | 15 +++++++++++---- package.json | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a6295f8f..01b7d7095 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1109,12 +1109,19 @@ } }, "git-utils": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.7.1.tgz", - "integrity": "sha512-+mWdJDq9emWoq6GzzrGEB7SIBmAk0lNNv2wgNkgwTVZUkAFkWvgRsJ+Kvs3d1QQD6WG6vczti2WLpjmh2Twtlw==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.7.2.tgz", + "integrity": "sha512-80d6kOVoBGrJnmxoEdr3Y1UvTaYuvrPhwywMrgcXg446yxV5gnT/gd8UtwJkb8HPaN64x0suczDEyijEjR8IpA==", "requires": { "fs-plus": "^3.0.0", - "nan": "^2.14.0" + "nan": "^2.14.2" + }, + "dependencies": { + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" + } } }, "github-from-package": { diff --git a/package.json b/package.json index 9136fa9c5..b740ab41e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "colors": "~1.4.0", "first-mate": "^7.4.1", "fs-plus": "3.x", - "git-utils": "^5.7.1", + "git-utils": "^5.7.2", "glob": "^7.1.6", "hosted-git-info": "^3.0.7", "keytar": "^7.7.0", From 5b4fe79d3475beef7e9b4fcf1973b2819a014a4f Mon Sep 17 00:00:00 2001 From: sadick254 Date: Mon, 21 Jun 2021 22:30:39 +0300 Subject: [PATCH 22/25] 2.6.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01b7d7095..9531867ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom-package-manager", - "version": "2.6.3", + "version": "2.6.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b740ab41e..a75b3e6df 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom-package-manager", "description": "Atom package manager", - "version": "2.6.3", + "version": "2.6.4", "license": "MIT", "repository": { "type": "git", From 42134ae3278d93469e9b0f55f38c29cb91ec34f6 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Thu, 8 Jul 2021 18:50:20 +0300 Subject: [PATCH 23/25] Bump first-mate --- package-lock.json | 66 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9531867ed..ed666ae54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -828,17 +828,17 @@ } }, "ext": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.2.1.tgz", - "integrity": "sha512-x+OKKC57tNiLhDW26UmWtvQBpvO+2wxdC/A0jP7RkmjAc4gze9/U98hQyIYJUzo9A+o9ntMHpC+LH3pWMSbrVQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", "requires": { "type": "^2.0.0" }, "dependencies": { "type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", - "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==" + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", + "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==" } } }, @@ -922,45 +922,17 @@ } }, "first-mate": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.1.tgz", - "integrity": "sha512-SEG5W0aajCvK/Ngoo3he3Ib4DsT+CRPhBAgSju5hksBLvvUfRWP7Jf3+HQ+CNTD4GZZqbDNOEJNOxbf35EblrQ==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/first-mate/-/first-mate-7.4.3.tgz", + "integrity": "sha512-PtZUpaPmcV5KV4Rw5TfwczEnExN+X1o3Q/G82E4iRJ0tW91fm3Yi7pa5t4cBH8r3D6EyoBKvfpG2jKE+TZ0/nw==", "requires": { "emissary": "^1", "event-kit": "^2.2.0", "fs-plus": "^3.0.0", "grim": "^2.0.1", - "oniguruma": "7.2.1", + "oniguruma": "^7.2.3", "season": "^6.0.2", "underscore-plus": "^1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" - }, - "fs-plus": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-3.1.1.tgz", - "integrity": "sha512-Se2PJdOWXqos1qVTkvqqjb0CSnfBnwwD+pq+z4ksT+e97mEShod/hrNg0TRCCsXPbJzcIq+NuzQhigunMWMJUA==", - "requires": { - "async": "^1.5.2", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.2", - "underscore-plus": "1.x" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - } - } - } } }, "forever-agent": { @@ -1148,9 +1120,9 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, "grim": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.2.tgz", - "integrity": "sha512-Qj7hTJRfd87E/gUgfvM0YIH/g2UA2SV6niv6BYXk1o6w4mhgv+QyYM1EjOJQljvzgEj4SqSsRWldXIeKHz3e3Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/grim/-/grim-2.0.3.tgz", + "integrity": "sha512-FM20Ump11qYLK9k9DbL8yzVpy+YBieya1JG15OeH8s+KbHq8kL4SdwRtURwIUHniSxb24EoBUpwKfFjGNVi4/Q==", "requires": { "event-kit": "^2.0.0" } @@ -1604,9 +1576,9 @@ } }, "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "napi-build-utils": { "version": "1.0.2", @@ -4873,9 +4845,9 @@ } }, "oniguruma": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-7.2.1.tgz", - "integrity": "sha512-WPS/e1uzhswPtJSe+Zls/kAj27+lEqZjCmRSjnYk/Z4L2Mu+lJC2JWtkZhPJe4kZeTQfz7ClcLyXlI4J68MG2w==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/oniguruma/-/oniguruma-7.2.3.tgz", + "integrity": "sha512-PZZcE0yfg8Q1IvaJImh21RUTHl8ep0zwwyoE912KqlWVrsGByjjj29sdACcD1BFyX2bLkfuOJeP+POzAGVWtbA==", "requires": { "nan": "^2.14.0" } diff --git a/package.json b/package.json index a75b3e6df..05a11a9cb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "asar-require": "0.3.0", "async": "^3.2.0", "colors": "~1.4.0", - "first-mate": "^7.4.1", + "first-mate": "^7.4.3", "fs-plus": "3.x", "git-utils": "^5.7.2", "glob": "^7.1.6", From 7bc64ebd06e082d32d56b6fe67b02260a56cc588 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Thu, 8 Jul 2021 18:53:21 +0300 Subject: [PATCH 24/25] Remove node 12 from the node matrix --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7af2a0ec8..b69441270 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,7 +16,6 @@ jobs: - macos-latest - windows-latest node_version: - - 10 - 12 - 14 node_arch: From ade8fbe124b18f5949a6b20b8e02a551d5405d67 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Thu, 8 Jul 2021 18:57:04 +0300 Subject: [PATCH 25/25] 2.6.5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed666ae54..5b88b8e9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "atom-package-manager", - "version": "2.6.4", + "version": "2.6.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 05a11a9cb..0e20a3f40 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "atom-package-manager", "description": "Atom package manager", - "version": "2.6.4", + "version": "2.6.5", "license": "MIT", "repository": { "type": "git",