Merge pull request #9 from aruniverse/fetch-req

add a network req as a fail safe

Author: aruniverse

.github/workflows/publish.yml

@@ -5,19 +5,11 @@ on:
     types: [created]
 
 jobs:
-  # build:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 12
-  #     - run: yarn
-  #     - run: yarn build
-
   publish-npm:
-    # needs: build
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./adblock-detect-react
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -29,18 +21,4 @@ jobs:
       - run: yarn publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-  # publish-gpr:
-  #   # needs: build
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: actions/setup-node@v1
-  #       with:
-  #         node-version: 12
-  #         registry-url: https://npm.pkg.github.com/
-  #         scope: "@aruniverse"
-  #     # - run: npm ci
-  #     - run: yarn
-  #     - run: yarn publish
-  #       env:
-  #         NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          

.gitignore

@@ -2,3 +2,6 @@ node_modules/
 cjs/
 esm/
 *.tgz
+
+build/
+*.eslintcache

README.md renamed to adblock-detect-react/README.md

@@ -0,0 +1,47 @@
+{
+  "name": "adblock-detect-react",
+  "version": "1.0.3",
+  "description": "Provides utilities to check if ad block is enabled on a page via both a React hook and a wrapper component.",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "types": "cjs/index.d.ts",
+  "author": "https://github.com/aruniverse",
+  "license": "MIT",
+  "repository": {
+    "url": "https://github.com/aruniverse/adblock-detect-react",
+    "type": "git"
+  },
+  "files": [
+    "cjs/**/*",
+    "esm/**/*"
+  ],
+  "keywords": [
+    "react",
+    "hooks",
+    "adblock",
+    "ad",
+    "block",
+    "detect"
+  ],
+  "scripts": {
+    "build": "concurrently yarn:build:cjs yarn:build:esm",
+    "build:cjs": "tsc -p cjs.tsconfig.json",
+    "build:esm": "tsc -p esm.tsconfig.json",
+    "clean": "rimraf cjs esm",
+    "rebuild": "yarn clean && yarn build",
+    "publish:local": "yarn rebuild && yarn pack"
+  },
+  "devDependencies": {
+    "@types/react": "^16.9.43",
+    "@types/react-dom": "^16.9.8",
+    "concurrently": "^5.2.0",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "rimraf": "^3.0.2",
+    "typescript": "^3.7.2"
+  },
+  "peerDependencies": {
+    "react": "^16.8.0",
+    "react-dom": "^16.8.0"
+  }
+}

cjs.tsconfig.json renamed to adblock-detect-react/cjs.tsconfig.json

@@ -42,5 +42,18 @@ export const useDetectAdBlock = () => {
     };
   }, []);
 
+  useEffect(() => {
+    // fail safe to double check
+    if (!adBlockDetected) {
+      fetch("pagead/js/adsbygoogle.js", {
+        method: "HEAD",
+        mode: "no-cors",
+        cache: "no-store",
+      }).catch(() => {
+        setAdBlockDetected(true);
+      });
+    }
+  }, []);
+
   return adBlockDetected;
 };

esm.tsconfig.json renamed to adblock-detect-react/esm.tsconfig.json

@@ -1,47 +1,11 @@
 {
-  "name": "adblock-detect-react",
-  "version": "1.0.2",
-  "description": "Provides utilities to check if ad block is enabled on a page via both a React hook and a wrapper component.",
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "types": "cjs/index.d.ts",
-  "author": "https://github.com/aruniverse",
-  "license": "MIT",
-  "repository": {
-    "url": "https://github.com/aruniverse/adblock-detect-react",
-    "type": "git"
-  },
-  "files": [
-    "cjs/**/*",
-    "esm/**/*"
-  ],
-  "keywords": [
-    "react",
-    "hooks",
-    "adblock",
-    "ad",
-    "block",
-    "detect"
-  ],
+  "name": "adblock-monorepo",
+  "private": "true",
   "scripts": {
-    "build": "concurrently yarn:build:cjs yarn:build:esm",
-    "build:cjs": "tsc -p cjs.tsconfig.json",
-    "build:esm": "tsc -p esm.tsconfig.json",
-    "clean": "rimraf cjs esm",
-    "rebuild": "yarn clean && yarn build",
-    "publish:local": "yarn rebuild && yarn pack"
-  },
-  "devDependencies": {
-    "@types/react": "^16.9.43",
-    "@types/react-dom": "^16.9.8",
-    "concurrently": "^5.2.0",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "rimraf": "^3.0.2",
-    "typescript": "^3.7.2"
+    "build": ""
   },
-  "peerDependencies": {
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0"
-  }
+  "workspaces": [
+    "adblock-detect-react/**",
+    "test-app/**"
+  ]
 }