From acaf004120ee64bb695ce1708ff8fb761a57ecd9 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 20 Oct 2024 16:46:04 -0700 Subject: [PATCH 01/12] =?UTF-8?q?[language-hyperlink]=20Fix=20bug=20in=20`?= =?UTF-8?q?tree-sitter-hyperlink`=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …where it got flummoxed by URLs with subdomains. --- .../grammars/ts/tree-sitter-hyperlink.wasm | Bin 8303 -> 8375 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/language-hyperlink/grammars/ts/tree-sitter-hyperlink.wasm b/packages/language-hyperlink/grammars/ts/tree-sitter-hyperlink.wasm index 723c2ae6bd3a9b28d935affc1194b7db7568fcb5..8387e4f22343abc05e66f0da42de60bf8485f927 100755 GIT binary patch literal 8375 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 literal 8303 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 E0I^93$^ZZW From df15c8c0877a07ab6da4267d7755b4982cc3fafc Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 20 Oct 2024 16:47:08 -0700 Subject: [PATCH 02/12] [language-c] Highlight parameters like the "foo" in `type *& foo` --- .../language-c/grammars/tree-sitter-cpp/highlights.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/language-c/grammars/tree-sitter-cpp/highlights.scm b/packages/language-c/grammars/tree-sitter-cpp/highlights.scm index c819911905..778e294889 100644 --- a/packages/language-c/grammars/tree-sitter-cpp/highlights.scm +++ b/packages/language-c/grammars/tree-sitter-cpp/highlights.scm @@ -150,10 +150,10 @@ ; ((identifier) @variable.other.readwrite.member.cpp ; (#match? @variable.other.readwrite.member.cpp "^(f|m)[A-Z]\\w*$")) -; The "foo" in `int &foo` with in a parameter list. -(parameter_declaration - declarator: (reference_declarator - (identifier) @variable.parameter.cpp)) +; The "foo" in `const char *foo` within a parameter list. +; (Should work no matter how many pointers deep we are.) +(reference_declarator (identifier) @variable.parameter.cpp + (#is? test.descendantOfType "parameter_declaration")) ; KEYWORDS From e6398cb6565431844c399aba3f0a42d76b607397 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 20 Oct 2024 17:26:01 -0700 Subject: [PATCH 03/12] [language-hyperlink] Fix a regression in the last change --- .../grammars/ts/tree-sitter-hyperlink.wasm | Bin 8375 -> 8330 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/language-hyperlink/grammars/ts/tree-sitter-hyperlink.wasm b/packages/language-hyperlink/grammars/ts/tree-sitter-hyperlink.wasm index 8387e4f22343abc05e66f0da42de60bf8485f927..21a144fb89ba0c9f1c9008a6c65ab7a4d099a596 100755 GIT binary patch literal 8330 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 W0QIxL4&WW|4%CN$w}ErOS>V5Kbd7uf literal 8375 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 From 2edb9430bac111de864df6c5d2e40f584943738d Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 20 Oct 2024 17:34:42 -0700 Subject: [PATCH 04/12] Make CI happy --- .../grammars/modern-tree-sitter-hyperlink.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson b/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson index 7977a53691..ebd8738380 100644 --- a/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson +++ b/packages/language-hyperlink/grammars/modern-tree-sitter-hyperlink.cson @@ -5,6 +5,6 @@ parser: 'tree-sitter-hyperlink' injectionRegex: 'hyperlink' treeSitter: - parserSource: 'github:savetheclocktower/tree-sitter-hyperlink#04c3a667ba432236578ac99bbacd0412f88d6fac' + parserSource: 'github:savetheclocktower/tree-sitter-hyperlink#0704b3e5a72892495dd13b85a5064582414cb39a' grammar: 'ts/tree-sitter-hyperlink.wasm' highlightsQuery: 'ts/highlights.scm' From fea6d4fadb5e8b3d55fefbd6dc4bca6739518932 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 27 Oct 2024 11:07:06 -0700 Subject: [PATCH 05/12] =?UTF-8?q?[language-shellscript]=20Highlight=20all?= =?UTF-8?q?=20operators=20in=20parameter=20expansions=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …not just `#`. --- .../grammars/tree-sitter/highlights.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/language-shellscript/grammars/tree-sitter/highlights.scm b/packages/language-shellscript/grammars/tree-sitter/highlights.scm index 031507a766..8c8549738f 100644 --- a/packages/language-shellscript/grammars/tree-sitter/highlights.scm +++ b/packages/language-shellscript/grammars/tree-sitter/highlights.scm @@ -134,7 +134,15 @@ (binary_expression ["&&" "||"] @keyword.operator.logical.shell) (pipeline "|" @keyword.operator.pipe.shell) -(expansion operator: "#" @keyword.operator.expansion.shell) + +; Any expansion operator, including all `#`s and `%`s in the following examples: +; +; foo="${bar#*.}" +; foo="${bar##*.}" +; foo="${bar%*.}" +; foo="${bar%%*.}" +; +(expansion operator: _ @keyword.operator.expansion.shell) ; "*" @keyword.operator.glob.shell From 54dd244ce643b28df70311d54f82cd72c58de6b5 Mon Sep 17 00:00:00 2001 From: Andrew Dupont Date: Sun, 10 Nov 2024 17:30:41 -0800 Subject: [PATCH 06/12] =?UTF-8?q?[symbols-view]=20Allow=20project-wide=20s?= =?UTF-8?q?ymbol=20searches=20to=20consider=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …multiple providers instead of enforcing exclusivity. --- packages/symbols-view/lib/project-view.js | 6 ++- packages/symbols-view/lib/provider-broker.js | 11 +++- .../providers/second-dummy-provider.js | 51 +++++++++++++++++++ .../symbols-view/spec/symbols-view-spec.js | 22 ++++++++ 4 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 packages/symbols-view/spec/fixtures/providers/second-dummy-provider.js diff --git a/packages/symbols-view/lib/project-view.js b/packages/symbols-view/lib/project-view.js index 7988cdb3d2..04d06894cd 100644 --- a/packages/symbols-view/lib/project-view.js +++ b/packages/symbols-view/lib/project-view.js @@ -143,7 +143,11 @@ module.exports = class ProjectView extends SymbolsView { // longer need the symbols we asked for. let signal = this.abortController.signal; - let providers = await this.broker.select(meta); + // A user would probably expect this search to return symbols from all + // files in the project, regardless of their language. Instead of picking a + // “winning” provider as we usually do, we should instead consult _all_ + // providers that consider themselves up to the task. + let providers = await this.broker.select(meta, { enforceExclusivity: false }); if (providers?.length === 0) { console.warn('No providers found!'); return null; diff --git a/packages/symbols-view/lib/provider-broker.js b/packages/symbols-view/lib/provider-broker.js index f702336272..0c28739f42 100644 --- a/packages/symbols-view/lib/provider-broker.js +++ b/packages/symbols-view/lib/provider-broker.js @@ -175,7 +175,7 @@ module.exports = class ProviderBroker { * @returns {Promise} A promise that resolves with a list * of symbol providers. */ - async select(meta) { + async select(meta, { enforceExclusivity = true } = {}) { let shouldLog = Config.get('enableDebugLogging'); let exclusivesByScore = []; let results = []; @@ -210,7 +210,14 @@ module.exports = class ProviderBroker { let { value: score } = outcome; let name = provider.name ?? 'unknown'; let packageName = provider?.packageName ?? 'unknown'; - let isExclusive = provider?.isExclusive ?? false; + + // When `enforceExclusivity` is `false`, we'll treat all providers as + // non-exclusive, even the ones that indicate otherwise. + // + // It still falls on a provider to know whether to provide symbols or + // not. Any provider is free to inspect the metadata and return an empty + // set if it thinks it's inappropriate for its results to be considered. + let isExclusive = enforceExclusivity ? (provider?.isExclusive ?? false) : false; if (shouldLog) console.debug('Score for', provider.name, 'is:', score); diff --git a/packages/symbols-view/spec/fixtures/providers/second-dummy-provider.js b/packages/symbols-view/spec/fixtures/providers/second-dummy-provider.js new file mode 100644 index 0000000000..5f5cd9e8fb --- /dev/null +++ b/packages/symbols-view/spec/fixtures/providers/second-dummy-provider.js @@ -0,0 +1,51 @@ +const { Point } = require('atom'); + +function last(arr) { + return arr[arr.length - 1]; +} + +const ICONS = [ + 'icon-package', + 'icon-key', + 'icon-gear', + 'icon-tag', + null +]; + +module.exports = { + packageName: 'symbol-provider-dummy-second', + name: 'Dummy (Second)', + isExclusive: true, + canProvideSymbols() { + return true; + }, + getSymbols(meta) { + let { editor, type } = meta; + let results = []; + if (type === 'file') { + let count = editor.getLineCount(); + // Put a symbol on every third line. + for (let i = 0; i < count; i += 3) { + results.push({ + position: new Point(i, 0), + name: `(Second) Symbol on Row ${i + 1}`, + icon: ICONS[(i / 3) % (ICONS.length + 1)] + }); + } + } else if (type === 'project') { + let root = last(atom.project.getPaths()); + let count = editor.getLineCount(); + // Put a symbol on every third line. + for (let i = 0; i < count; i += 3) { + results.push({ + position: new Point(i, 0), + name: `(Second) Symbol on Row ${i + 1}`, + directory: root, + file: 'other-file.js', + icon: ICONS[i % (ICONS.length + 1)] + }); + } + } + return results; + } +}; diff --git a/packages/symbols-view/spec/symbols-view-spec.js b/packages/symbols-view/spec/symbols-view-spec.js index ef73f3b599..9001bd62ee 100644 --- a/packages/symbols-view/spec/symbols-view-spec.js +++ b/packages/symbols-view/spec/symbols-view-spec.js @@ -7,6 +7,7 @@ const SymbolsView = require('../lib/symbols-view'); const { migrateOldConfigIfNeeded } = require('../lib/util'); const DummyProvider = require('./fixtures/providers/dummy-provider'); +const SecondDummyProvider = require('./fixtures/providers/second-dummy-provider'); const AsyncDummyProvider = require('./fixtures/providers/async-provider'); const ProgressiveProjectProvider = require('./fixtures/providers/progressive-project-provider.js'); const QuicksortProvider = require('./fixtures/providers/quicksort-provider.js'); @@ -696,6 +697,27 @@ describe('SymbolsView', () => { expect(symbolsView.element.querySelector('li:first-child .secondary-line')).toHaveText(`${relative}:13`); }); + it('includes results from all providers, even if they claim to be exclusive', async () => { + registerProvider(DummyProvider); + registerProvider(SecondDummyProvider); + + await dispatchAndWaitForChoices('symbols-view:toggle-project-symbols'); + symbolsView = atom.workspace.getModalPanels()[0].item; + + expect(symbolsView.selectListView.refs.loadingMessage).toBeUndefined(); + expect(document.body.contains(symbolsView.element)).toBe(true); + expect(symbolsView.element.querySelectorAll('li').length).toBe(10); + + let root = atom.project.getPaths()[1]; + let resolved = directory.resolve('other-file.js'); + let relative = `${path.basename(root)}${resolved.replace(root, '')}`; + + expect(symbolsView.element.querySelector('li:first-child .primary-line')).toHaveText('Symbol on Row 1'); + expect(symbolsView.element.querySelector('li:first-child .secondary-line')).toHaveText(`${relative}:1`); + expect(symbolsView.element.querySelector('li:last-child .primary-line')).toHaveText('(Second) Symbol on Row 13'); + expect(symbolsView.element.querySelector('li:last-child .secondary-line')).toHaveText(`${relative}:13`); + }); + it('does not prefill the query field if `prefillSelectedText` is `false`', async () => { atom.config.set('symbols-view.prefillSelectedText', false); registerProvider(DummyProvider); From ac18e75a32220be26c94fca0f54f8bb8066ea0bd Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Tue, 19 Nov 2024 00:42:46 -0500 Subject: [PATCH 07/12] electron-builder: Fix race condition when preparing to copy binaries There was a race condition where two separate pieces of async code would A) create the 'binaries' folder, and B) copy binaries to that folder. The problem was the lack of a guarantee they would happen in that order! If the attempt to copy files happened before the directory got created, the whole electron-builder run would error and/or stall out from unsuccessful auto-retries failing. To fix the situation: Ensure the 'binaries' dir exists *before* copying binaries to it. Do so by making the directory *first* with a *synchronous* function. (I might usually try to eliminate race conditions while still using asynchronous code, but for simple scripts, I prefer to use synchronous code, for simplicity's sake and for reliability.) In other words: Can't copy files to a destination dir that doesn't exist! This makes sure the directory exists *first*, then copy. Also: Log any error we hit while making the dir, but try to continue. (For anyone who has successfully run electorn-builder once in the repo, they already have a 'binaries' folder, so we can ignore any error when trying to "make the dir" that already exists. If it doesn't exist, the copy operation will print another relevant error message. So we don't need to error early here. But logging it should help if this issue needs any troubleshooting on anyone's machines (including CI) any time in the future.) --- script/electron-builder.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/script/electron-builder.js b/script/electron-builder.js index a49fd52f40..45d94836dd 100644 --- a/script/electron-builder.js +++ b/script/electron-builder.js @@ -1,6 +1,7 @@ const path = require('path') const normalizePackageData = require('normalize-package-data'); const fs = require("fs/promises"); +const {mkdirSync} = require("fs"); const generateMetadata = require('./generate-metadata-for-builder') const macBundleDocumentTypes = require("./mac-bundle-document-types.js"); @@ -289,7 +290,13 @@ async function main() { config: options }).then((result) => { console.log("Built binaries") - fs.mkdir('binaries').catch(() => "") + try { + mkdirSync('binaries', {recursive: true}) + } catch (err) { + console.warn("Warning: error encountered when making the 'binaries' dir.") + console.warn("(HINT: If the 'binaries' folder already exists, then this error message is probably fine to ignore!)") + console.warn(err) + } Promise.all(result.map(r => fs.copyFile(r, path.join('binaries', path.basename(r))))) }).catch((error) => { console.error("Error building binaries") From b7e3fb2864f3537185c1c01920bf4be328dd8bd9 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 20 Nov 2024 18:59:06 -0500 Subject: [PATCH 08/12] CI: Update Cirrus Rolling release upload token --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 56e125321e..58d5fff145 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,7 +63,7 @@ arm_linux_task: memory: 8G env: USE_SYSTEM_FPM: 'true' - ROLLING_UPLOAD_TOKEN: ENCRYPTED[50debc954fd1b46513fa44d6270491edaba4c9c0ab6fbf0a3fb8e3bdfe9e380d203bd90857ae720b5af31d8a02c6389f] + ROLLING_UPLOAD_TOKEN: ENCRYPTED[bc554e7208b73b37e2b776c70905b142a5023cea4a9b89e1370b8815adea18f8436e8b075e6cf1bcb62133d659b5d198] prepare_script: - apt-get update - export DEBIAN_FRONTEND="noninteractive" @@ -135,7 +135,7 @@ silicon_mac_task: APPLEID: ENCRYPTED[549ce052bd5666dba5245f4180bf93b74ed206fe5e6e7c8f67a8596d3767c1f682b84e347b326ac318c62a07c8844a57] APPLEID_PASSWORD: ENCRYPTED[774c3307fd3b62660ecf5beb8537a24498c76e8d90d7f28e5bc816742fd8954a34ffed13f9aa2d1faf66ce08b4496e6f] TEAM_ID: ENCRYPTED[11f3fedfbaf4aff1859bf6c105f0437ace23d84f5420a2c1cea884fbfa43b115b7834a463516d50cb276d4c4d9128b49] - ROLLING_UPLOAD_TOKEN: ENCRYPTED[50debc954fd1b46513fa44d6270491edaba4c9c0ab6fbf0a3fb8e3bdfe9e380d203bd90857ae720b5af31d8a02c6389f] + ROLLING_UPLOAD_TOKEN: ENCRYPTED[bc554e7208b73b37e2b776c70905b142a5023cea4a9b89e1370b8815adea18f8436e8b075e6cf1bcb62133d659b5d198] prepare_script: - brew update - brew uninstall node@20 From f1fdce760257c6c956f71450f2f290d7d092060d Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Wed, 20 Nov 2024 19:41:53 -0500 Subject: [PATCH 09/12] Changelog: Update for 1.123.0 --- CHANGELOG.md | 15 +++++++++++++++ packages/welcome/lib/changelog-view.js | 26 ++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ae8ba3ad6..31232ccac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,22 @@ ## [Unreleased] +## 1.123.0 + - Fixed SQL State Storage not loading when starting Pulsar from a self-contained binary like appImage, tar.gz, etc. +- [symbols-view] Allow project-wide symbol search to consider results from more than one provider. +- Tree-sitter fixes and enhancements for hyperlinks, C, and shell scripts. +- Restore use of `shell.moveItemToTrash` API in tree-view, for Electron 12 compatibility. + +### Pulsar + +- Tree-sitter rolling fixes, 1.123 edition [@savetheclocktower](https://github.com/pulsar-edit/pulsar/pull/1118) +- [symbols-view] Allow project-wide symbol searches to consider multiple providers [@savetheclocktower](github.com/pulsar-edit/pulsar/pull/1133) +- electron-builder: Fix race condition when preparing to copy binaries [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/1137) +- [ci] Update GitHub Token in CirrusCI config [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/1134) +- Fixing requiring of better-sqlite3 [@mauricioszabo](github.com/pulsar-edit/pulsar/pull/1122) +- Revert removal of `shell.moveItemToTrash` [@savetheclocktower](https://github.com/pulsar-edit/pulsar/pull/1125) +- CI: Bump macOS runner images from macos-12 to macos-13 [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/1120) ## 1.122.0 diff --git a/packages/welcome/lib/changelog-view.js b/packages/welcome/lib/changelog-view.js index 8f47460936..e932bbe404 100644 --- a/packages/welcome/lib/changelog-view.js +++ b/packages/welcome/lib/changelog-view.js @@ -50,34 +50,16 @@ export default class ChangeLogView {

Feel free to read our Full Change Log.

  • - Added a SQL State Storage alternative to IndexedDB (opt-in, off by default). + Fixed SQL State Storage not loading when starting Pulsar from a self-contained binary like appImage, tar.gz, etc.
  • - Repackaged the AppImage so it uses our launcher script internally (supports more CLI/launch flags). + [symbols-view] Allow project-wide symbol search to consider results from more than one provider.
  • - [language-php] Highlighted “null-safe” property access correctly. + Tree-sitter fixes and enhancements for hyperlinks, C, and shell scripts.
  • - [language-c] Scoped template delimiters properly in C++. -
    • -
  • - [language-c] Consolidated common highlighting queries between the C and C++ grammars for more consistency in syntax highlighting. -
    • -
  • - Fixed incorrect behavior in certain scenarios for “Fold at Indent Level X” commands. -
    • -
  • - Fixed exception when resolving divided folds (e.g., #ifdefs in C/C++). -
    • -
  • - Avoided "length of null" error in autocomplete-plus for the PHP Tree-sitter grammar. -
    • -
  • - Preserved /usr/bin/pulsar and /usr/bin/ppm on RPM updates. -
    • -
  • - [tree-view] Moved to a more modern API for file removal in preparation for an Electron upgrade. + Restore use of shell.moveItemToTrash API in tree-view, for Electron 12 compatibility.
From 2e6f61fd134009f2f11040595c8f6c5c1f81cb9e Mon Sep 17 00:00:00 2001 From: confused-Techie Date: Wed, 20 Nov 2024 18:16:57 -0800 Subject: [PATCH 10/12] Bump version in `package.json` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 956b3fd49d..b3aabe0fc3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pulsar", "author": "Pulsar-Edit ", "productName": "Pulsar", - "version": "1.122.0-dev", + "version": "1.123.0", "description": "A Community-led Hyper-Hackable Text Editor", "branding": { "id": "pulsar", From c87a9f95cf21f86654cd346da32a7413afc746e0 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Thu, 21 Nov 2024 16:14:02 -0500 Subject: [PATCH 11/12] Add back '-dev' to the version string --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3aabe0fc3..904a45ea33 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pulsar", "author": "Pulsar-Edit ", "productName": "Pulsar", - "version": "1.123.0", + "version": "1.123.0-dev", "description": "A Community-led Hyper-Hackable Text Editor", "branding": { "id": "pulsar", From ae3d51f479e0a539fce798a8b6568e6950c6a471 Mon Sep 17 00:00:00 2001 From: DeeDeeG Date: Sun, 1 Dec 2024 16:41:22 -0500 Subject: [PATCH 12/12] electron-builder: Don't create differential update blockmaps (#1139) They are *extremely* computationally intensive to make, and we don't even use them. Use these undocumented config options to skip making them entirely. Source (where I learned about these config options): github[dot]com/electron-userland/electron-builder/issues/2900#issuecomment-730571696 By the way, the impetus for disabling these is that macOS 13 CI keeps failing at the blockmap creation step. We want successful binary builds in CI! Note: There apparently is no way to disable blockmaps for the .zip target on macOS. Only for the macOS .dmg and the Windows NSIS targets. --- script/electron-builder.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/script/electron-builder.js b/script/electron-builder.js index 45d94836dd..9a15598285 100644 --- a/script/electron-builder.js +++ b/script/electron-builder.js @@ -199,7 +199,8 @@ let options = { }, }, "dmg": { - "sign": false + "sign": false, + "writeUpdateInfo": false }, "win": { "icon": icoIcon, @@ -236,7 +237,8 @@ let options = { // the AppID 'dev.pulsar-edit.pulsar'. If this value ever changes, // A PR to GitHub Desktop must be made with the updated value "include": "resources/win/installer.nsh", - "warningsAsErrors": false + "warningsAsErrors": false, + "differentialPackage": false }, "extraMetadata": { },