Merge ed60048 into 964ea3b

Author: kittaakos

Diff for: .eslintrc.js

@@ -16,6 +16,7 @@ module.exports = {
         'docs/*',
         'scripts/*',
         'electron-app/*',
+        '!electron-app/webpack.config.js',
         'plugins/*',
         'arduino-ide-extension/src/node/cli-protocol',
     ],

Diff for: .github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
           - os: windows-2019
             certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
             certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
-            certificate-extension: pfx  # File extension for the certificate.
+            certificate-extension: pfx # File extension for the certificate.
           - os: ubuntu-20.04
           - os: macos-latest
             # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
@@ -57,10 +57,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Node.js 16.x
+      - name: Install Node.js 16.14
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '16.14'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Python 3.x

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

@@ -29,10 +29,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Install Node.js 16.x
+      - name: Install Node.js 16.14
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '16.14'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Go

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

@@ -16,10 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Node.js 16.x
+      - name: Install Node.js 16.14
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '16.14'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Go

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

@@ -16,10 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Node.js 16.x
+      - name: Install Node.js 16.14
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '16.14'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Go

Diff for: .gitignore

@@ -7,7 +7,7 @@ build/
 arduino-ide-extension/Examples/
 !electron/build/
 src-gen/
-webpack.config.js
+electron/build/webpack.config.js
 gen-webpack.config.js
 .DS_Store
 # switching from `electron` to `browser` in dev mode.

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

@@ -9,7 +9,7 @@
     "compose-changelog": "node ./scripts/compose-changelog.js",
     "download-cli": "node ./scripts/download-cli.js",
     "download-fwuploader": "node ./scripts/download-fwuploader.js",
-    "copy-i18n": "npx ncp ../i18n ./build/i18n",
+    "copy-i18n": "ncp ../i18n ./build/i18n",
     "download-ls": "node ./scripts/download-ls.js",
     "download-examples": "node ./scripts/download-examples.js",
     "generate-protocol": "node ./scripts/generate-protocol.js",
@@ -21,28 +21,28 @@
     "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.6.7",
-    "@theia/application-package": "1.31.1",
-    "@theia/core": "1.31.1",
-    "@theia/debug": "1.31.1",
-    "@theia/editor": "1.31.1",
-    "@theia/electron": "1.31.1",
-    "@theia/filesystem": "1.31.1",
-    "@theia/keymaps": "1.31.1",
-    "@theia/markers": "1.31.1",
-    "@theia/messages": "1.31.1",
-    "@theia/monaco": "1.31.1",
-    "@theia/monaco-editor-core": "1.67.2",
-    "@theia/navigator": "1.31.1",
-    "@theia/outline-view": "1.31.1",
-    "@theia/output": "1.31.1",
-    "@theia/plugin-ext": "1.31.1",
-    "@theia/preferences": "1.31.1",
-    "@theia/scm": "1.31.1",
-    "@theia/search-in-workspace": "1.31.1",
-    "@theia/terminal": "1.31.1",
-    "@theia/typehierarchy": "1.31.1",
-    "@theia/workspace": "1.31.1",
+    "@grpc/grpc-js": "^1.8.14",
+    "@theia/application-package": "1.37.0",
+    "@theia/core": "1.37.0",
+    "@theia/debug": "1.37.0",
+    "@theia/editor": "1.37.0",
+    "@theia/electron": "1.37.0",
+    "@theia/filesystem": "1.37.0",
+    "@theia/keymaps": "1.37.0",
+    "@theia/markers": "1.37.0",
+    "@theia/messages": "1.37.0",
+    "@theia/monaco": "1.37.0",
+    "@theia/monaco-editor-core": "1.72.3",
+    "@theia/navigator": "1.37.0",
+    "@theia/outline-view": "1.37.0",
+    "@theia/output": "1.37.0",
+    "@theia/plugin-ext": "1.37.0",
+    "@theia/preferences": "1.37.0",
+    "@theia/scm": "1.37.0",
+    "@theia/search-in-workspace": "1.37.0",
+    "@theia/terminal": "1.37.0",
+    "@theia/typehierarchy": "1.37.0",
+    "@theia/workspace": "1.37.0",
     "@tippyjs/react": "^4.2.5",
     "@types/auth0-js": "^9.14.0",
     "@types/btoa": "^1.2.3",
@@ -51,6 +51,7 @@
     "@types/glob": "^7.2.0",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
+    "@types/jsdom": "^21.1.1",
     "@types/keytar": "^4.4.0",
     "@types/lodash.debounce": "^4.0.6",
     "@types/node-fetch": "^2.5.7",
@@ -65,7 +66,7 @@
     "auth0-js": "^9.14.0",
     "btoa": "^1.2.1",
     "classnames": "^2.3.1",
-    "cpy": "^8.1.2",
+    "cpy": "^10.0.0",
     "cross-fetch": "^3.1.5",
     "dateformat": "^3.0.3",
     "deepmerge": "^4.2.2",
@@ -76,8 +77,9 @@
     "glob": "^7.1.6",
     "google-protobuf": "^3.20.1",
     "hash.js": "^1.1.7",
-    "is-online": "^9.0.1",
+    "is-online": "^10.0.0",
     "js-yaml": "^3.13.1",
+    "jsdom": "^21.1.1",
     "jsonc-parser": "^2.2.0",
     "just-diff": "^5.1.1",
     "jwt-decode": "^3.1.2",
@@ -88,6 +90,7 @@
     "open": "^8.0.6",
     "p-debounce": "^2.1.0",
     "p-queue": "^2.4.2",
+    "process": "^0.11.10",
     "ps-tree": "^1.2.0",
     "query-string": "^7.0.1",
     "react-disable": "^0.1.1",
@@ -101,6 +104,7 @@
     "temp": "^0.9.1",
     "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
+    "util": "^0.12.5",
     "which": "^1.3.1"
   },
   "devDependencies": {
@@ -147,6 +151,9 @@
     "examples"
   ],
   "theiaExtensions": [
+    {
+      "preload": "lib/electron-browser/preload"
+    },
     {
       "backend": "lib/node/arduino-ide-backend-module",
       "frontend": "lib/browser/arduino-ide-frontend-module"
@@ -157,6 +164,9 @@
     {
       "frontendElectron": "lib/electron-browser/theia/core/electron-window-module"
     },
+    {
+      "frontendElectron": "lib/electron-browser/electron-arduino-module"
+    },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }

Diff for: arduino-ide-extension/scripts/download-examples.js

@@ -4,31 +4,29 @@
 const version = '1.10.0';
 
 (async () => {
-  const os = require('os');
-  const { promises: fs } = require('fs');
-  const path = require('path');
+  const os = require('node:os');
+  const { promises: fs } = require('node:fs');
+  const path = require('node:path');
   const shell = require('shelljs');
   const { v4 } = require('uuid');
+  const { exec } = require('./utils');
 
   const repository = path.join(os.tmpdir(), `${v4()}-arduino-examples`);
   if (shell.mkdir('-p', repository).code !== 0) {
     shell.exit(1);
   }
 
-  if (
-    shell.exec(
-      `git clone https://github.com/arduino/arduino-examples.git ${repository}`
-    ).code !== 0
-  ) {
-    shell.exit(1);
-  }
+  exec(
+    'git',
+    ['clone', 'https://github.com/arduino/arduino-examples.git', repository],
+    shell
+  );
 
-  if (
-    shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`)
-      .code !== 0
-  ) {
-    shell.exit(1);
-  }
+  exec(
+    'git',
+    ['-C', repository, 'checkout', `tags/${version}`, '-b', version],
+    shell
+  );
 
   const destination = path.join(__dirname, '..', 'Examples');
   shell.mkdir('-p', destination);

Diff for: arduino-ide-extension/scripts/download-fwuploader.js

@@ -1,12 +1,11 @@
 // @ts-check
 
 (async () => {
-  const fs = require('fs');
-  const path = require('path');
-  const temp = require('temp');
+  const path = require('node:path');
   const shell = require('shelljs');
   const semver = require('semver');
   const downloader = require('./downloader');
+  const { taskBuildFromGit } = require('./utils');
 
   const version = (() => {
     const pkg = require(path.join(__dirname, '..', 'package.json'));
@@ -86,81 +85,6 @@
       shell.exit(1);
     }
   } else {
-    // We assume an object with `owner`, `repo`, commitish?` properties.
-    const { owner, repo, commitish } = version;
-    if (!owner) {
-      shell.echo(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
-      shell.exit(1);
-    }
-    if (!repo) {
-      shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
-      shell.exit(1);
-    }
-    const url = `https://github.com/${owner}/${repo}.git`;
-    shell.echo(
-      `Building Firmware Uploader from ${url}. Commitish: ${
-        commitish ? commitish : 'HEAD'
-      }`
-    );
-
-    if (fs.existsSync(destinationPath)) {
-      shell.echo(
-        `Skipping the Firmware Uploader build because it already exists: ${destinationPath}`
-      );
-      return;
-    }
-
-    if (shell.mkdir('-p', buildFolder).code !== 0) {
-      shell.echo('Could not create build folder.');
-      shell.exit(1);
-    }
-
-    const tempRepoPath = temp.mkdirSync();
-    shell.echo(`>>> Cloning Firmware Uploader source to ${tempRepoPath}...`);
-    if (shell.exec(`git clone ${url} ${tempRepoPath}`).code !== 0) {
-      shell.exit(1);
-    }
-    shell.echo('<<< Cloned Firmware Uploader repo.');
-
-    if (commitish) {
-      shell.echo(`>>> Checking out ${commitish}...`);
-      if (
-        shell.exec(`git -C ${tempRepoPath} checkout ${commitish}`).code !== 0
-      ) {
-        shell.exit(1);
-      }
-      shell.echo(`<<< Checked out ${commitish}.`);
-    }
-
-    shell.echo(`>>> Building the Firmware Uploader...`);
-    if (shell.exec('go build', { cwd: tempRepoPath }).code !== 0) {
-      shell.exit(1);
-    }
-    shell.echo('<<< Firmware Uploader build done.');
-
-    if (!fs.existsSync(path.join(tempRepoPath, fwuploderName))) {
-      shell.echo(
-        `Could not find the Firmware Uploader at ${path.join(
-          tempRepoPath,
-          fwuploderName
-        )}.`
-      );
-      shell.exit(1);
-    }
-
-    const builtFwUploaderPath = path.join(tempRepoPath, fwuploderName);
-    shell.echo(
-      `>>> Copying Firmware Uploader from ${builtFwUploaderPath} to ${destinationPath}...`
-    );
-    if (shell.cp(builtFwUploaderPath, destinationPath).code !== 0) {
-      shell.exit(1);
-    }
-    shell.echo(`<<< Copied the Firmware Uploader.`);
-
-    shell.echo('<<< Verifying Firmware Uploader...');
-    if (!fs.existsSync(destinationPath)) {
-      shell.exit(1);
-    }
-    shell.echo('>>> Verified Firmware Uploader.');
+    taskBuildFromGit(version, destinationPath, 'Firmware Uploader');
   }
 })();