Merge branch 'master-erb' into feat/health-check

.erb/configs/webpack.paths.ts

@@ -4,12 +4,12 @@ const rootPath = path.join(__dirname, '../..');
 
 const dllPath = path.join(__dirname, '../dll');
 
-const srcPath = path.join(rootPath, 'src');
+const srcPath = path.join(rootPath, 'src', 'apps');
 const srcMainPath = path.join(srcPath, 'main');
 const srcRendererPath = path.join(srcPath, 'renderer');
 const srcSyncPath = path.join(srcPath, 'workers', 'sync');
 const srcBackupsPath = path.join(srcPath, 'workers', 'backups');
-const srcSyncEnginePath = path.join(srcPath, 'workers', 'sync-engine');
+const srcSyncEnginePath = path.join(srcPath, 'sync-engine');
 
 const releasePath = path.join(rootPath, 'release');
 const appPath = path.join(releasePath, 'app');

.github/workflows/test.yml

@@ -1,19 +1,26 @@
 name: Test
 
-on: [pull_request]
+on: []
 
 jobs:
   test:
     name: 🧪 Lint and test
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+          - linux-latest
+          - windows-latest
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
+          cache: 'yarn'
       - name: Create .npmrc file
         run: |
           echo "registry=https://registry.yarnpkg.com/" > .npmrc
@@ -28,8 +35,6 @@ jobs:
           install-command: yarn --ignore-scripts --frozen-lockfile
       - name: Lint
         run: yarn run lint
-      - name: Typescript check
-        run: yarn run type-check
       - name: Build processes
         run: yarn build:main && yarn build:renderer
       - name: Run test

.vscode/settings.json

@@ -26,8 +26,8 @@
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.format": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.format": "explicit"
   },
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"

package.json

@@ -1,29 +1,27 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0-a10",
+  "version": "2.0.0",
   "author": "Internxt <[email protected]>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
   "repository": {
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:backups\" \"npm run build:sync-engine\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
-    "build:backups": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
     "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "lint": "cross-env NODE_ENV=development eslint . --ext .ts,.tsx",
     "lint:fix": "yarn run lint --fix",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:backups && npm run start:sync-engine && npm run start:renderer",
-    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
+    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
-    "start:backups": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
     "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "test": "jest && playwright test --config=src/test",
     "test:unit": "jest --silent",
@@ -95,7 +93,8 @@
     "win": {
       "target": [
         "nsis"
-      ]
+      ],
+      "certificateSubjectName": "Internxt Universal Technologies SL"
     },
     "linux": {
       "target": [
@@ -200,7 +199,7 @@
     "detect-port": "^1.3.0",
     "dotenv": "^10.0.0",
     "dotenv-webpack": "^7.0.3",
-    "electron": "^25.8.1",
+    "electron": "^19.1.9",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
@@ -230,6 +229,7 @@
     "jsonwebtoken": "^8.5.1",
     "lint-staged": "^12.1.4",
     "mini-css-extract-plugin": "^2.4.5",
+    "mockdate": "^3.0.5",
     "ms": "^2.1.3",
     "node-loader": "^2.0.0",
     "opencollective-postinstall": "^2.0.3",
@@ -247,10 +247,10 @@
     "style-loader": "^3.3.1",
     "tailwindcss": "^3.3.3",
     "terser-webpack-plugin": "^5.3.0",
-    "ts-jest": "^27.1.2",
+    "ts-jest": "^29.1.2",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
+    "typescript": "^5.2.2",
     "url-loader": "^4.1.1",
     "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.5.0",
@@ -279,6 +279,7 @@
     "electron-log": "^4.4.4",
     "electron-store": "^8.0.1",
     "electron-updater": "^4.6.4",
+    "express": "^4.18.2",
     "form-data": "^4.0.0",
     "framer-motion": "^5.6.0",
     "gm": "^1.25.0",