@prosopo/procaptcha-bundle 0.1.16 → 0.1.18

package/package.json

@@ -1,28 +1,34 @@
 {
     "name": "@prosopo/procaptcha-bundle",
-    "version": "0.1.16",
+    "version": "0.1.18",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
+    "type": "module",
     "types": "./dist/index.d.ts",
-    "source": "./src/index.ts",
+    "source": "./src/index.tsx",
     "scripts": {
         "clean": "tsc --build --clean",
         "build": "tsc --build --verbose",
-        "start": "webpack serve --mode development",
-        "build:webpack:prod": "webpack --mode production",
-        "build:webpack:prod:copy": "webpack --mode production && cp dist/procaptcha_bundle.main.bundle.js ../../demos/client-bundle-example/src",
-        "build:webpack:dev": "webpack --mode development",
-        "build:webpack:dev:copy": "webpack --mode development && cp dist/procaptcha_bundle.main.bundle.js ../../demos/client-bundle-example/src",
+        "start": "vite serve --mode development --host",
+        "build:dev": "npm run build && vite build --mode development --debug",
+        "build:prod": "npm run build && vite build --mode production",
         "lint": "npx eslint .",
-        "lint:fix": "npx eslint . --fix"
+        "lint:fix": "npx eslint . --fix --config ../../.eslintrc.js"
     },
     "browserslist": [
         "> 0.5%, last 2 versions, not dead"
     ],
     "dependencies": {
-        "@prosopo/common": "^0.1.16",
-        "@prosopo/procaptcha-react": "^0.1.16"
+        "@emotion/react": "^11.11.1",
+        "@emotion/styled": "^11.11.0",
+        "@mui/icons-material": "^5.14.3",
+        "@mui/material": "^5.14.5",
+        "@prosopo/common": "^0.1.18",
+        "@prosopo/procaptcha": "^0.1.18",
+        "@prosopo/procaptcha-react": "^0.1.18",
+        "@prosopo/types": "^0.1.18",
+        "@prosopo/util": "^0.1.18"
     },
     "repository": {
         "type": "git",
@@ -37,41 +43,12 @@
         "registry": "https://registry.npmjs.org"
     },
     "devDependencies": {
-        "@babel/core": "^7.21.5",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-        "@babel/preset-env": "^7.21.5",
-        "@babel/preset-react": "^7.18.6",
-        "@babel/preset-typescript": "^7.21.5",
-        "@rollup/plugin-babel": "^6.0.3",
-        "@rollup/plugin-commonjs": "^24.1.0",
-        "@rollup/plugin-node-resolve": "^15.0.2",
-        "@types/react": "^18.2.7",
-        "@types/react-dom": "^18.2.4",
-        "@typescript-eslint/eslint-plugin": "^5.59.5",
-        "@typescript-eslint/parser": "^5.30.7",
-        "babel-loader": "^9.1.2",
-        "babel-plugin-lodash": "^3.3.4",
-        "compression-webpack-plugin": "^10.0.0",
-        "css-loader": "^6.7.3",
-        "dotenv-webpack": "^8.0.1",
-        "eslint": "^8.40.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-unused-imports": "^2.0.0",
-        "eslint-webpack-plugin": "^4.0.1",
-        "html-webpack-plugin": "^5.5.1",
-        "mini-css-extract-plugin": "^2.7.5",
-        "parcel": "^2.8.3",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "style-loader": "^3.3.2",
-        "terser-webpack-plugin": "^5.3.7",
-        "typescript": "^4.7.4",
-        "webpack": "^5.82.0",
-        "webpack-bundle-analyzer": "^4.8.0",
-        "webpack-dev-server": "^4.13.3",
-        "webpack-json-access-optimizer": "^1.1.0",
-        "webpack-cli": "^5.1.1"
+        "@originjs/vite-plugin-commonjs": "^1.0.3",
+        "@prosopo/config": "^0.1.18",
+        "@rollup/plugin-typescript": "^11.1.2",
+        "@vitejs/plugin-react": "^4.0.4",
+        "tslib": "^2.6.2",
+        "typescript": "^5.1.6",
+        "webpack-merge": "^5.9.0"
     }
 }

package/vite.config.ts

@@ -0,0 +1,47 @@
+import * as fs from 'fs'
+import * as path from 'path'
+import { ViteFrontendConfig } from '@prosopo/config'
+import { defineConfig } from 'vite'
+import { loadEnv } from '@prosopo/cli'
+// load env using our util because vite loadEnv is not working for .env.development
+loadEnv()
+
+// Vite doesn't find the tsconfig for some reason
+process.env.TS_NODE_PROJECT = path.resolve('./tsconfig.json')
+
+// Package specific config
+const copyTo = '../../demos/client-bundle-example/src'
+const bundleName = 'procaptcha'
+const packageName = '@prosopo/procaptcha-bundle'
+const entry = './src/index.tsx'
+const copyOptions = copyTo
+    ? {
+          srcDir: './dist/bundle',
+          destDir: copyTo,
+          bundleName: bundleName,
+      }
+    : undefined
+const tsConfigPaths = [path.resolve('./tsconfig.json')]
+const packagesDir = path.resolve('..')
+// Get all folders in packagesDir
+const packages = fs.readdirSync(packagesDir).filter((f) => fs.statSync(path.join(packagesDir, f)).isDirectory())
+for (const packageName of packages) {
+    // Add the tsconfig for each package to tsConfigPaths
+    tsConfigPaths.push(path.resolve(`../${packageName}/tsconfig.json`))
+}
+// Merge with generic frontend config
+export default defineConfig(async ({ command, mode }) => {
+    const frontendConfig = await ViteFrontendConfig(
+        packageName,
+        bundleName,
+        path.resolve(),
+        entry,
+        command,
+        mode,
+        copyOptions,
+        tsConfigPaths
+    )
+    return {
+        ...frontendConfig,
+    }
+})

package/dist/index.d.ts

@@ -1,3 +0,0 @@
-export declare function render(): void;
-export default function ready(fn: any): void;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AA6CA,wBAAgB,MAAM,SA8BrB;AAGD,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,EAAE,KAAA,QAS/B"}

package/dist/index.html

@@ -1 +0,0 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>React App</title><script defer="defer" src="procaptcha_bundle.main.bundle.js"></script></head><body><div id="root"></div></body></html>

package/dist/index.js

@@ -1,86 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { ApiParams, EnvironmentTypesSchema } from '@prosopo/types';
-import { LogLevel } from '@prosopo/common';
-import { Procaptcha } from '@prosopo/procaptcha-react';
-import { createRoot } from 'react-dom/client';
-function getConfig(siteKey) {
-    if (!siteKey) {
-        siteKey = process.env.DAPP_SITE_KEY || process.env.PROSOPO_SITE_KEY || '';
-    }
-    return {
-        logLevel: LogLevel.Info,
-        defaultEnvironment: process.env.DEFAULT_ENVIRONMENT || EnvironmentTypesSchema.enum.development,
-        userAccountAddress: '',
-        web2: true,
-        dappName: 'Prosopo',
-        account: {
-            address: siteKey,
-        },
-        networks: {
-            [EnvironmentTypesSchema.enum.development]: {
-                endpoint: process.env.SUBSTRATE_NODE_URL || 'ws://127.0.0.1:9944',
-                contract: {
-                    address: process.env.PROTOCOL_CONTRACT_ADDRESS || '',
-                    name: 'prosopo',
-                },
-                accounts: [],
-            },
-        },
-        solutionThreshold: 80,
-    };
-}
-function getParentForm(element) {
-    let parent = element.parentElement;
-    while (parent) {
-        if (parent.tagName === 'FORM') {
-            return parent;
-        }
-        parent = parent.parentElement;
-    }
-    return null;
-}
-export function render() {
-    const elements = Array.from(document.getElementsByClassName('procaptcha'));
-    const siteKey = elements[0].getAttribute('data-sitekey') || undefined;
-    const config = getConfig(siteKey);
-    console.log('Config', config);
-    for (const element of elements) {
-        const callbacks = {
-            // add a listener to the onSubmit event of the parent form of element, appending the payload as
-            // procaptcha-response
-            onHuman: (payload) => {
-                // get form
-                const form = getParentForm(element);
-                // add a listener to the onSubmit event of the form
-                if (form) {
-                    form.addEventListener('submit', (event) => {
-                        event.preventDefault();
-                        // add the payload to the form
-                        const input = document.createElement('input');
-                        input.type = 'hidden';
-                        (input.name = ApiParams.procaptchaResponse), (input.value = JSON.stringify(payload));
-                        form.appendChild(input);
-                        // submit the form
-                        form.submit();
-                    });
-                }
-            },
-        };
-        const root = createRoot(element);
-        root.render(_jsx(Procaptcha, { config: config, callbacks: callbacks })); //wrap in fn and give user access to func
-    }
-}
-//https://stackoverflow.com/questions/41174095/do-i-need-to-use-onload-to-start-my-webpack-bundled-code
-export default function ready(fn) {
-    if (document && document.readyState != 'loading') {
-        console.log('document.readyState ready!');
-        fn();
-    }
-    else {
-        console.log('DOMContentLoaded listener!');
-        // note sure if this is the correct event listener
-        document.addEventListener('DOMContentLoaded', fn);
-    }
-}
-ready(render);
-//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}