Skip to content

Commit 60904b5

Browse files
Merge pull request #88 from LuisEnMarroquin/develop
Develop to main version 2.5.5
2 parents c00c1c9 + e65b059 commit 60904b5

File tree

7 files changed

+13701
-2573
lines changed

7 files changed

+13701
-2573
lines changed

packages/demo-express/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
},
1010
"dependencies": {
1111
"@types/express": "^4.17.14",
12-
"@types/node": "^18.11.11",
1312
"express": "^4.18.2",
1413
"json-as-xlsx": "file:../main-library",
15-
"nodemon": "^2.0.20",
14+
"nodemon": "^3.0.1",
1615
"ts-node": "^10.9.1",
1716
"typescript": "^4.9.4"
1817
}

packages/demo-reactjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"type": "commonjs",
77
"dependencies": {
8-
"@types/node": "^18.11.11",
8+
"@types/node": "^20.8.7",
99
"@types/react": "^18.0.26",
1010
"@types/react-dom": "^18.0.9",
1111
"json-as-xlsx": "file:../main-library",

packages/main-library/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "json-as-xlsx",
3-
"version": "2.5.4",
3+
"version": "2.5.5",
44
"license": "MIT",
55
"main": "dist/index.js",
66
"types": "dist/index.d.ts",
@@ -16,13 +16,13 @@
1616
"test": "jest --coverage"
1717
},
1818
"dependencies": {
19-
"xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
19+
"@e965/xlsx": "^0.20.0"
2020
},
2121
"devDependencies": {
22-
"@testing-library/jest-dom": "^5.16.5",
22+
"@testing-library/jest-dom": "^6.1.4",
2323
"@types/jest": "^29.2.4",
24-
"@types/node": "^18.11.11",
25-
"@types/testing-library__jest-dom": "^5.14.5",
24+
"@types/node": "^20.8.7",
25+
"@types/testing-library__jest-dom": "^6.0.0",
2626
"jest": "^29.3.1",
2727
"jest-cli": "^29.3.1",
2828
"jest-environment-jsdom": "^29.3.1",

packages/main-library/src/__tests__/getWorksheetColumWidths.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { utils } from "xlsx"
1+
import { utils } from "@e965/xlsx"
22
import { getJsonSheetRow, getWorksheetColumnWidths } from "../index"
33

44
test("Should return only one column width", () => {

packages/main-library/src/__tests__/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { read as readBufferWorkBook } from "xlsx"
1+
import { read as readBufferWorkBook } from "@e965/xlsx"
22
import jsonxlsx, { IContent, IJsonSheet, ISettings } from "../index"
33

44
describe("json-as-xlsx", () => {

packages/main-library/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { utils, WorkBook, WorkSheet, write, writeFile, WritingOptions } from "xlsx"
1+
import { utils, WorkBook, WorkSheet, write, writeFile, WritingOptions } from "@e965/xlsx"
22

33
export interface IColumn {
44
label: string
@@ -105,7 +105,7 @@ const getWorksheetColumnIds = (worksheet: WorkSheet): string[] => {
105105

106106
const getObjectLength = (object: unknown): number => {
107107
if (typeof object === "string") {
108-
return object.length
108+
return Math.max(...object.split("\n").map((string) => string.length))
109109
}
110110
if (typeof object === "number") {
111111
return object.toString().length

yarn.lock

Lines changed: 13690 additions & 2561 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)