Merge pull request #201 from medyo/develop

New Release #minor

Author: medyo

.github/workflows/deploy.yml

@@ -17,12 +17,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install dependencies
         run: yarn

.github/workflows/distribute.yml

@@ -32,7 +32,7 @@ jobs:
   tag_version:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -64,10 +64,10 @@ jobs:
     needs: tag_version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: master
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
@@ -91,13 +91,17 @@ jobs:
     needs: tag_version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: master
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
       - name: Install yarn dependencies
         run: yarn
 

.nvmrc

@@ -0,0 +1 @@
+18.20.0

package.json

@@ -9,23 +9,24 @@
     "@tanstack/react-query-persist-client": "^5.8.4",
     "@types/dompurify": "^2.3.4",
     "@types/jspath": "^0.4.0",
-    "axios": "^0.21.2",
+    "axios": "^1.8.4",
     "axios-cache-adapter": "^2.7.3",
     "country-emoji": "^1.5.4",
-    "dompurify": "^2.2.7",
+    "dompurify": "^3.2.4",
+    "firebase": "^11.2.0",
     "htmlparser2": "^8.0.1",
     "jsonpath": "^1.1.1",
     "normalize.css": "^8.0.1",
     "prop-types": "^15.0.0-0",
     "react": "^17.0.1",
     "react-contexify": "^5.0.0",
-    "react-device-detect": "^1.17.0",
     "react-dom": "^17.0.1",
     "react-easy-sort": "^1.5.1",
     "react-error-boundary": "^3.1.4",
     "react-icons": "^5.2.1",
     "react-markdown": "^7.0.1",
     "react-modal": "^3.12.1",
+    "react-responsive": "^10.0.1",
     "react-router-dom": "^6.21.0",
     "react-select": "^5.0.1",
     "react-share": "^4.4.1",
@@ -40,6 +41,9 @@
     "web-vitals": "^0.2.4",
     "zustand": "^4.3.3"
   },
+  "engines": {
+    "node": "18"
+  },
   "scripts": {
     "start": "vite",
     "preview": "vite preview",
@@ -91,7 +95,7 @@
     "prettier": "^2.7.1",
     "terser": "^5.19.2",
     "typescript": "^5.1.6",
-    "vite": "^4.4.5",
+    "vite": "^6.2.3",
     "vite-plugin-svgr": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.0"
   }

public/auth.js

@@ -0,0 +1,6 @@
+window.addEventListener('message', (event) => {
+  if (event.data.type === 'TOKEN_RECEIVED') {
+    // Forward to content script
+    window.postMessage(event.data, '*')
+  }
+})

public/background.js

@@ -1,9 +1,4 @@
-/*chrome.browserAction.onClicked.addListener(function (tab) {
-  chrome.tabs.create({ url: "chrome://newtab" });
-}
-);*/
-
 const uninstallUrl = `https://hackertab.dev/uninstall.html`
 if (chrome.runtime.setUninstallURL) {
   chrome.runtime.setUninstallURL(uninstallUrl)
-}
+}

public/base.manifest.json

@@ -1,10 +1,19 @@
 {
+  "manifest_version": 3,
   "name": "Hackertab.dev - developer news",
   "description": "All developer news in one tab",
   "version": "1.22.0",
   "chrome_url_overrides": {
     "newtab": "index.html"
   },
+  "host_permissions": ["https://*.hackertab.dev/*"],
+  "content_scripts": [
+    {
+      "matches": ["https://hackertab.dev/*"],
+      "run_at": "document_start",
+      "js": ["content.js"]
+    }
+  ],
   "icons": {
     "16": "/logos/logo16.png",
     "32": "/logos/logo32.png",

public/chrome.manifest.json

@@ -1,7 +1,5 @@
 {
-  "manifest_version": 3,
   "background": {
     "service_worker": "background.js"
-  },
-  "host_permissions": ["https://*.hackertab.dev/*"]
+  }
 }

public/content.js

@@ -0,0 +1,12 @@
+const script = document.createElement('script')
+script.src = chrome.runtime.getURL('auth.js')
+document.documentElement.appendChild(script)
+
+// Listen for messages from the injected script
+window.addEventListener('message', (event) => {
+  if (event.source !== window || !event.data || event.data.type !== 'TOKEN_RECEIVED') {
+    return
+  }
+
+  chrome.runtime.sendMessage({ ...event.data })
+})

public/firefox.manifest.json

@@ -1,17 +1,5 @@
 {
-    "manifest_version": 2,
-    "background": {
-      "scripts": [
-        "background.js"
-      ]
-    },
-    "permissions": [
-      "https://*.hackertab.dev/*"
-    ],
-    "content_security_policy": "script-src 'self' object-src 'self'",
-    "applications": {
-      "gecko": {
-        "id": "{f8793186-e9da-4332-aa1e-dc3d9f7bb04c}"
-      }
-    }
-  }
+  "background": {
+    "scripts": ["background.js"]
+  }
+}

src/App.tsx

@@ -1,8 +1,14 @@
 import { useEffect, useLayoutEffect, useState } from 'react'
 import { DNDLayout } from 'src/components/Layout'
-import { setupAnalytics, setupIdentification, trackPageView } from 'src/lib/analytics'
+import {
+  identifyAdvBlocked,
+  setupAnalytics,
+  setupIdentification,
+  trackPageView,
+} from 'src/lib/analytics'
 import { useUserPreferences } from 'src/stores/preferences'
 import { AppContentLayout } from './components/Layout'
+import { verifyAdvStatus } from './features/adv/utils/status'
 import { isWebOrExtensionVersion } from './utils/Environment'
 import { lazyImport } from './utils/lazyImport'
 const { OnboardingModal } = lazyImport(() => import('src/features/onboarding'), 'OnboardingModal')
@@ -30,6 +36,11 @@ export const App = () => {
     document.body.classList.remove('preload')
     setupAnalytics()
     setupIdentification()
+    const adVerifier = async () => {
+      const status = await verifyAdvStatus()
+      identifyAdvBlocked(status)
+    }
+    adVerifier()
   }, [])
 
   useEffect(() => {