Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 56a398b

Browse files
committed
Use resolutions section
1 parent 97d15f7 commit 56a398b

File tree

6 files changed

+30
-21
lines changed

6 files changed

+30
-21
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ jobs:
7777
fi
7878
fi
7979
80-
yarn --ignore-engines --cwd ./electron/packager/
81-
yarn --ignore-engines --cwd ./electron/packager/ package
80+
yarn --cwd ./electron/packager/
81+
yarn --cwd ./electron/packager/ package
8282
8383
- name: Upload [GitHub Actions]
8484
uses: actions/upload-artifact@v2

‎BUILDING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Once you have all the tools installed, you can build the editor following these
4848

4949
1. Install the dependencies and build
5050
```sh
51-
yarn --ignore-engines
51+
yarn
5252
```
5353

5454
2. Rebuild the dependencies

‎arduino-ide-extension/src/electron-main/theia/electron-main-application.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { inject, injectable } from 'inversify';
2-
import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/electron/shared/electron';
2+
import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/core/electron-shared/electron';
33
import { fork } from 'child_process';
44
import { AddressInfo } from 'net';
55
import { join } from 'path';

‎electron/packager/index.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@
103103
//-------------------------------------------------------------------------------------------------+
104104
// Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. |
105105
//-------------------------------------------------------------------------------------------------+
106-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`);
106+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`);
107107

108108
//-------------------------------------------------------------------------------------------------------------------------+
109109
// Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds |
110110
//-------------------------------------------------------------------------------------------------------------------------+
111-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`);
111+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`);
112112

113113
// Collect all unused dependencies by the backend. We have to remove them from the electron app.
114114
// The `bundle.js` already contains everything we need for the frontend.
@@ -176,9 +176,9 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
176176
//-------------------------------------------------------------------------------------------+
177177
// Install all private and public dependencies for the electron application and build Theia. |
178178
//-------------------------------------------------------------------------------------------+
179-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies');
180-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`);
181-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} rebuild`, 'Rebuild native dependencies');
179+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies');
180+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`);
181+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} rebuild`, 'Rebuild native dependencies');
182182

183183
//------------------------------------------------------------------------------+
184184
// Create a throw away dotenv file which we use to feed the builder with input. |
@@ -194,7 +194,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
194194
//-----------------------------------+
195195
// Package the electron application. |
196196
//-----------------------------------+
197-
exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`);
197+
exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`);
198198

199199
//-----------------------------------------------------------------------------------------------------+
200200
// Copy to another folder. Azure does not support wildcard for `PublishBuildArtifacts@1.pathToPublish` |

‎package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"typescript": "^3.9.2",
3434
"jsdom": "^11.5.1"
3535
},
36+
"resolutions": {
37+
"find-git-exec": "0.0.4",
38+
"dugite-extra": "0.1.15"
39+
},
3640
"scripts": {
3741
"prepare": "cross-env THEIA_ELECTRON_SKIP_REPLACE_FFMPEG=1 lerna run prepare && yarn download:plugins",
3842
"cleanup": "npx rimraf ./**/node_modules && rm -rf ./node_modules ./.browser_modules ./arduino-ide-extension/build ./arduino-ide-extension/downloads ./arduino-ide-extension/Examples ./arduino-ide-extension/lib ./browser-app/lib ./browser-app/src-gen ./browser-app/gen-webpack.config.js ./electron-app/lib ./electron-app/src-gen ./electron-app/gen-webpack.config.js",

‎yarn.lock‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6120,15 +6120,15 @@ drivelist@^9.0.2:
61206120
nan "^2.14.0"
61216121
prebuild-install "^5.2.4"
61226122

6123-
dugite-extra@0.1.14:
6124-
version "0.1.14"
6125-
resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.14.tgz#514c89b6c597bf8b748b4febd53382559a2a8fdd"
6126-
integrity sha512-apUiaj322iSSBx5X7/8Dg3GP6mDLl5y6RaeEWBpLUHfBKxQyTTVHG0YpzYCKe2ke1EbrSmreVNo1FwDnIb3qlw==
6123+
dugite-extra@0.1.14, dugite-extra@0.1.15:
6124+
version "0.1.15"
6125+
resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.15.tgz#322406b628ea5515c5c6fcd65e4d040543d6268a"
6126+
integrity sha512-beLmQcIXLA8aXqWQZF/ooECoZvYKpBywIFwgqAoYnV04NdWUXDtZ6mMcjQf5eAz5PjXGXAYSuQ31zkPL8J85+A==
61276127
dependencies:
61286128
byline "^5.0.0"
61296129
dugite-no-gpl "1.69.0"
6130-
find-git-exec "^0.0.3"
6131-
upath "^1.0.0"
6130+
find-git-exec "^0.0.4"
6131+
upath "^2.0.1"
61326132

61336133
dugite-no-gpl@1.69.0:
61346134
version "1.69.0"
@@ -7020,10 +7020,10 @@ find-cache-dir@^3.3.1:
70207020
make-dir "^3.0.2"
70217021
pkg-dir "^4.1.0"
70227022

7023-
find-git-exec@^0.0.3:
7024-
version "0.0.3"
7025-
resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.3.tgz#4ce941859ebe7f359fb8e56aafd2acf3c955b52c"
7026-
integrity sha512-cGsuku5hwdOpToV6axI0fRCABuw1yozFtQv13pVK0j7BjILU8buDtHKmSrsZN340Sjj3Z42n8fcF1Xu4nRuBbA==
7023+
find-git-exec@0.0.4, find-git-exec@^0.0.3, find-git-exec@^0.0.4:
7024+
version "0.0.4"
7025+
resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.4.tgz#f1d0d35f93ad99bc81aacd357388d00ae902bc92"
7026+
integrity sha512-klzQwno+dpdeahtHhvZZ5Yn6K+zme1Aj+YJ4ZD+DywSLrQoyCywTrsubUZa1hHRehmfwBThoeKjS7fsaxhpfNA==
70277027
dependencies:
70287028
"@types/node" "^10.14.22"
70297029
"@types/which" "^1.3.2"
@@ -13678,11 +13678,16 @@ unzipper@^0.9.11:
1367813678
readable-stream "~2.3.6"
1367913679
setimmediate "~1.0.4"
1368013680

13681-
upath@^1.0.0, upath@^1.1.2, upath@^1.2.0:
13681+
upath@^1.1.2, upath@^1.2.0:
1368213682
version "1.2.0"
1368313683
resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
1368413684
integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
1368513685

13686+
upath@^2.0.1:
13687+
version "2.0.1"
13688+
resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
13689+
integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
13690+
1368613691
uri-js@^4.2.2:
1368713692
version "4.4.1"
1368813693
resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /