Merge pull request #63 from LuisEnMarroquin/develop

Develop to main version 2.5.1
LuisEnMarroquin · Dec 12, 2022 · 86472d4 · 86472d4
2 parents 7bdb36e + 859be62
commit 86472d4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
         run: yarn run static
       - uses: JamesIves/[email protected]
         with:
-          folder: dist
+          folder: build
           branch: gh-pages
           git-config-name: LuisEnMarroquin
           git-config-email: [email protected]
diff --git a/packages/demo-express/package.json b/packages/demo-express/package.json
@@ -11,7 +11,7 @@
     "@types/express": "^4.17.14",
     "@types/node": "^18.11.11",
     "express": "^4.18.2",
-    "json-as-xlsx": "*",
+    "json-as-xlsx": "file:../main-library",
     "nodemon": "^2.0.20",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.4"

diff --git a/packages/demo-reactjs/package.json b/packages/demo-reactjs/package.json
@@ -8,7 +8,7 @@
     "@types/node": "^18.11.11",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
-    "json-as-xlsx": "*",
+    "json-as-xlsx": "file:../main-library",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",

diff --git a/packages/main-library/package.json b/packages/main-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-as-xlsx",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/main-library/src/index.ts b/packages/main-library/src/index.ts
@@ -208,3 +208,9 @@ export const xlsx = (jsonSheets: IJsonSheet[], settings: ISettings = {}, workboo
 export default xlsx
 
 export const libraryName = "json-as-xlsx"
+
+module.exports = xlsx
+module.exports.getContentProperty = getContentProperty
+module.exports.getJsonSheetRow = getJsonSheetRow
+module.exports.getWorksheetColumnWidths = getWorksheetColumnWidths
+module.exports.utils = utils
diff --git a/yarn.lock b/yarn.lock
@@ -8420,6 +8420,11 @@ jsesc@~0.5.0:
   resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+"json-as-xlsx@file:packages/main-library":
+  version "2.5.0"
+  dependencies:
+    xlsx "^0.18.5"
+
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"