diff --git a/lib/rescript.lock b/lib/rescript.lock new file mode 100644 index 0000000..88f8258 --- /dev/null +++ b/lib/rescript.lock @@ -0,0 +1 @@ +91613 \ No newline at end of file diff --git a/package.json b/package.json index fa91d63..7fe181f 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "changelog": "yarn auto-changelog -p && git add HISTORY.md", "build": "yarn rescript:build", "rescript:clean": "yarn rescript clean", - "rescript:build": "yarn rescript build -with-deps", - "rescript:dev": "yarn rescript build -with-deps -w", + "rescript:build": "yarn rescript build", + "rescript:build:dev": "yarn rescript build --dev", + "rescript:dev": "yarn rescript watch --dev", "test": "yarn vitest --run --coverage --allow-only", "test:dev": "yarn vitest", "yalc:dev": "yarn rescript:dev & yarn nodemon -x \"yalc push\"", @@ -30,11 +31,11 @@ }, "homepage": "https://github.com/greenfinity/rescript-docx#readme", "devDependencies": { - "@greenfinity/rescript-nodejs": "^16.1.1-1", "auto-changelog": "^2.5.0", "file-saver": "^2.0.5", "nodemon": "^3.1.7", - "rescript": "^11.1.0" + "rescript": "^12.0.0-beta.4", + "rescript-nodejs": "^16.1.0" }, "dependencies": { "@vitest/coverage-v8": "^2.1.8", @@ -42,5 +43,9 @@ "jsdom": "^25.0.1", "vitest": "^2.1.8" }, + "peerDependencies": { + "rescript": "^12.0.0-beta.4", + "rescript-nodejs": "^16.1.0" + }, "packageManager": "yarn@4.6.0" } diff --git a/rescript.json b/rescript.json index 54fe5da..b08e93a 100644 --- a/rescript.json +++ b/rescript.json @@ -25,5 +25,5 @@ }, "suffix": ".bs.mjs", "jsx": { "version": 4, "mode": "classic" }, - "bs-dev-dependencies": ["@greenfinity/rescript-nodejs"] + "dev-dependencies": ["rescript-nodejs"] } diff --git a/src/FrameOptions.res b/src/FrameOptions.res index 7431c57..ac752e5 100644 --- a/src/FrameOptions.res +++ b/src/FrameOptions.res @@ -139,5 +139,4 @@ and space = { vertical: float, } -@unwrap type t = XYFrameOptions(xyFrameOptions) | AlignmentFrameOptions(alignmentFrameOptions) diff --git a/src/FrameOptions.resi b/src/FrameOptions.resi index 23cc4b3..0cd2501 100644 --- a/src/FrameOptions.resi +++ b/src/FrameOptions.resi @@ -89,5 +89,4 @@ and space = { } /** @see https://docx.js.org/api/types/IFrameOptions.html */ -@unwrap type t = XYFrameOptions(xyFrameOptions) | AlignmentFrameOptions(alignmentFrameOptions) diff --git a/src/Packer.res b/src/Packer.res index 2ba4d3d..c3df956 100644 --- a/src/Packer.res +++ b/src/Packer.res @@ -4,7 +4,6 @@ type prettifyType = | @as(" ") With4Blanks | @as("\t") WithTab -@unwrap type prettify = Bool(bool) | Pretty(prettifyType) @module("docx") @scope("Packer") diff --git a/yarn.lock b/yarn.lock index 5a728c6..953e569 100644 --- a/yarn.lock +++ b/yarn.lock @@ -222,25 +222,21 @@ __metadata: version: 0.0.0-use.local resolution: "@greenfinity/rescript-docx@workspace:." dependencies: - "@greenfinity/rescript-nodejs": "npm:^16.1.1-1" "@vitest/coverage-v8": "npm:^2.1.8" auto-changelog: "npm:^2.5.0" docx: "npm:^8.2.3" file-saver: "npm:^2.0.5" jsdom: "npm:^25.0.1" nodemon: "npm:^3.1.7" - rescript: "npm:^11.1.0" + rescript: "npm:^12.0.0-beta.4" + rescript-nodejs: "npm:^16.1.0" vitest: "npm:^2.1.8" + peerDependencies: + rescript: ^12.0.0-beta.4 + rescript-nodejs: ^16.1.0 languageName: unknown linkType: soft -"@greenfinity/rescript-nodejs@npm:^16.1.1-1": - version: 16.1.1-1 - resolution: "@greenfinity/rescript-nodejs@npm:16.1.1-1" - checksum: 10/73f166eec1475ba57fa626e6af4f9156c69e865a3d1303a8f40a67ae56c833f50d773ee28728acf8724950c8855e964a08d202f489577a77306a779fd0173e5f - languageName: node - linkType: hard - "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -342,6 +338,41 @@ __metadata: languageName: node linkType: hard +"@rescript/darwin-arm64@npm:12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "@rescript/darwin-arm64@npm:12.0.0-beta.4" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rescript/darwin-x64@npm:12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "@rescript/darwin-x64@npm:12.0.0-beta.4" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rescript/linux-arm64@npm:12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "@rescript/linux-arm64@npm:12.0.0-beta.4" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"@rescript/linux-x64@npm:12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "@rescript/linux-x64@npm:12.0.0-beta.4" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"@rescript/win32-x64@npm:12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "@rescript/win32-x64@npm:12.0.0-beta.4" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@rollup/rollup-android-arm-eabi@npm:4.29.1": version: 4.29.1 resolution: "@rollup/rollup-android-arm-eabi@npm:4.29.1" @@ -1960,14 +1991,40 @@ __metadata: languageName: node linkType: hard -"rescript@npm:^11.1.0": - version: 11.1.4 - resolution: "rescript@npm:11.1.4" +"rescript-nodejs@npm:^16.1.0": + version: 16.1.0 + resolution: "rescript-nodejs@npm:16.1.0" + checksum: 10/1470b330f30616e0ec98da41cb36af2b9d009b2f8a93374d1c19687fa0c48cc7fe8ae5d40f5374c0f48098ac38751e60b4e62ba3d89a1b48d216d64fe129c898 + languageName: node + linkType: hard + +"rescript@npm:^12.0.0-beta.4": + version: 12.0.0-beta.4 + resolution: "rescript@npm:12.0.0-beta.4" + dependencies: + "@rescript/darwin-arm64": "npm:12.0.0-beta.4" + "@rescript/darwin-x64": "npm:12.0.0-beta.4" + "@rescript/linux-arm64": "npm:12.0.0-beta.4" + "@rescript/linux-x64": "npm:12.0.0-beta.4" + "@rescript/win32-x64": "npm:12.0.0-beta.4" + dependenciesMeta: + "@rescript/darwin-arm64": + optional: true + "@rescript/darwin-x64": + optional: true + "@rescript/linux-arm64": + optional: true + "@rescript/linux-x64": + optional: true + "@rescript/win32-x64": + optional: true bin: - bsc: bsc - bstracing: lib/bstracing - rescript: rescript - checksum: 10/2ba71cf76e04000afb025afc245aef0d4c1647c73323f325bbc386f562df5a9fdddf137f6031ac7bb59c935c60174156d7a605a05a70adac8bd76dc0795aa6bd + bsc: cli/bsc.js + bstracing: cli/bstracing.js + rescript: cli/rescript.js + rescript-legacy: cli/rescript-legacy.js + rescript-tools: cli/rescript-tools.js + checksum: 10/2dbb8cbd28e774e5039d4bc2bb91b523c1fdf4ab5fedafcb8fa1ee3367044fba422ea67707265c01dc6782b86d2a14c63c34a5c5c2eb43bffb5f9f73505955a1 languageName: node linkType: hard