Skip to content

Commit 3fc51f4

Browse files
kittaakoskittaakos
authored
Merge 28bc470 into 144df89 
2 parents 144df89 + 28bc470 commit 3fc51f4

File tree

133 files changed

+4740
-8036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4740
-8036
lines changed

Diff for: ‎.eslintrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ module.exports = {
1515
'.browser_modules/*',
1616
'docs/*',
1717
'scripts/*',
18-
'electron-app/*',
18+
'electron-app/lib/*',
19+
'electron-app/src-gen/*',
20+
'electron-app/gen-webpack*.js',
1921
'!electron-app/webpack.config.js',
2022
'plugins/*',
2123
'arduino-ide-extension/src/node/cli-protocol',

Diff for: ‎.github/workflows/build.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
with:
9393
node-version: '16.14'
9494
registry-url: 'https://registry.npmjs.org'
95+
cache: 'yarn'
9596

9697
- name: Install Python 3.x
9798
uses: actions/setup-python@v4
@@ -135,15 +136,24 @@ jobs:
135136
if [ "${{ runner.OS }}" = "Windows" ]; then
136137
npm config set msvs_version 2017 --global
137138
fi
139+
138140
npx node-gyp install
139-
yarn --cwd ./electron/packager/
140-
yarn --cwd ./electron/packager/ package
141+
yarn install --immutable
142+
143+
yarn --cwd arduino-ide-extension build
144+
yarn test
145+
yarn --cwd arduino-ide-extension test:slow
146+
yarn --cwd arduino-ide-extension lint
147+
148+
yarn --cwd electron-app rebuild
149+
yarn --cwd electron-app build
150+
yarn --cwd electron-app package
141151
142152
- name: Upload [GitHub Actions]
143153
uses: actions/upload-artifact@v3
144154
with:
145155
name: ${{ env.JOB_TRANSFER_ARTIFACT }}
146-
path: electron/build/dist/build-artifacts/
156+
path: electron-app/dist/build-artifacts
147157

148158
artifacts:
149159
name: ${{ matrix.artifact.name }} artifact

Diff for: ‎.github/workflows/check-i18n-task.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
with:
6464
node-version: '16.14'
6565
registry-url: 'https://registry.npmjs.org'
66+
cache: 'yarn'
6667

6768
- name: Install Go
6869
uses: actions/setup-go@v4
@@ -76,7 +77,7 @@ jobs:
7677
version: 3.x
7778

7879
- name: Install dependencies
79-
run: yarn
80+
run: yarn install --immutable
8081
env:
8182
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8283

Diff for: ‎.github/workflows/i18n-nightly-push.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
node-version: '16.14'
2323
registry-url: 'https://registry.npmjs.org'
24+
cache: 'yarn'
2425

2526
- name: Install Go
2627
uses: actions/setup-go@v4
@@ -34,7 +35,7 @@ jobs:
3435
version: 3.x
3536

3637
- name: Install dependencies
37-
run: yarn
38+
run: yarn install --immutable
3839

3940
- name: Run i18n:push script
4041
run: yarn run i18n:push

Diff for: ‎.github/workflows/i18n-weekly-pull.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
node-version: '16.14'
2323
registry-url: 'https://registry.npmjs.org'
24+
cache: 'yarn'
2425

2526
- name: Install Go
2627
uses: actions/setup-go@v4
@@ -34,7 +35,7 @@ jobs:
3435
version: 3.x
3536

3637
- name: Install dependencies
37-
run: yarn
38+
run: yarn install --immutable
3839

3940
- name: Run i18n:pull script
4041
run: yarn run i18n:pull

Diff for: ‎.github/workflows/themes-weekly-pull.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
with:
2424
node-version: ${{ env.NODE_VERSION }}
2525
registry-url: 'https://registry.npmjs.org'
26+
cache: 'yarn'
2627

2728
- name: Install Go
2829
uses: actions/setup-go@v4
@@ -36,7 +37,7 @@ jobs:
3637
version: 3.x
3738

3839
- name: Install dependencies
39-
run: yarn
40+
run: yarn install --immutable
4041

4142
- name: Run themes:pull script
4243
run: yarn run themes:pull

Diff for: ‎.gitignore

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
node_modules/
2-
# .node_modules is a hack for the electron builder.
3-
.node_modules/
42
lib/
53
downloads/
6-
build/
4+
resources/
75
arduino-ide-extension/Examples/
8-
!electron/build/
96
src-gen/
10-
electron/build/webpack.config.js
117
gen-webpack.config.js
8+
gen-webpack.node.config.js
129
.DS_Store
1310
# switching from `electron` to `browser` in dev mode.
1411
.browser_modules
1512
yarn*.log
1613
# For the VS Code extensions used by Theia.
17-
plugins
14+
electron-app/plugins
1815
# the tokens folder for the themes
1916
scripts/themes/tokens
20-
# environment variables
21-
.env
2217
# content trace files for electron
2318
electron-app/traces
2419
# any Arduino LS generated log files
2520
inols*.log
21+
# The electron-builder output.
22+
electron-app/dist

Diff for: ‎.vscode/launch.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"type": "node",
66
"request": "launch",
7-
"name": "App (Electron) [Dev]",
7+
"name": "App",
88
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
99
"windows": {
1010
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
@@ -17,10 +17,8 @@
1717
"--app-project-path=${workspaceRoot}/electron-app",
1818
"--remote-debugging-port=9222",
1919
"--no-app-auto-install",
20-
"--plugins=local-dir:../plugins",
20+
"--plugins=local-dir:./plugins",
2121
"--hosted-plugin-inspect=9339",
22-
"--content-trace",
23-
"--open-devtools",
2422
"--no-ping-timeout",
2523
],
2624
"env": {
@@ -41,7 +39,7 @@
4139
{
4240
"type": "node",
4341
"request": "launch",
44-
"name": "App (Electron)",
42+
"name": "App [Dev]",
4543
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
4644
"windows": {
4745
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
@@ -54,8 +52,10 @@
5452
"--app-project-path=${workspaceRoot}/electron-app",
5553
"--remote-debugging-port=9222",
5654
"--no-app-auto-install",
57-
"--plugins=local-dir:../plugins",
55+
"--plugins=local-dir:./plugins",
5856
"--hosted-plugin-inspect=9339",
57+
"--content-trace",
58+
"--open-devtools",
5959
"--no-ping-timeout",
6060
],
6161
"env": {
@@ -95,7 +95,8 @@
9595
"**/${fileBasenameNoExtension}.js"
9696
],
9797
"env": {
98-
"TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json"
98+
"TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json",
99+
"IDE2_TEST": "true"
99100
},
100101
"sourceMaps": true,
101102
"smartStep": true,

Diff for: ‎.vscode/tasks.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "Arduino IDE - Rebuild Electron App",
5+
"label": "Rebuild App",
66
"type": "shell",
77
"command": "yarn rebuild:browser && yarn rebuild:electron",
88
"group": "build",
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
{
16-
"label": "Arduino IDE - Watch IDE Extension",
16+
"label": "Watch Extension",
1717
"type": "shell",
1818
"command": "yarn --cwd ./arduino-ide-extension watch",
1919
"group": "build",
@@ -24,7 +24,7 @@
2424
}
2525
},
2626
{
27-
"label": "Arduino IDE - Watch Electron App",
27+
"label": "Watch App",
2828
"type": "shell",
2929
"command": "yarn --cwd ./electron-app watch",
3030
"group": "build",
@@ -35,11 +35,11 @@
3535
}
3636
},
3737
{
38-
"label": "Arduino IDE - Watch All [Electron]",
38+
"label": "Watch All",
3939
"type": "shell",
4040
"dependsOn": [
41-
"Arduino IDE - Watch IDE Extension",
42-
"Arduino IDE - Watch Electron App"
41+
"Watch Extension",
42+
"Watch App"
4343
]
4444
}
4545
]

Diff for: ‎arduino-ide-extension/package.json

+38-37
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,60 @@
44
"description": "An extension for Theia building the Arduino IDE",
55
"license": "AGPL-3.0-or-later",
66
"scripts": {
7-
"prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn clean && yarn download-examples && yarn build && yarn test",
7+
"prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn download-examples",
88
"clean": "rimraf lib",
99
"compose-changelog": "node ./scripts/compose-changelog.js",
1010
"download-cli": "node ./scripts/download-cli.js",
1111
"download-fwuploader": "node ./scripts/download-fwuploader.js",
12-
"copy-i18n": "ncp ../i18n ./build/i18n",
12+
"copy-i18n": "ncp ../i18n ./src/node/resources/i18n",
1313
"download-ls": "node ./scripts/download-ls.js",
1414
"download-examples": "node ./scripts/download-examples.js",
1515
"generate-protocol": "node ./scripts/generate-protocol.js",
1616
"lint": "eslint",
17-
"build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
17+
"prebuild": "rimraf lib",
18+
"build": "tsc",
19+
"build:dev": "yarn build",
20+
"postbuild": "ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/",
1821
"watch": "tsc -w",
19-
"test": "mocha \"./lib/test/**/*.test.js\"",
20-
"test:slow": "mocha \"./lib/test/**/*.slow-test.js\" --slow 5000",
21-
"test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
22+
"test": "cross-env IDE2_TEST=true mocha \"./lib/test/**/*.test.js\"",
23+
"test:slow": "cross-env IDE2_TEST=true mocha \"./lib/test/**/*.slow-test.js\" --slow 5000"
2224
},
2325
"dependencies": {
2426
"@grpc/grpc-js": "^1.8.14",
25-
"@theia/application-package": "1.37.0",
26-
"@theia/core": "1.37.0",
27-
"@theia/debug": "1.37.0",
28-
"@theia/editor": "1.37.0",
29-
"@theia/electron": "1.37.0",
30-
"@theia/filesystem": "1.37.0",
31-
"@theia/keymaps": "1.37.0",
32-
"@theia/markers": "1.37.0",
33-
"@theia/messages": "1.37.0",
34-
"@theia/monaco": "1.37.0",
27+
"@theia/application-package": "1.39.0",
28+
"@theia/core": "1.39.0",
29+
"@theia/debug": "1.39.0",
30+
"@theia/editor": "1.39.0",
31+
"@theia/electron": "1.39.0",
32+
"@theia/filesystem": "1.39.0",
33+
"@theia/keymaps": "1.39.0",
34+
"@theia/markers": "1.39.0",
35+
"@theia/messages": "1.39.0",
36+
"@theia/monaco": "1.39.0",
3537
"@theia/monaco-editor-core": "1.72.3",
36-
"@theia/navigator": "1.37.0",
37-
"@theia/outline-view": "1.37.0",
38-
"@theia/output": "1.37.0",
39-
"@theia/plugin-ext": "1.37.0",
40-
"@theia/preferences": "1.37.0",
41-
"@theia/scm": "1.37.0",
42-
"@theia/search-in-workspace": "1.37.0",
43-
"@theia/terminal": "1.37.0",
44-
"@theia/typehierarchy": "1.37.0",
45-
"@theia/workspace": "1.37.0",
38+
"@theia/navigator": "1.39.0",
39+
"@theia/outline-view": "1.39.0",
40+
"@theia/output": "1.39.0",
41+
"@theia/plugin-ext": "1.39.0",
42+
"@theia/preferences": "1.39.0",
43+
"@theia/scm": "1.39.0",
44+
"@theia/search-in-workspace": "1.39.0",
45+
"@theia/terminal": "1.39.0",
46+
"@theia/typehierarchy": "1.39.0",
47+
"@theia/workspace": "1.39.0",
4648
"@tippyjs/react": "^4.2.5",
4749
"@types/auth0-js": "^9.14.0",
4850
"@types/btoa": "^1.2.3",
4951
"@types/dateformat": "^3.0.1",
50-
"@types/deepmerge": "^2.2.0",
51-
"@types/glob": "^7.2.0",
5252
"@types/google-protobuf": "^3.7.2",
5353
"@types/js-yaml": "^3.12.2",
5454
"@types/jsdom": "^21.1.1",
55-
"@types/keytar": "^4.4.0",
5655
"@types/lodash.debounce": "^4.0.6",
5756
"@types/node-fetch": "^2.5.7",
5857
"@types/p-queue": "^2.3.1",
5958
"@types/ps-tree": "^1.1.0",
6059
"@types/react-tabs": "^2.3.2",
6160
"@types/temp": "^0.8.34",
62-
"@types/which": "^1.3.1",
63-
"@vscode/debugprotocol": "^1.51.0",
6461
"arduino-serial-plotter-webapp": "0.2.0",
6562
"async-mutex": "^0.3.0",
6663
"auth0-js": "^9.14.0",
@@ -70,6 +67,7 @@
7067
"cross-fetch": "^3.1.5",
7168
"dateformat": "^3.0.3",
7269
"deepmerge": "^4.2.2",
70+
"drivelist": "^9.2.4",
7371
"electron-updater": "^4.6.5",
7472
"fast-json-stable-stringify": "^2.1.0",
7573
"fast-safe-stringify": "^2.1.1",
@@ -87,6 +85,7 @@
8785
"lodash.debounce": "^4.0.8",
8886
"minimatch": "^3.1.2",
8987
"node-fetch": "^2.6.1",
88+
"node-log-rotate": "^0.1.5",
9089
"open": "^8.0.6",
9190
"p-debounce": "^2.1.0",
9291
"p-queue": "^2.4.2",
@@ -112,18 +111,20 @@
112111
"@types/chai": "^4.2.7",
113112
"@types/mocha": "^5.2.7",
114113
"@types/react-window": "^1.8.5",
114+
"@xhmikosr/downloader": "^13.0.1",
115115
"chai": "^4.2.0",
116+
"cross-env": "^7.0.3",
116117
"decompress": "^4.2.0",
117118
"decompress-tarbz2": "^4.1.1",
118119
"decompress-targz": "^4.1.1",
119120
"decompress-unzip": "^4.0.1",
120-
"download": "^7.1.0",
121121
"grpc_tools_node_protoc_ts": "^4.1.0",
122122
"mocha": "^7.0.0",
123123
"mockdate": "^3.0.5",
124124
"moment": "^2.24.0",
125125
"ncp": "^2.0.0",
126126
"protoc": "^1.0.4",
127+
"rimraf": "^2.6.1",
127128
"shelljs": "^0.8.3",
128129
"uuid": "^3.2.1",
129130
"yargs": "^11.1.0"
@@ -170,17 +171,17 @@
170171
}
171172
],
172173
"arduino": {
173-
"cli": {
174+
"arduino-cli": {
174175
"version": "0.33.1"
175176
},
176-
"fwuploader": {
177+
"arduino-fwuploader": {
177178
"version": "2.2.2"
178179
},
180+
"arduino-language-server": {
181+
"version": "0.7.4"
182+
},
179183
"clangd": {
180184
"version": "14.0.0"
181-
},
182-
"languageServer": {
183-
"version": "0.7.4"
184185
}
185186
}
186187
}

0 commit comments

Comments
 (0)