Merge branch 'master' into keep-a-changelog

pulsar-edit · Dec 14, 2022 · 34a314f · 34a314f
2 parents 6cb0409 + 542babf
commit 34a314f
Show file tree

Hide file tree

Showing 466 changed files with 28,697 additions and 10,825 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -171,9 +171,11 @@ windows_task:
     - git submodule update
     - npm config set python 'C:\Python310\python.exe'
   build_apm_script:
-    - cd ppm; npx yarn install --ignore-engines || npx yarn install --ignore-engines || npx yarn cache clean; npx yarn install --ignore-engines || npx yarn install --ignore-engines
-  install_without_scripts_script:
-    - npx yarn install --ignore-scripts --ignore-engines || sleep 1 && npx yarn install --ignore-engines --ignore-scripts || sleep 2 && npx yarn cache clean; npx yarn install --ignore-engines --ignore-scripts || sleep 2 && npx yarn install --ignore-engines --ignore-scripts || echo "Giving up"
+    - cd ppm; npm install
+  install_with_scripts_script:
+    - npx yarn install --ignore-engines || sleep 1 && npx yarn install --ignore-engines || echo "There is a reason for so many tries"
+  #install_without_scripts_script:
+  #  - npx yarn install --ignore-scripts --ignore-engines || sleep 1 && npx yarn install --ignore-engines --ignore-scripts || sleep 2 && npx yarn cache clean; npx yarn install --ignore-engines --ignore-scripts || sleep 2 && npx yarn install --ignore-engines --ignore-scripts || echo "Giving up"
   rebuild_for_electron_script:
     - npx yarn build || npx yarn build || npx yarn build
   # install_only_electron_script:

diff --git a/.codacy.yaml b/.codacy.yaml
@@ -3,8 +3,8 @@ engines:
   duplication:
     minTokenMatch: 80
 exclude_paths:
-  - "./spec/fixtures/**"
-  - "./packages/*/spec/fixtures/**"
+  - "spec/fixtures/**"
+  - "packages/*/spec/fixtures/**"
 
 # Since Codacy exposes significantly little on the config.
 # We can use the rest of this document to solidify our settings.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@
 - Removed all telemetry from Core Editor
 - New Pulsar Website
 - New Test Runner to Improve Testing
+- Added Apple Silicon support to `github` Package v0.36.13
 
 
 ### Pulsar

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,20 +1,22 @@
-Copyright (c) 2011-2022 GitHub Inc.
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2022 Pulsar-Edit
+Original work copyright (c) 2011-2022 GitHub Inc.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/package.json b/package.json
@@ -35,8 +35,8 @@
     "atom-light-ui": "file:packages/atom-light-ui",
     "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",
-    "autocomplete-css": "https://codeload.github.com/atom/autocomplete-css/legacy.tar.gz/refs/tags/v0.17.5",
-    "autocomplete-html": "https://github.com/pulsar-edit/autocomplete-html.git#v0.8.9",
+    "autocomplete-css": "file:packages/autocomplete-css",
+    "autocomplete-html": "file:packages/autocomplete-html",
     "autocomplete-plus": "https://codeload.github.com/atom/autocomplete-plus/legacy.tar.gz/refs/tags/v2.42.4",
     "autocomplete-snippets": "https://codeload.github.com/atom/autocomplete-snippets/legacy.tar.gz/refs/tags/v1.12.1",
     "autoflow": "file:packages/autoflow",
@@ -75,7 +75,7 @@
     "fuzzy-finder": "https://codeload.github.com/atom/fuzzy-finder/legacy.tar.gz/refs/tags/v1.14.3",
     "git-diff": "file:packages/git-diff",
     "git-utils": "5.7.1",
-    "github": "https://github.com/pulsar-edit/github.git#v0.36.11",
+    "github": "https://github.com/pulsar-edit/github.git#v0.36.13",
     "glob": "^7.1.1",
     "go-to-line": "file:packages/go-to-line",
     "grammar-selector": "file:packages/grammar-selector",
@@ -140,7 +140,7 @@
     "one-light-syntax": "file:packages/one-light-syntax",
     "one-light-ui": "file:packages/one-light-ui",
     "open-on-github": "https://codeload.github.com/atom/open-on-github/legacy.tar.gz/refs/tags/v1.3.2",
-    "package-generator": "https://codeload.github.com/atom/package-generator/legacy.tar.gz/refs/tags/v1.3.0",
+    "package-generator": "file:packages/package-generator",
     "pathwatcher": "^8.1.2",
     "postcss": "8.2.10",
     "postcss-selector-parser": "6.0.4",
@@ -153,7 +153,7 @@
     "season": "^6.0.2",
     "semver": "7.3.2",
     "service-hub": "^0.7.4",
-    "settings-view": "https://github.com/pulsar-edit/settings-view.git#v0.261.11",
+    "settings-view": "file:packages/settings-view",
     "sinon": "9.2.1",
     "snippets": "https://codeload.github.com/pulsar-edit/snippets/legacy.tar.gz/refs/tags/v1.6.1",
     "solarized-dark-syntax": "file:packages/solarized-dark-syntax",
@@ -194,8 +194,8 @@
     "about": "file:./packages/about",
     "archive-view": "0.66.0",
     "autocomplete-atom-api": "0.10.7",
-    "autocomplete-css": "0.17.5",
-    "autocomplete-html": "0.8.9",
+    "autocomplete-css": "file:./packages/autocomplete-css",
+    "autocomplete-html": "file:./packages/autocomplete-html",
     "autocomplete-plus": "2.42.4",
     "autocomplete-snippets": "1.12.1",
     "autoflow": "file:./packages/autoflow",
@@ -211,7 +211,7 @@
     "exception-reporting": "file:./packages/exception-reporting",
     "find-and-replace": "0.220.1",
     "fuzzy-finder": "1.14.3",
-    "github": "0.36.11",
+    "github": "0.36.13",
     "git-diff": "file:./packages/git-diff",
     "go-to-line": "file:./packages/go-to-line",
     "grammar-selector": "file:./packages/grammar-selector",
@@ -224,7 +224,7 @@
     "notifications": "0.72.1",
     "open-on-github": "1.3.2",
     "package-generator": "1.3.0",
-    "settings-view": "0.261.9",
+    "settings-view": "file:./packages/settings-view",
     "snippets": "1.6.1",
     "spell-check": "0.77.1",
     "status-bar": "1.8.17",

diff --git a/packages/README.md b/packages/README.md
@@ -14,8 +14,8 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
 | **atom-light-syntax** | [`./atom-light-syntax`](./atom-light-syntax) | |
 | **atom-light-ui** | [`./atom-light-ui`](./atom-light-ui) | |
 | **autocomplete-atom-api** | [`atom/autocomplete-atom-api`][autocomplete-atom-api] |  |
-| **autocomplete-css** | [`atom/autocomplete-css`][autocomplete-css] |  |
-| **autocomplete-html** | [`atom/autocomplete-html`][autocomplete-html] |  |
+| **autocomplete-css** | [`./autocomplete-css`][./autocomplete-css] |  |
+| **autocomplete-html** | [`./autocomplete-html`][./autocomplete-html] |  |
 | **autocomplete-plus** | [`atom/autocomplete-plus`][autocomplete-plus] |  |
 | **autocomplete-snippets** | [`atom/autocomplete-snippets`][autocomplete-snippets] |  |
 | **autoflow** | [`./autoflow`](./autoflow) | |
@@ -83,8 +83,8 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
 | **one-light-syntax** | [`./one-light-syntax`](./one-light-syntax) | |
 | **one-light-ui** | [`./one-light-ui`](./one-light-ui) | |
 | **open-on-github** | [`atom/open-on-github`][open-on-github] | [#18278](https://github.com/atom/atom/issues/18278) |
-| **package-generator** | [`atom/package-generator`][package-generator] | [#18279](https://github.com/atom/atom/issues/18279) |
-| **settings-view** | [`atom/settings-view`][settings-view] |  |
+| **settings-view** | [`./settings-view`](./settings-view) |  |
+| **package-generator** | [`./package-generator`](./package-generator) | |
 | **snippets** | [`atom/snippets`][snippets] |  |
 | **solarized-dark-syntax** | [`./solarized-dark-syntax`](./solarized-dark-syntax) | |
 | **solarized-light-syntax** | [`./solarized-light-syntax`](./solarized-light-syntax) | |
@@ -102,8 +102,6 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
 
 [archive-view]: https://github.com/pulsar-edit/archive-view
 [autocomplete-atom-api]: https://github.com/pulsar-edit/autocomplete-atom-api
-[autocomplete-css]: https://github.com/pulsar-edit/autocomplete-css
-[autocomplete-html]: https://github.com/pulsar-edit/autocomplete-html
 [autocomplete-plus]: https://github.com/pulsar-edit/autocomplete-plus
 [autocomplete-snippets]: https://github.com/pulsar-edit/autocomplete-snippets
 [autosave]: https://github.com/pulsar-edit/autosave
@@ -120,8 +118,6 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
 [markdown-preview]: https://github.com/pulsar-edit/markdown-preview
 [notifications]: https://github.com/pulsar-edit/notifications
 [open-on-github]: https://github.com/pulsar-edit/open-on-github
-[package-generator]: https://github.com/pulsar-edit/package-generator
-[settings-view]: https://github.com/pulsar-edit/settings-view
 [snippets]: https://github.com/pulsar-edit/snippets
 [spell-check]: https://github.com/pulsar-edit/spell-check
 [status-bar]: https://github.com/pulsar-edit/status-bar

diff --git a/packages/about/LICENSE.md b/packages/about/LICENSE.md
@@ -1,20 +1,22 @@
-Copyright (c) 2015 Machisté N. Quintana
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2022 Pulsar-Edit
+Original work copyright (c) 2015 Machisté N. Quintana
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/about/README.md b/packages/about/README.md
@@ -1,21 +1,17 @@
 # About package
 
-View useful information about your Atom installation.
+View useful information about your Pulsar installation.
 
-![About Atom](https://cloud.githubusercontent.com/assets/16760489/19395499/69bbb780-922d-11e6-9779-2b8327027ea5.png)
+![About Pulsar](https://cloud.githubusercontent.com/assets/16760489/19395499/69bbb780-922d-11e6-9779-2b8327027ea5.png)
 
-This is a package for [Atom](https://atom.io), a community-led hyper-hackable text editor
+This is a package for [Pulsar](https://pulsar-edit.dev), a community-led hyper-hackable text editor
 
 ## Usage
 
-This package provides a cross-platform "About Atom" view that displays information about your Atom installation, which currently includes the current version, the license, and the Terms of Use.
+This package provides a cross-platform "About Pulsar" view that displays information about your Pulsar installation, which currently includes the current version, the license, and the Terms of Use.
 
 ## Contributing
 Always feel free to help out!  Whether it's filing bugs and feature requests
-or working on some of the open issues, Atom's [contributing guide](https://github.com/atom/atom/blob/master/CONTRIBUTING.md)
-will help get you started while the [guide for contributing to packages](https://github.com/atom/atom/blob/master/docs/contributing-to-packages.md)
+or working on some of the open issues, Pulsar's [contributing guide](https://github.com/pulsar-edit/.github/blob/main/CONTRIBUTING.md)
+will help get you started while the [guide for contributing to packages](https://pulsar-edit.dev/docs/launch-manual/sections/core-hacking/#contributing-to-packages)
 has some extra information.
-
-## License
-
-[MIT License](https://opensource.org/licenses/MIT) - see the [LICENSE](https://github.com/atom/about/blob/master/LICENSE.md) for more details.
diff --git a/packages/about/lib/components/about-view.js b/packages/about/lib/components/about-view.js
@@ -1,7 +1,7 @@
 const { Disposable } = require('atom');
 const etch = require('etch');
 const { shell } = require('electron');
-const AtomLogo = require('./atom-logo');
+const AtomLogo = require('./atom-logo'); //Update to new Pulsar logo (L#83)
 const EtchComponent = require('../etch-component');
 const UpdateView = require('./update-view');
 
@@ -31,7 +31,7 @@ module.exports = class AboutView extends EtchComponent {
   handleReleaseNotesClick(e) {
     e.preventDefault();
     shell.openExternal(
-      this.props.updateManager.getReleaseNotesURLForAvailableVersion()
+      this.props.updateManager.getReleaseNotesURLForAvailableVersion() //update-manager.js will need updating when we decide how to do the changelog
     );
   }
 
@@ -45,13 +45,13 @@ module.exports = class AboutView extends EtchComponent {
 
   handleTermsOfUseClick(e) {
     e.preventDefault();
-    shell.openExternal('https://atom.io/terms');
+    shell.openExternal('https://atom.io/terms'); //If we use this then this URL will need updating but button disabled (L#182)
   }
 
   handleHowToUpdateClick(e) {
     e.preventDefault();
     shell.openExternal(
-      'https://flight-manual.atom.io/getting-started/sections/installing-atom/'
+            'https://pulsar-edit.dev/docs/launch-manual/sections/getting-started/#installing-pulsar'
     );
   }
 
@@ -79,8 +79,9 @@ module.exports = class AboutView extends EtchComponent {
         $.header(
           { className: 'about-header' },
           $.a(
-            { className: 'about-atom-io', href: 'https://atom.io' },
-            $(AtomLogo)
+            { className: 'about-atom-io', href: `${atom.branding.urlWeb}`, },
+            //$(AtomLogo)
+            'Pulsar' //Remove and reinstate above line when available
           ),
           $.div(
             { className: 'about-header-info' },
@@ -177,33 +178,26 @@ module.exports = class AboutView extends EtchComponent {
             },
             'License'
           ),
-          $.button(
+          //Disabled the below as we don't have this but can reuse if there is the need
+          /*$.button(
             {
               className: 'btn terms-of-use',
               onclick: this.handleTermsOfUseClick.bind(this)
             },
             'Terms of Use'
-          )
+          )*/
         )
       ),
 
       $.div(
         { className: 'about-love group-start' },
-        $.span({ className: 'icon icon-code' }),
+        $.a({ className: 'icon icon-code', href: `${atom.branding.urlGH}` }),
         $.span({ className: 'inline' }, ' with '),
-        $.span({ className: 'icon icon-heart' }),
+        $.a({ className: 'icon icon-heart', href: `${atom.branding.urlWeb}` + "community" }),
         $.span({ className: 'inline' }, ' by '),
-        $.a({ className: 'icon icon-logo-github', href: 'https://github.com' })
+        //$.a({ className: 'icon icon-logo-github', href: `${atom.branding.urlWeb}` }) Replace icon with Pulsar word logo and delete following line
+        $.a({ className: 'inline', href: `${atom.branding.urlWeb}` }, 'Pulsar Team')
       ),
-
-      $.div(
-        { className: 'about-credits group-item' },
-        $.span({ className: 'inline' }, 'And the awesome '),
-        $.a(
-          { href: 'https://github.com/pulsar-edit/pulsar/contributors' },
-          'Pulsar community'
-        )
-      )
     );
   }
 
@@ -230,3 +224,4 @@ module.exports = class AboutView extends EtchComponent {
     return 'info';
   }
 };
+