Merge branch 'even-more-bundles' of https://github.com/pulsar-edit/pulsar into even-more-bundles

This commit is contained in:
confused-Techie 2023-02-24 18:30:51 -08:00
commit d83f6733b5
17 changed files with 222 additions and 55 deletions

View File

@ -1,3 +1,6 @@
env:
PYTHON_VERSION: 3.10
linux_task:
alias: linux
container:
@ -96,13 +99,19 @@ arm_linux_task:
silicon_mac_task:
alias: mac
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
image: ghcr.io/cirruslabs/macos-monterey-xcode:14
memory: 8G
env:
CSC_LINK: ENCRYPTED[0078015a03bb6cfdbd80113ae5bbb6f448fd4bbbc40efd81bf2cb1554373046b475a4d7c77e3e3e82ac1ce2f7e3d2da5]
CSC_KEY_PASSWORD: ENCRYPTED[82bb72653d39578035ed1860ab4978703d50bd326d925a146ff08782f987ceb37ac2d8dbace52dec2b0e2ef92debf097]
APPLEID: ENCRYPTED[549ce052bd5666dba5245f4180bf93b74ed206fe5e6e7c8f67a8596d3767c1f682b84e347b326ac318c62a07c8844a57]
APPLEID_PASSWORD: ENCRYPTED[774c3307fd3b62660ecf5beb8537a24498c76e8d90d7f28e5bc816742fd8954a34ffed13f9aa2d1faf66ce08b4496e6f]
TEAM_ID: ENCRYPTED[11f3fedfbaf4aff1859bf6c105f0437ace23d84f5420a2c1cea884fbfa43b115b7834a463516d50cb276d4c4d9128b49]
test_script:
- brew install node@16 yarn git python
- brew install node@16 yarn git python@$PYTHON_VERSION
- git submodule init
- git submodule update
- ln -s /opt/homebrew/bin/python3 /opt/homebrew/bin/python
- ln -s /opt/homebrew/bin/python$PYTHON_VERSION /opt/homebrew/bin/python
- export PATH="/opt/homebrew/bin:/opt/homebrew/opt/node@16/bin:$PATH"
- sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json
- yarn install || yarn install
@ -125,16 +134,22 @@ silicon_mac_task:
intel_mac_task:
alias: mac
macos_instance:
image: ghcr.io/cirruslabs/macos-monterey-base:latest
image: ghcr.io/cirruslabs/macos-monterey-xcode:14
memory: 8G
env:
CSC_LINK: ENCRYPTED[0078015a03bb6cfdbd80113ae5bbb6f448fd4bbbc40efd81bf2cb1554373046b475a4d7c77e3e3e82ac1ce2f7e3d2da5]
CSC_KEY_PASSWORD: ENCRYPTED[82bb72653d39578035ed1860ab4978703d50bd326d925a146ff08782f987ceb37ac2d8dbace52dec2b0e2ef92debf097]
APPLEID: ENCRYPTED[549ce052bd5666dba5245f4180bf93b74ed206fe5e6e7c8f67a8596d3767c1f682b84e347b326ac318c62a07c8844a57]
APPLEID_PASSWORD: ENCRYPTED[774c3307fd3b62660ecf5beb8537a24498c76e8d90d7f28e5bc816742fd8954a34ffed13f9aa2d1faf66ce08b4496e6f]
TEAM_ID: ENCRYPTED[11f3fedfbaf4aff1859bf6c105f0437ace23d84f5420a2c1cea884fbfa43b115b7834a463516d50cb276d4c4d9128b49]
dist_script:
- sudo rm -rf /Library/Developer/CommandLineTools
- echo A | softwareupdate --install-rosetta
- arch -x86_64 xcode-select --install
- arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
- export PATH="/usr/local/opt/node@16/bin:/usr/local/bin:$PATH"
- arch -x86_64 brew install node@16 yarn git python
- ln -s /usr/local/bin/python3 /usr/local/bin/python
- arch -x86_64 brew install node@16 yarn git python@$PYTHON_VERSION
- ln -s /usr/local/bin/python$PYTHON_VERSION /usr/local/bin/python
- git submodule init
- git submodule update
- sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`/g" package.json

View File

@ -21,7 +21,7 @@ jobs:
- name: Setup NodeJS - ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: #{{ matrix.node-version }}
node-version: ${{ matrix.node-version }}
- name: Install Dependencies
run: yarn install

View File

@ -45,6 +45,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
max-parallel: 8
matrix:
include:
- package: "atom-dark-syntax"

View File

@ -6,8 +6,60 @@
## [Unreleased]
## 1.102.0
- Fixed a bug where `pulsar` on Windows could never trigger
- Fixed `github` package shelling out to `git` on macOS
- Fixed minor bugs found during fixes to tests
- Improved our testing infastructure to aide in finding and fixing further bugs
- Updated many dependencies of Pulsar and its core packages
- New Pulsar Icon on macOS
- Selected text is styled by default
- Restored `right-clicked` CSS class on tags
- Fixed syntax highlighting on C++
- Updated JavaScript snippets to modern ES6 syntax
- PPM no longer assumes `master` for git branches
### Pulsar
- Added: implement signing and notarizing for macOS, PR #4 lol [@Meadowsys](https://github.com/pulsar-edit/pulsar/pull/387)
- Fixed: Pin `python` brew installation to `3.10` during MacOS Intel Cirrus Build [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/384)
- Update: Bump `ppm` to `a46537c0b7f0eaaef5404ef88003951fdc988c65` [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/383)
- Added: Add new macOS icon [@mdibella-dev](https://github.com/pulsar-edit/pulsar/pull/372)
- Fixed: type $ as # [@Meadowsys](https://github.com/pulsar-edit/pulsar/pull/378)
- Update: deps: Update github to v0.36.14-pretranspiled-take-2 [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/375)
- Added: add style to selected text by default [@Sertonix](https://github.com/pulsar-edit/pulsar/pull/238)
- Added: Set Max Concurrent Package Tests [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/376)
- Fixed: c++ fixes [@icecream17](https://github.com/pulsar-edit/pulsar/pull/369)
- Update: deps: Update github to v0.36.14-pretranspiled [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/373)
- Update `coffeescript` [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/361)
- Updated: Misc Dependency Updates [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/362)
- Added: Bundle `autocomplete-plus` [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/358)
- Fixed: Add LICENSE.md to extra resources (resourcesPath) [@Daeraxa](https://github.com/pulsar-edit/pulsar/pull/354)
- Fixed: Get Windows `pulsar` Working [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/340)
- Fixed: Restore `right-clicked` class on a right-clicked tab [@savetheclocktower](https://github.com/pulsar-edit/pulsar/pull/368)
- Updated: ppm: Update submodule to commit 4645ba2905747897b0 [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/371)
- Added: Machine decaf tabs spec [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/367)
- Added: Manually Decaf `tabs` package Specs [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/357)
- Fixed: Uncomment and fix a settings-view package test [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/366)
- Added: Decaf Changes from Manual and Machine Decaf to Main [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/356)
- Added: Manual decafe tabs [@confused-Techie](https://github.com/pulsar-edit/pulsar/pull/352)
- Added: Organize failing tests [@mauricioszabo](https://github.com/pulsar-edit/pulsar/pull/307)
- Fixed: autocomplete-snippets: Fix repo URL [@DeeDeeG](https://github.com/pulsar-edit/pulsar/pull/341)
- Updated: update apm message to pulsar -p [@Daeraxa](https://github.com/pulsar-edit/pulsar/pull/337)
- Fixed: Replace incorrect spellings of 'macOS' with the correct one [@mdibella-dev](https://github.com/pulsar-edit/pulsar/pull/336)
- Changed: use `let` and `const` in js snippets [@Sertonix](https://github.com/pulsar-edit/pulsar/pull/326)
- Fixed: Fix URI to correct address [@mdibella-dev](https://github.com/pulsar-edit/pulsar/pull/335)
- Updated: update copyright year (2023) [@icecream17](https://github.com/pulsar-edit/pulsar/pull/332)
### ppm
- Fixed: fix: Don't assume `master` when checking git packages for upgrades [@savetheclocktower](https://github.com/pulsar-edit/ppm/pull/56)
- Fixed: meta: Normalize package.json and lockfile line endings [@DeeDeeG](https://github.com/pulsar-edit/ppm/pull/54)
- Update: spec: Fixtures Node v10.20.1 --> Electron v12.2.3 [@DeeDeeG](https://github.com/pulsar-edit/ppm/pull/52)
- Fixed: Fix .com links, pulsar rebranding and rebranding readme [@Daeraxa](https://github.com/pulsar-edit/ppm/pull/48)
### github
- Fixed: lib: Rebrand getAtomAppName() function (fix shelling out to `git` on macOS) [@DeeDeeG](https://github.com/pulsar-edit/github/pull/13)
- Fixed: meta: Revert "main" to "./lib/index", no dist (fix package on `master` branch) [@DeeDeeG](https://github.com/pulsar-edit/github/pull/12)
## 1.101.0-beta

View File

@ -2,7 +2,7 @@
"name": "pulsar",
"author": "Pulsar Community <noreply@pulsar-edit.com>",
"productName": "Pulsar",
"version": "1.101.0-dev",
"version": "1.102.0-dev",
"description": "A Community-led Hyper-Hackable Text Editor",
"branding": {
"id": "pulsar",
@ -70,7 +70,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.13",
"github": "https://codeload.github.com/pulsar-edit/github/tar.gz/refs/tags/v0.36.14-pretranspiled-take-2",
"glob": "^7.1.1",
"go-to-line": "file:packages/go-to-line",
"grammar-selector": "file:packages/grammar-selector",
@ -206,7 +206,7 @@
"exception-reporting": "file:./packages/exception-reporting",
"find-and-replace": "0.220.1",
"fuzzy-finder": "1.14.3",
"github": "0.36.13",
"github": "0.36.14",
"git-diff": "file:./packages/git-diff",
"go-to-line": "file:./packages/go-to-line",
"grammar-selector": "file:./packages/grammar-selector",
@ -277,6 +277,7 @@
"private-js-docs": "jsdoc2md --private ./src/**/*.js ./packages/**/*.js > ./docs/Source-Code-Documentation.md"
},
"devDependencies": {
"@electron/notarize": "^1.2.3",
"@playwright/test": "1.22.2",
"electron": "12.2.3",
"electron-builder": "23.3.1",

View File

@ -49,10 +49,6 @@ atom-text-editor {
color: @syntax-cursor-color;
}
.selection .region {
background-color: @syntax-selection-color;
}
.bracket-matcher .region {
border-color: @syntax-result-marker-color;
}

View File

@ -49,10 +49,6 @@ atom-text-editor {
color: @syntax-cursor-color;
}
.selection .region {
background-color: @syntax-selection-color;
}
.bracket-matcher .region {
border-color: @syntax-result-marker-color;
}

View File

@ -69,9 +69,17 @@
'name': 'punctuation.separator.namespace.access.cpp'
}
{
'match': '\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\b'
'match': '\\b(typeid|alignof|alignas)\\b'
'name': 'keyword.operator.cpp'
}
{
'match': '\\b(and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|xor|xor_eq)\\b'
'name': 'keyword.operator.alias.cpp'
}
{
'match': '\\bstatic_assert\\b'
'name': 'keyword.static-assert.cpp'
}
{
'match': '\\b(class|decltype|wchar_t|char16_t|char32_t)\\b'
'name': 'storage.type.cpp'
@ -242,7 +250,7 @@
"name": "meta.using-namespace-declaration.cpp"
},
{
'begin': '\\b(namespace)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+'
'begin': '\\b(namespace)\\b\\s*((?:[_A-Za-z][_A-Za-z0-9]*\\b(::)?)*)?+'
'beginCaptures':
'1':
'name': 'storage.type.cpp'
@ -281,33 +289,36 @@
]
}
{
'begin': '\\b(class|struct)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s*(public|protected|private)\\s*([_A-Za-z][_A-Za-z0-9]*\\b)((\\s*,\\s*(public|protected|private)\\s*[_A-Za-z][_A-Za-z0-9]*\\b)*))?'
'begin': '\\b(class|struct)\\b\\s*([_A-Za-z][_A-Za-z0-9]*\\b)?+(\\s*:\\s)?'
'beginCaptures':
'1':
'name': 'storage.type.cpp'
'2':
'name': 'entity.name.type.cpp'
'4':
'name': 'storage.type.modifier.cpp'
'5':
'name': 'entity.name.type.inherited.cpp'
'6':
'patterns': [
{
'match': '(public|protected|private)'
'name': 'storage.type.modifier.cpp'
}
{
'match': '[_A-Za-z][_A-Za-z0-9]*'
'name': 'entity.name.type.inherited.cpp'
}
]
'end': '(?<=\\})|(?=(;|\\(|\\)|>|\\[|\\]|=))'
'name': 'meta.class-struct-block.cpp'
'patterns': [
{
'include': '#angle_brackets'
}
{
'begin': '(virtual\\s*)?(public|protected|private)\\s*(virtual\\s*)?([_A-Za-z][_A-Za-z0-9]*)\\b'
'beginCaptures':
'1':
'name': 'storage.type.modifier.cpp'
'2':
'name': 'storage.type.modifier.cpp'
'3':
'name': 'storage.type.modifier.cpp'
'4':
'name': 'entity.name.type.inherited.cpp'
'end': '(\\{)|(\\s*\\n)|(,)?'
'patterns': [
{
'include': '#angle_brackets'
}
]
}
{
'begin': '\\{'
'beginCaptures':

View File

@ -90,6 +90,7 @@ scopes:
'"#define"': 'keyword.control.directive'
'"#include"': 'keyword.control.directive'
'preproc_directive': 'keyword.control.directive'
'"static_assert"': 'keyword.control.directive'
'"if"': 'keyword.control'
'"else"': 'keyword.control'
@ -133,12 +134,14 @@ scopes:
call_expression > identifier,
call_expression > field_expression > field_identifier,
call_expression > scoped_identifier > identifier,
call_expression > qualified_identifier > identifier,
template_function > identifier,
template_function > scoped_identifier > identifier,
template_method > field_identifier,
function_declarator > identifier,
function_declarator > field_identifier,
function_declarator > scoped_identifier > identifier,
function_declarator > qualified_identifier > identifier,
destructor_name > identifier
''': 'entity.name.function'
@ -224,8 +227,8 @@ scopes:
'"=="': 'keyword.operator'
'"!"': 'keyword.operator'
'"!="': 'keyword.operator'
'relational_expression > "<"': 'keyword.operator'
'relational_expression > ">"': 'keyword.operator'
'binary_expression > "<"': 'keyword.operator'
'binary_expression > ">"': 'keyword.operator'
'">="': 'keyword.operator'
'"<="': 'keyword.operator'
'"&&"': 'keyword.operator'

View File

@ -53,40 +53,40 @@ export default class ChangeLogView {
<p>Feel free to read our <a href="https://github.com/pulsar-edit/pulsar/blob/master/CHANGELOG.md">Full Change Log</a>.</p>
<ul>
<li>
Fixed a bug where macOS menus like "Open" don't do anything.
Signed Pulsar macOS Binaries
</li>
<li>
Fixed a bug where macOS wouldn't open files by dragging them onto the dock.
Fixed a bug where `pulsar` on Windows could never trigger
</li>
<li>
Fixed a bug where devtools won't open.
Fixed `github` package shelling out to `git` on macOS
</li>
<li>
Fixed a bug where the editor refused to open with the message "GPU process isn't usable. Goodbye"
Fixed minor bugs found during fixes to tests
</li>
<li>
Fixed logo artifacts on Linux.
Improved our testing infastructure to aide in finding and fixing further bugs
</li>
<li>
Fixed Windows Taskbar Icon being 'Cut in Half'
Updated many dependencies of Pulsar and its core packages
</li>
<li>
Fixed commands like `--version`, `--package` or `--help` did not show outputs.
New Pulsar Icon on macOS
</li>
<li>
Fixed additional flags not being sent to `--package`.
Selected text is styled by default
</li>
<li>
Small improvement on the binary size.
Restored `right-clicked` CSS class on tags
</li>
<li>
Fixed "install command line tools" on Mac and Windows.
Fixed syntax highlighting on C++
</li>
<li>
Cached queries for featured packages (featured packages will load faster, and fewer errors on the settings-view regarding package info).
Updated JavaScript snippets to modern ES6 syntax
</li>
<li>
Added warning when `settings-view` is disabled, describing how to re-enable it.
PPM no longer assumes `master` for git branches
</li>
</ul>

2
ppm

@ -1 +1 @@
Subproject commit 4645ba2905747897b02f56d1a09ca9b3a60a6b8b
Subproject commit a46537c0b7f0eaaef5404ef88003951fdc988c65

Binary file not shown.

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>dev.pulsar_edit.Pulsar</id>
<name>Pulsar</name>
<developer_name>Pulsar Edit</developer_name>
<summary>A Community-led Hyper-Hackable Text Editor</summary>
<metadata_license>MIT</metadata_license>
<project_license>MIT</project_license>
<url type="homepage">https://pulsar-edit.dev</url>
<url type="bugtracker">https://github.com/pulsar-edit/pulsar/issues/</url>
<update_contact>admin@pulsar-edit.dev</update_contact>
<description>
<p>Pulsar aims to not only reach feature parity with the original Atom, but to bring Pulsar into the 21st century by updating the underlying architecture, and supporting modern features.</p>
</description>
<screenshots>
<screenshot>
<image type="source">https://raw.githubusercontent.com/pulsar-edit/pulsar/master/resources/readme.png</image>
</screenshot>
</screenshots>
<kudos>
<kudo>HiDpiIcon</kudo>
</kudos>
<content_rating type="oars-1.1" />
</component>

View File

@ -43,6 +43,7 @@ const Platform = builder.Platform
const pngIcon = 'resources/app-icons/beta.png'
const icoIcon = 'resources/app-icons/beta.ico'
const svgIcon = 'resources/app-icons/beta.svg'
const icnsIcon = 'resources/app-icons/beta.icns'
let options = {
"appId": "dev.pulsar-edit.pulsar",
@ -178,9 +179,12 @@ let options = {
],
},
"mac": {
"icon": pngIcon,
"icon": icnsIcon,
"category": "public.app-category.developer-tools",
"minimumSystemVersion": "10.8",
"hardenedRuntime": true,
"entitlements": "resources/mac/entitlements.plist",
"entitlementsInherit": "resources/mac/entitlements.plist",
"extendInfo": {
// This contains extra values that will be inserted into the App's plist
"CFBundleExecutable": "Pulsar",
@ -194,6 +198,9 @@ let options = {
]
},
},
"dmg": {
"sign": false
},
"win": {
"icon": icoIcon,
"extraResources": [
@ -226,6 +233,7 @@ let options = {
},
"extraMetadata": {
},
"afterSign": "script/mac-notarise.js",
"asarUnpack": [
"node_modules/github/bin/*",
"node_modules/github/lib/*", // Resolves Error in console

48
script/mac-notarise.js Normal file
View File

@ -0,0 +1,48 @@
const { notarize } = require("@electron/notarize");
// https://kilianvalkhof.com/2019/electron/notarizing-your-electron-application/
/**
* @param {import("electron-builder").AfterPackContext} ctx
*/
exports.default = async function notarizing(ctx) {
if (ctx.electronPlatformName !== "darwin") return;
const appleId = process.env.APPLEID;
const appleIdPassword = process.env.APPLEID_PASSWORD;
const teamId = process.env.TEAM_ID;
const appname = ctx.packager.appInfo.productFilename;
if (!appleId || !appleIdPassword) {
console.error("environment variables APPLEID and APPLEID_PASSWORD are not both present, skipping notarisation");
return;
}
/** @type {Parameters<typeof notarize>[0]} */
let notarise_args = {
appBundleId: "dev.pulsar-edit.pulsar",
appPath: `${ctx.appOutDir}/${appname}.app`,
appleId,
appleIdPassword
};
if (!teamId) {
console.log("no TEAM_ID, using (legacy) altool");
notarise_args = {
...notarise_args,
tool: "legacy"
}
} else {
console.log("using notarytool");
notarise_args = {
...notarise_args,
tool: "notarytool",
teamId
};
}
require("debug").enable("electron-notarize");
return await notarize(notarise_args);
}

View File

@ -98,6 +98,10 @@ atom-text-editor {
z-index: -1;
}
.selection .region {
background-color: @syntax-selection-color;
}
.line {
white-space: pre;
contain: @contain_except_size;

View File

@ -1393,6 +1393,14 @@
global-agent "^3.0.0"
global-tunnel-ng "^2.7.1"
"@electron/notarize@^1.2.3":
version "1.2.3"
resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-1.2.3.tgz#38056a629e5a0b5fd56c975c4828c0f74285b644"
integrity sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"
"@electron/universal@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339"
@ -4957,9 +4965,9 @@ github-from-package@0.0.0:
resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
"github@https://github.com/pulsar-edit/github.git#v0.36.13":
version "0.36.13"
resolved "https://github.com/pulsar-edit/github.git#3202eb1eb5a2061bbc919489cc5e25656de531f7"
"github@https://codeload.github.com/pulsar-edit/github/tar.gz/refs/tags/v0.36.14-pretranspiled-take-2":
version "0.36.14"
resolved "https://codeload.github.com/pulsar-edit/github/tar.gz/refs/tags/v0.36.14-pretranspiled-take-2#22158525f8801ecbb084e23ea45ee92ba3d3f9e1"
dependencies:
"@atom/babel-plugin-chai-assert-async" "1.0.0"
"@atom/babel7-transpiler" "1.0.0-1"