Merge pull request #9 from aruniverse/fetch-req

add a network req as a fail safe

.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

adblock-detect-react/package.json

@@ -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"
+  }
+}

src/hooks/useDetectAdBlock.ts → adblock-detect-react/src/hooks/useDetectAdBlock.ts

@@ -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;
 };

package.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/**"
+  ]
 }

test-app/.env

@@ -0,0 +1,2 @@
+SKIP_PREFLIGHT_CHECK=true
+FAST_REFRESH=true

test-app/README.md

@@ -0,0 +1,46 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `yarn start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `yarn test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `yarn build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `yarn eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

test-app/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "adblock-test-app",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "dependencies": {
+    "adblock-detect-react": "1.0.2",
+    "detect-browser": "5.2.0",
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "typescript": "^4.0.3",
+    "web-vitals": "^0.2.4"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
+    "@types/jest": "^26.0.15",
+    "@types/node": "^12.0.0",
+    "@types/react": "^16.9.53",
+    "@types/react-dom": "^16.9.8",
+    "react-scripts": "4.0.1"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}

test-app/public/index.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>adblock-detect-test-app</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

test-app/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

test-app/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

test-app/src/App.css

@@ -0,0 +1,24 @@
+.App {
+  text-align: center;
+  background-color: #282c34;
+}
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+  padding: 10px 0 10px 0;
+}
+
+.App-header {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}

test-app/src/App.test.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+  render(<App />);
+  const linkElement = screen.getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});