feat(replay): update for mac silicon + deps

blakebyrnes · blakebyrnes · commit 30ffec74fc06 · 2021-03-10T16:00:08.000-05:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -29,7 +29,6 @@ module.exports = {
     'plugin:jest/recommended',
     'plugin:promise/recommended',
     'prettier',
-    'prettier/@typescript-eslint',
     'plugin:monorepo-cop/recommended',
     'plugin:import/errors',
     'plugin:import/warnings',
@@ -177,6 +176,7 @@ module.exports = {
     'consistent-return': ['off', { treatUndefinedAsUnspecified: true }],
     'spaced-comment': ['error', 'always', { markers: ['/////'] }],
     'require-await': 'error',
+    'arrow-body-style': 'off',
     'jest/no-conditional-expect': 'off',
     '@typescript-eslint/no-implied-eval': 'off', // false positives for setTimeout with bind fn
     '@typescript-eslint/no-explicit-any': 'off',
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ SecretAgent is a web browser that's built for scraping.
 
 - [x] **Built for scraping** - it's the first modern headless browsers designed specifically for scraping instead of just automated testing.
 - [x] **Designed for web developers** - We've recreated a fully compliant DOM directly in NodeJS allowing you bypass the headaches of previous scraper tools.
-- [x] **Powered by Chromium** - The powerful Chromium engine sits under the hood, allowing for lightning fast rendering.
+- [x] **Powered by Chrome** - The powerful Chrome engine sits under the hood, allowing for lightning fast rendering.
 - [x] **Emulates any modern browser** - BrowserEmulators make it easy to disguise your script as practically any browser.
 - [x] **Avoids detection along the entire stack** - Don't be blocked because of TLS fingerprints in your networking stack.
 
diff --git a/client/package.json b/client/package.json
@@ -11,7 +11,7 @@
     "@secret-agent/core-interfaces": "1.3.1-alpha.0",
     "@secret-agent/replay": "1.3.1-alpha.0",
     "awaited-dom": "^1.1.10",
-    "uuid": "^8.1.0",
+    "uuid": "^8.3.2",
     "ws": "^7.4.2"
   },
   "devDependencies": {
diff --git a/core/package.json b/core/package.json
@@ -24,11 +24,11 @@
     "awaited-dom": "^1.1.10",
     "better-sqlite3": "^7.1.2",
     "core-js-bundle": "^3.7.0",
-    "moment": "^2.24.0",
+    "moment": "^2.24.1",
     "regenerator-runtime": "^0.13.7",
     "typeson": "^5.18.2",
     "typeson-registry": "^1.0.0-alpha.38",
-    "uuid": "^8.1.0",
+    "uuid": "^8.3.2",
     "ws": "^7.4.2"
   },
   "devDependencies": {
diff --git a/emulate-browsers/base/injected-scripts/.eslintrc.js b/emulate-browsers/base/injected-scripts/.eslintrc.js
@@ -13,5 +13,6 @@ module.exports = {
     'func-names': 'off',
     'no-restricted-globals': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
+    'prefer-arrow-callback': 'off',
   },
 };
diff --git a/mitm-socket/package.json b/mitm-socket/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@secret-agent/commons": "1.3.1-alpha.0",
     "@secret-agent/core-interfaces": "1.3.1-alpha.0",
-    "uuid": "^3.4.0"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@secret-agent/testing": "1.3.1-alpha.0",
diff --git a/package.build.json b/package.build.json
@@ -7,13 +7,11 @@
     "test": "cross-env SA_SHOW_REPLAY=false NODE_ENV=test SA_SESSIONS_DIR=.sessions-test jest"
   },
   "devDependencies": {
-    "jest": "^26.1.0",
+    "jest": "^26.6.3",
     "jest-summary-reporter": "^0.0.2",
-    "jest-environment-node": "^26.1.0",
-    "jest-junit": "^6.3.0",
+    "jest-environment-node": "^26.6.2",
     "lerna": "^3.4.3",
-    "rimraf": "^3.0.0",
-    "source-map-support": "^0.5.16",
+    "source-map-support": "^0.5.19",
     "cross-env": "^7.0.2"
   },
   "workspaces": {
diff --git a/package.dist.json b/package.dist.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "lerna": "^3.4.3",
-    "source-map-support": "^0.5.16"
+    "source-map-support": "^0.5.19"
   },
   "engines": {
     "node": ">=13.2.0"
diff --git a/package.json b/package.json
@@ -42,26 +42,27 @@
     }
   },
   "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^9.1.2",
-    "@types/jest": "^26.0.16",
+    "@commitlint/cli": "^12.0.1",
+    "@commitlint/config-conventional": "^12.0.1",
+    "@types/jest": "^26.0.20",
     "@types/node": "^13.13.34",
+    "@types/fs-extra": "9.0.7",
     "@typescript-eslint/eslint-plugin": "^4.14.0",
-    "@typescript-eslint/parser": "^4.14.0",
+    "@typescript-eslint/parser": "^4.17.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.14.0",
+    "eslint": "^7.21.0",
     "eslint-config-airbnb-typescript": "^12.0.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-import-resolver-typescript": "^2.3.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-import-resolver-typescript": "^2.4.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^24.1.3",
+    "eslint-plugin-jest": "^24.2.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-monorepo-cop": "^1.0.2",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "^4.3.0",
     "jest": "^26.6.3",
diff --git a/replay/backend/managers/OverlayManager.ts b/replay/backend/managers/OverlayManager.ts
@@ -37,11 +37,11 @@ export default class OverlayManager {
   }
 
   public destroy = () => {
-    this.browserViews.forEach(x => x.destroy());
+    this.browserViews.length = 0;
   };
 
   public sendToAll = (channel: string, ...args: any[]) => {
-    this.browserViews.forEach(x => !x.isDestroyed() && x.webContents.send(channel, ...args));
+    this.browserViews.forEach(x => x?.webContents.send(channel, ...args));
   };
 
   public getByName(name: string) {
diff --git a/replay/backend/models/AppView.ts b/replay/backend/models/AppView.ts
@@ -14,7 +14,6 @@ export default class AppView extends ViewBackend {
   }
 
   public async load(location: IWindowLocation = InternalLocations.Dashboard) {
-    if (this.browserView.isDestroyed()) return;
     this.attach();
     this.location = InternalLocations[location];
 
diff --git a/replay/backend/overlays/BaseOverlay.ts b/replay/backend/overlays/BaseOverlay.ts
@@ -104,7 +104,6 @@ export default class BaseOverlay {
   }
 
   public destroy() {
-    this.browserView.destroy();
     this.browserView = null;
   }
 
diff --git a/replay/frontend/package.json b/replay/frontend/package.json
@@ -10,17 +10,17 @@
     "dev": "vue-cli-service serve --mode=development"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.11.2",
-    "@vue/cli-plugin-babel": "~4.5.9",
-    "@vue/cli-plugin-typescript": "~4.5.9",
-    "@vue/cli-service": "~4.5.9",
+    "@babel/runtime-corejs3": "^7.13.10",
+    "@vue/cli-plugin-babel": "~4.5.11",
+    "@vue/cli-plugin-typescript": "~4.5.11",
+    "@vue/cli-service": "~4.5.11",
     "animejs": "^3.2.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.9.1",
     "source-map-support": "^0.5.19",
-    "uuid": "^8.1.0",
-    "vue": "^2.6.11",
-    "vue-class-component": "^7.2.4",
-    "vue-property-decorator": "^9.0.0",
+    "uuid": "^8.3.2",
+    "vue": "^2.6.12",
+    "vue-class-component": "^7.2.6",
+    "vue-property-decorator": "^9.1.2",
     "vue-slider-component": "^3.2.2",
     "vue-styled-components": "^1.5.1"
   },
@@ -29,8 +29,8 @@
     "cross-env": "^7.0.2",
     "css-loader": "~3.5.3",
     "node-sass": "^4.14.1",
-    "pug": "^2.0.4",
-    "pug-plain-loader": "^1.0.0",
+    "pug": "^3.0.2",
+    "pug-plain-loader": "^1.1.0",
     "sass-loader": "^8.0.2",
     "typescript": "~4.1.2",
     "webpack": "4.44.2"
diff --git a/replay/install/Utils.ts b/replay/install/Utils.ts
@@ -49,6 +49,7 @@ function getDistDir() {
   switch (platform) {
     case 'mas':
     case 'darwin':
+      if (os.arch() === 'arm64') return 'mac-arm64';
       return 'mac';
     default:
       return '';
diff --git a/replay/install/index.ts b/replay/install/index.ts
@@ -27,8 +27,11 @@ if (isBinaryInstalled()) {
     win32: 'win',
   };
 
+  let archAddon = '';
+  if (platform === 'darwin' && os.arch() === 'arm64') archAddon = '-arm64';
+
   const response = await download(
-    `https://github.com/ulixee/secret-agent/releases/download/v${version}/replay-${version}-${platformNames[platform]}.tar.gz`,
+    `https://github.com/ulixee/secret-agent/releases/download/v${version}/replay-${version}-${platformNames[platform]}${archAddon}.tar.gz`,
   );
   const length = parseInt(response.headers['content-length'], 10);
 
diff --git a/replay/pack.sh b/replay/pack.sh
@@ -16,6 +16,13 @@ if [ -d "./mac" ]; then
   cd ..
 fi
 
+if [ -d "./mac-arm64" ]; then
+  cd "mac-arm64"
+  echo "Packing mac-arm64"
+  tar -czf "../assets/replay-${PACKAGE_VERSION}-mac-arm64.tar.gz" SecretAgentReplay.app
+  cd ..
+fi
+
 if [ -d "./linux-unpacked" ]; then
   echo "Packing linux"
   mv linux-unpacked "replay-${PACKAGE_VERSION}-linux"
diff --git a/replay/package.json b/replay/package.json
@@ -21,7 +21,13 @@
     "appId": "dev.secretagent.replay",
     "productName": "SecretAgentReplay",
     "mac": {
-      "target": "dir",
+      "target": {
+        "target": "dir",
+        "arch": [
+          "arm64",
+          "x64"
+        ]
+      },
       "artifactName": "replay-${version}-${os}${ext}"
     },
     "win": {
@@ -62,25 +68,26 @@
     "@babel/runtime-corejs3": "^7.11.2",
     "compare-versions": "^3.6.0",
     "core-js": "^3.6.5",
-    "electron-log": "^4.2.1",
-    "moment": "^2.24.0",
+    "electron-log": "^4.3.2",
+    "moment": "^2.24.1",
     "progress": "^2.0.3",
     "proper-lockfile": "^4.1.1",
     "source-map-support": "^0.5.19",
     "tar": "^6.0.5",
-    "uuid": "^8.3.1",
+    "uuid": "^8.3.2",
     "ws": "^7.4.2"
   },
   "devDependencies": {
     "@types/chrome": "^0.0.113",
     "@types/node": "^13.13.34",
     "@types/proper-lockfile": "^4.1.1",
     "@types/tar": "^4.0.4",
+    "@types/fs-extra": "9.0.7",
     "concurrently": "^5.2.0",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.3",
-    "electron": "10.3.2",
-    "electron-builder": "^22.9.1",
+    "electron": "12.0.0",
+    "electron-builder": "^22.10.5",
     "electron-icon-builder": "^1.0.2",
     "shx": "^0.3.3",
     "tscpaths": "^0.0.9",
diff --git a/website/package.json b/website/package.json
@@ -12,17 +12,18 @@
     "deploy": "gh-pages -d ../build-dist/website"
   },
   "dependencies": {
-    "@gridsome/remark-prismjs": "^0.3.0",
-    "@gridsome/vue-remark": "^0.2.1",
+    "@gridsome/remark-prismjs": "^0.5.0",
+    "@gridsome/vue-remark": "^0.2.6",
     "@microflash/gridsome-plugin-feed": "^1.2.1",
     "@types/json2md": "^1.5.0",
     "@types/lodash.kebabcase": "^4.1.6",
     "awaited-dom": "^1.1.10",
+    "babel-runtime": "^6.26.0",
     "decamelize": "^4.0.0",
     "docsearch.js": "^2.6.3",
-    "gridsome": "^0.7.12",
+    "gridsome": "^0.7.23",
     "lodash.kebabcase": "^4.1.1",
-    "moment": "^2.24.0",
+    "moment": "^2.24.1",
     "remark-slug": "git://github.com/ulixee/remark-slug.git",
     "typography": "^0.16.19",
     "vue": "^2.6.12",
@@ -38,7 +39,7 @@
     "json2md": "^1.7.0",
     "node-sass": "^4.12.0",
     "noderdom-detached": "git://github.com/ulixee/noderdom-detached.git#dist",
-    "pug": "^2.0.3",
+    "pug": "^3.0.2",
     "sass-loader": "^8.0.0",
     "sharp": "^0.23.2",
     "ts-loader": "^6.2.1",
diff --git a/yarn.lock b/yarn.lock
