feat: update configuration options, and use umd for cdn bundle

ZipingL · ZipingL · commit 97b1b2d7cffc · 2024-06-06T05:10:19.000-05:00
diff --git a/README.md b/README.md
@@ -230,7 +230,7 @@ _For now this CDN bundle is only accessible in the form of a UMD bundle, through
 <body>
   <h1>My PDF Viewer</h1>
   <div id="root"></div>
-  <script src="https://cdn.jsdelivr.net/npm/react-adobe-embed/dist/react-adobe-embed.cdn.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/react-adobe-embed/lib/bundle.js"></script>
   <script>
     /**
      * @type {React} ReactCDN
@@ -268,7 +268,7 @@ _For now this CDN bundle is only accessible in the form of a UMD bundle, through
      * loaded via CDN from the above script tag
      * via jsdelivr.net
      */
-    const ReactViewAdobeCDN = window.ReactViewAdobe;
+    const ReactViewAdobeCDN = window.ReactAdobeEmbed.ReactViewAdobe;
 
     /**
      * @type { import('react-adobe-embed').ReactViewAdobeProps }
diff --git a/canary/routes/CDN.tsx b/canary/routes/CDN.tsx
@@ -11,7 +11,7 @@ export default function CDN() {
 
             // Create new script element to load cdn
             const script = document.createElement('script');
-            script.src = 'https://ziping-liu-corporation.github.io/react-adobe-embed/dist/react-adobe-embed.cdn.js';
+            script.src = 'https://ziping-liu-corporation.github.io/react-adobe-embed/lib/bundle.js';
             script.async = true;
             script.onload = () => {
                 setComponentDidUpdate(true);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-adobe-embed",
-  "version": "12.0.2",
+  "version": "13.0.0",
   "homepage": "https://ziping-liu-corporation.github.io/react-adobe-embed/#/home",
   "repository": {
     "type": "git",
@@ -50,8 +50,8 @@
   "module": "./lib/bundle.esm.mjs",
   "main": "./lib/bundle.cjs.js",
   "umd:main": "./lib/bundle.js",
-  "browser": "./dist/react-adobe-embed.cdn.js",
-  "jsdelivr": "./dist/react-adobe-embed.cdn.js",
+  "browser": "./lib/bundle.js",
+  "jsdelivr": "./lib/bundle.js",
   "exports": {
     ".": {
       "require": "./lib/bundle.cjs.js",
@@ -76,13 +76,13 @@
   "scripts": {
     "clean": "rm -rf ./build && rm -rf ./lib && rm -rf ./dist && rm -rf ./types",
     "test": "jest",
-    "build:canary": "npm run build:roll:canary && rsync -rhv --progress ./public/* ./build && cp ./README.md ./build && npm run build:roll:cdn && rsync -rhv --progress ./dist ./build/ && cp ./LICENSE.md ./build && npm run build:public",
+    "build:canary": "npm run build:roll:canary && rsync -rhv --progress ./public/* ./build && cp ./README.md ./build && npm run build:roll && rsync -rhv --progress ./lib ./build/ && cp ./LICENSE.md ./build && npm run build:public",
     "build:public": "node ./scripts/public.js",
     "build:roll:canary": "rimraf build &&  rollup --bundleConfigAsCjs -c rollup.config.canary.js",
     "predeploy": "npm run build:roll:canary",
     "prepare": "husky install",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx ./src ./canary",
-    "build": "npm run build:roll && npm run build:roll:cdn",
+    "build": "npm run build:roll",
     "deploy": "gh-pages -d build",
     "build:roll": "rimraf lib && tsc -p tsconfig.build.json && rollup --bundleConfigAsCjs -c rollup.config.js",
     "build:roll:cdn": "rimraf dist && tsc -p tsconfig.build.json && rollup --bundleConfigAsCjs -c rollup.config.cdn.js"
@@ -101,6 +101,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@testing-library/react": "^14.0.0",
     "@types/jest": "^29.5.11",
     "@types/react": "^18.2.33",
@@ -123,6 +124,5 @@
     "rollup-plugin-typescript2": "^0.34.1",
     "ts-jest": "^29.1.1",
     "typescript": "^4.9.5"
-  
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -18,7 +18,7 @@ const outputCommonConf = {
   exports: 'named',
   globals: {
     react: 'React',
-    'react-dom/client': 'ReactDOM'
+    'react-dom': 'ReactDOM'
   }
 };
 
@@ -31,26 +31,35 @@ export default [
           {
             file: packageJson['umd:main'],
             format: 'umd',
-            name: 'ReactScriptTag',
-            ...outputCommonConf
+            name: 'ReactAdobeEmbed',
+            exports:"named",
+            extend: true,
+            sourcemap: true,
+            globals: {
+              react: 'React',
+              'react-dom': 'ReactDOM'
+            },
           },
           {
             file: packageJson.main,
+            name: 'ReactAdobeEmbed',
             format: 'cjs',
             ...outputCommonConf
           },
           {
             file: packageJson.module,
-            format: 'es',
-            ...outputCommonConf
+         
+            format: 'esm',
+            
+           
           },
         ],
         plugins: [
             peerDepsExternal(),
             localResolve(),
             babel({ exclude: 'node_modules/**, src/tests/**' ,
         
-            babelHelpers: 'external',
+            babelHelpers: "bundled",
             presets: [
                 "@babel/preset-env",
                 "@babel/preset-react",
@@ -95,11 +104,13 @@ export default [
 
             filesize(),
         ],
-        external: ["react", "react-dom", "styled-components"]
+        external: ['react', 'react-dom'], // Marking React and ReactDOM as external
+
     },
     {
         input:  "types/index.d.ts",
         output: [{ file: "lib/bundle.esm.d.ts", format: "esm" }],
         plugins: [dts()],
     },
+    
 ];
diff --git a/src/index.tsx b/src/index.tsx
