Skip to content

Commit 4ae4101

Browse files
authored
Merge pull request #8 from greenfinity/rescript-v12-beta4
Update to rescript v12.0.0-beta.4
2 parents abeddd0 + 3292fa9 commit 4ae4101

7 files changed

Lines changed: 84 additions & 24 deletions

File tree

lib/rescript.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
91613

package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"changelog": "yarn auto-changelog -p && git add HISTORY.md",
77
"build": "yarn rescript:build",
88
"rescript:clean": "yarn rescript clean",
9-
"rescript:build": "yarn rescript build -with-deps",
10-
"rescript:dev": "yarn rescript build -with-deps -w",
9+
"rescript:build": "yarn rescript build",
10+
"rescript:build:dev": "yarn rescript build --dev",
11+
"rescript:dev": "yarn rescript watch --dev",
1112
"test": "yarn vitest --run --coverage --allow-only",
1213
"test:dev": "yarn vitest",
1314
"yalc:dev": "yarn rescript:dev & yarn nodemon -x \"yalc push\"",
@@ -30,17 +31,21 @@
3031
},
3132
"homepage": "https://github.com/greenfinity/rescript-docx#readme",
3233
"devDependencies": {
33-
"@greenfinity/rescript-nodejs": "^16.1.1-1",
3434
"auto-changelog": "^2.5.0",
3535
"file-saver": "^2.0.5",
3636
"nodemon": "^3.1.7",
37-
"rescript": "^11.1.0"
37+
"rescript": "^12.0.0-beta.4",
38+
"rescript-nodejs": "^16.1.0"
3839
},
3940
"dependencies": {
4041
"@vitest/coverage-v8": "^2.1.8",
4142
"docx": "^8.2.3",
4243
"jsdom": "^25.0.1",
4344
"vitest": "^2.1.8"
4445
},
46+
"peerDependencies": {
47+
"rescript": "^12.0.0-beta.4",
48+
"rescript-nodejs": "^16.1.0"
49+
},
4550
"packageManager": "yarn@4.6.0"
4651
}

rescript.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
},
2626
"suffix": ".bs.mjs",
2727
"jsx": { "version": 4, "mode": "classic" },
28-
"bs-dev-dependencies": ["@greenfinity/rescript-nodejs"]
28+
"dev-dependencies": ["rescript-nodejs"]
2929
}

src/FrameOptions.res

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,4 @@ and space = {
139139
vertical: float,
140140
}
141141

142-
@unwrap
143142
type t = XYFrameOptions(xyFrameOptions) | AlignmentFrameOptions(alignmentFrameOptions)

src/FrameOptions.resi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,4 @@ and space = {
8989
}
9090

9191
/** @see https://docx.js.org/api/types/IFrameOptions.html */
92-
@unwrap
9392
type t = XYFrameOptions(xyFrameOptions) | AlignmentFrameOptions(alignmentFrameOptions)

src/Packer.res

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ type prettifyType =
44
| @as(" ") With4Blanks
55
| @as("\t") WithTab
66

7-
@unwrap
87
type prettify = Bool(bool) | Pretty(prettifyType)
98

109
@module("docx") @scope("Packer")

yarn.lock

Lines changed: 73 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -222,25 +222,21 @@ __metadata:
222222
version: 0.0.0-use.local
223223
resolution: "@greenfinity/rescript-docx@workspace:."
224224
dependencies:
225-
"@greenfinity/rescript-nodejs": "npm:^16.1.1-1"
226225
"@vitest/coverage-v8": "npm:^2.1.8"
227226
auto-changelog: "npm:^2.5.0"
228227
docx: "npm:^8.2.3"
229228
file-saver: "npm:^2.0.5"
230229
jsdom: "npm:^25.0.1"
231230
nodemon: "npm:^3.1.7"
232-
rescript: "npm:^11.1.0"
231+
rescript: "npm:^12.0.0-beta.4"
232+
rescript-nodejs: "npm:^16.1.0"
233233
vitest: "npm:^2.1.8"
234+
peerDependencies:
235+
rescript: ^12.0.0-beta.4
236+
rescript-nodejs: ^16.1.0
234237
languageName: unknown
235238
linkType: soft
236239

237-
"@greenfinity/rescript-nodejs@npm:^16.1.1-1":
238-
version: 16.1.1-1
239-
resolution: "@greenfinity/rescript-nodejs@npm:16.1.1-1"
240-
checksum: 10/73f166eec1475ba57fa626e6af4f9156c69e865a3d1303a8f40a67ae56c833f50d773ee28728acf8724950c8855e964a08d202f489577a77306a779fd0173e5f
241-
languageName: node
242-
linkType: hard
243-
244240
"@isaacs/cliui@npm:^8.0.2":
245241
version: 8.0.2
246242
resolution: "@isaacs/cliui@npm:8.0.2"
@@ -342,6 +338,41 @@ __metadata:
342338
languageName: node
343339
linkType: hard
344340

341+
"@rescript/darwin-arm64@npm:12.0.0-beta.4":
342+
version: 12.0.0-beta.4
343+
resolution: "@rescript/darwin-arm64@npm:12.0.0-beta.4"
344+
conditions: os=darwin & cpu=arm64
345+
languageName: node
346+
linkType: hard
347+
348+
"@rescript/darwin-x64@npm:12.0.0-beta.4":
349+
version: 12.0.0-beta.4
350+
resolution: "@rescript/darwin-x64@npm:12.0.0-beta.4"
351+
conditions: os=darwin & cpu=x64
352+
languageName: node
353+
linkType: hard
354+
355+
"@rescript/linux-arm64@npm:12.0.0-beta.4":
356+
version: 12.0.0-beta.4
357+
resolution: "@rescript/linux-arm64@npm:12.0.0-beta.4"
358+
conditions: os=linux & cpu=arm64
359+
languageName: node
360+
linkType: hard
361+
362+
"@rescript/linux-x64@npm:12.0.0-beta.4":
363+
version: 12.0.0-beta.4
364+
resolution: "@rescript/linux-x64@npm:12.0.0-beta.4"
365+
conditions: os=linux & cpu=x64
366+
languageName: node
367+
linkType: hard
368+
369+
"@rescript/win32-x64@npm:12.0.0-beta.4":
370+
version: 12.0.0-beta.4
371+
resolution: "@rescript/win32-x64@npm:12.0.0-beta.4"
372+
conditions: os=win32 & cpu=x64
373+
languageName: node
374+
linkType: hard
375+
345376
"@rollup/rollup-android-arm-eabi@npm:4.29.1":
346377
version: 4.29.1
347378
resolution: "@rollup/rollup-android-arm-eabi@npm:4.29.1"
@@ -1960,14 +1991,40 @@ __metadata:
19601991
languageName: node
19611992
linkType: hard
19621993

1963-
"rescript@npm:^11.1.0":
1964-
version: 11.1.4
1965-
resolution: "rescript@npm:11.1.4"
1994+
"rescript-nodejs@npm:^16.1.0":
1995+
version: 16.1.0
1996+
resolution: "rescript-nodejs@npm:16.1.0"
1997+
checksum: 10/1470b330f30616e0ec98da41cb36af2b9d009b2f8a93374d1c19687fa0c48cc7fe8ae5d40f5374c0f48098ac38751e60b4e62ba3d89a1b48d216d64fe129c898
1998+
languageName: node
1999+
linkType: hard
2000+
2001+
"rescript@npm:^12.0.0-beta.4":
2002+
version: 12.0.0-beta.4
2003+
resolution: "rescript@npm:12.0.0-beta.4"
2004+
dependencies:
2005+
"@rescript/darwin-arm64": "npm:12.0.0-beta.4"
2006+
"@rescript/darwin-x64": "npm:12.0.0-beta.4"
2007+
"@rescript/linux-arm64": "npm:12.0.0-beta.4"
2008+
"@rescript/linux-x64": "npm:12.0.0-beta.4"
2009+
"@rescript/win32-x64": "npm:12.0.0-beta.4"
2010+
dependenciesMeta:
2011+
"@rescript/darwin-arm64":
2012+
optional: true
2013+
"@rescript/darwin-x64":
2014+
optional: true
2015+
"@rescript/linux-arm64":
2016+
optional: true
2017+
"@rescript/linux-x64":
2018+
optional: true
2019+
"@rescript/win32-x64":
2020+
optional: true
19662021
bin:
1967-
bsc: bsc
1968-
bstracing: lib/bstracing
1969-
rescript: rescript
1970-
checksum: 10/2ba71cf76e04000afb025afc245aef0d4c1647c73323f325bbc386f562df5a9fdddf137f6031ac7bb59c935c60174156d7a605a05a70adac8bd76dc0795aa6bd
2022+
bsc: cli/bsc.js
2023+
bstracing: cli/bstracing.js
2024+
rescript: cli/rescript.js
2025+
rescript-legacy: cli/rescript-legacy.js
2026+
rescript-tools: cli/rescript-tools.js
2027+
checksum: 10/2dbb8cbd28e774e5039d4bc2bb91b523c1fdf4ab5fedafcb8fa1ee3367044fba422ea67707265c01dc6782b86d2a14c63c34a5c5c2eb43bffb5f9f73505955a1
19712028
languageName: node
19722029
linkType: hard
19732030

0 commit comments

Comments
 (0)