-
-
Notifications
You must be signed in to change notification settings - Fork 521
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/try-other-ports
- Loading branch information
Showing
113 changed files
with
3,208 additions
and
3,553 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,20 @@ | ||
| version: 2.1 | ||
|
|
||
| orbs: | ||
| node: electronjs/[email protected] | ||
| node: electronjs/[email protected] | ||
|
|
||
| executors: | ||
| linux-medium-plus: | ||
| docker: | ||
| - image: cimg/base:stable | ||
| resource_class: medium+ | ||
|
|
||
| commands: | ||
| install: | ||
| steps: | ||
| - run: git config --global core.autocrlf input | ||
| - node/install: | ||
| node-version: '18.15.0' | ||
| node-version: '18.20.3' | ||
| - checkout | ||
| run-lint-and-build: | ||
| steps: | ||
|
|
@@ -67,6 +73,17 @@ jobs: | |
| executor: << parameters.executor >> | ||
| steps: | ||
| - install | ||
| - when: | ||
| condition: | ||
| equal: [node/windows, << parameters.executor >>] | ||
| steps: | ||
| - run: | ||
| name: Windows Setup | ||
| shell: bash | ||
| command: | | ||
| pip install setuptools | ||
| cd 'C:\Program Files\nodejs\node_modules\npm\node_modules\@npmcli\run-script' | ||
| npm install [email protected] | ||
| - when: | ||
| condition: | ||
| equal: [node/linux, << parameters.executor >>] | ||
|
|
@@ -108,13 +125,14 @@ jobs: | |
| name: Windows Setup | ||
| shell: bash | ||
| command: | | ||
| pip install setuptools | ||
| choco install --no-progress -y wixtoolset --version=3.14.0 | ||
| echo 'export PATH=$PATH:"/C/Program Files (x86)/WiX Toolset v3.14/bin"' >> "$BASH_ENV" | ||
| cd 'C:\Program Files\nodejs\node_modules\npm\node_modules\@npmcli\run-script' | ||
| npm install [email protected] | ||
| - when: | ||
| condition: | ||
| equal: [node/linux, << parameters.executor >>] | ||
| equal: [linux-medium-plus, << parameters.executor >>] | ||
| steps: | ||
| - run: | ||
| name: Linux specific setup | ||
|
|
@@ -162,10 +180,10 @@ workflows: | |
| - lint-and-build | ||
| matrix: | ||
| parameters: | ||
| executor: [node/windows, node/linux, node/macos] | ||
| executor: [node/windows, linux-medium-plus, node/macos] | ||
| arch: [x64, arm64] | ||
| exclude: | ||
| - executor: node/windows | ||
| arch: arm64 | ||
| - executor: node/linux | ||
| - executor: linux-medium-plus | ||
| arch: arm64 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 20.17.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| { | ||
| "$schema": "node_modules/lerna/schemas/lerna-schema.json", | ||
| "useWorkspaces": true, | ||
| "version": "7.4.0", | ||
| "version": "7.5.0", | ||
| "npmClient": "yarn" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| export declare function dynamicImport(path: string): Promise<any>; | ||
| /** Like {@link dynamicImport()}, except it tries out {@link require()} first. */ | ||
| export declare function dynamicImportMaybe(path: string): Promise<any>; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,23 @@ | ||
| const url = require('url'); | ||
| const fs = require('fs'); | ||
|
|
||
| exports.dynamicImport = function dynamicImport(path) { | ||
| return import(url.pathToFileURL(path)); | ||
| exports.dynamicImport = async function dynamicImport(path) { | ||
| try { | ||
| return await import(fs.existsSync(path) ? url.pathToFileURL(path) : path); | ||
| } catch (error) { | ||
| return Promise.reject(error); | ||
| } | ||
| }; | ||
|
|
||
| exports.dynamicImportMaybe = async function dynamicImportMaybe(path) { | ||
| try { | ||
| return require(path); | ||
| } catch (e1) { | ||
| try { | ||
| return await exports.dynamicImport(path); | ||
| } catch (e2) { | ||
| e1.message = '\n1. ' + e1.message + '\n2. ' + e2.message; | ||
| throw e1; | ||
| } | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.