diff --git a/.github/workflows/github-action-acceptance.yaml b/.github/workflows/github-action-acceptance.yaml index 3938af8..f028031 100644 --- a/.github/workflows/github-action-acceptance.yaml +++ b/.github/workflows/github-action-acceptance.yaml @@ -24,5 +24,5 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: yarn - - run: yarn rescript:build + - run: yarn rescript:build:dev # - run: yarn test diff --git a/package.json b/package.json index 810da0d..c9a97e9 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,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\"", @@ -35,7 +36,7 @@ "rescript.json" ], "devDependencies": { - "@greenfinity/rescript-vitest": "^0.1.0", + "@greenfinity/rescript-vitest": "^0.2.0", "@react-email/components": "^0.3.1", "@rescript/react": "^0.14.0-rc.1", "@vitest/coverage-v8": "2.1.8", @@ -43,17 +44,18 @@ "nodemon": "^3.1.7", "react": "^19.0.0", "react-dom": "^19.0.0", - "rescript": "^11.1.0", + "rescript": "^12.0.0-beta.4", "vitest": "^2.1.8" }, "peerDependencies": { "@react-email/components": "^0.3.1", "@rescript/react": "^0.14.0-rc.1", "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "rescript": "^12.0.0-beta.4" }, "peerDevDependencies": { - "@greenfinity/rescript-vitest": "^0.1.0", + "@greenfinity/rescript-vitest": "^0.2.0", "@vitest/coverage-v8": "2.1.8", "vitest": "^2.1.8" }, diff --git a/rescript.json b/rescript.json index 265b74a..39542b4 100644 --- a/rescript.json +++ b/rescript.json @@ -1,7 +1,7 @@ { "name": "@greenfinity/rescript-react-email", "namespace": false, - "bsc-flags": ["-bs-no-version-header", "-bs-super-errors"], + "compiler-flags": ["-bs-no-version-header"], "suffix": ".bs.mjs", "package-specs": { "module": "esmodule", @@ -16,5 +16,5 @@ "number": "-44", "error": "+101" }, - "bs-dependencies": ["@rescript/react"] + "dependencies": ["@rescript/react"] } diff --git a/src/ReactEmail.res b/src/ReactEmail.res index e5ed588..d352e23 100644 --- a/src/ReactEmail.res +++ b/src/ReactEmail.res @@ -38,7 +38,7 @@ module Tailwind = { } module Heading = { - type headingAs = @string [#h1 | #h2 | #h3 | #h4 | #h5 | #h6] + type headingAs = [#h1 | #h2 | #h3 | #h4 | #h5 | #h6] @react.component @module("@react-email/heading") external make: ( ~id: string=?, diff --git a/vitest.config.mjs b/vitest.config.mjs index dcceb9b..65609e3 100644 --- a/vitest.config.mjs +++ b/vitest.config.mjs @@ -6,6 +6,7 @@ const projectRootPath = path.resolve("."); export default defineConfig({ test: { include: ["**/__tests__/**/*_vitest.bs.mjs"], + exclude: ["**/lib/bs/**/*"], globals: true, reporters: "verbose", environment: "jsdom", diff --git a/yarn.lock b/yarn.lock index 462aa76..91da1f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -281,7 +281,7 @@ __metadata: version: 0.0.0-use.local resolution: "@greenfinity/rescript-react-email@workspace:." dependencies: - "@greenfinity/rescript-vitest": "npm:^0.1.0" + "@greenfinity/rescript-vitest": "npm:^0.2.0" "@react-email/components": "npm:^0.3.1" "@rescript/react": "npm:^0.14.0-rc.1" "@vitest/coverage-v8": "npm:2.1.8" @@ -289,24 +289,27 @@ __metadata: nodemon: "npm:^3.1.7" react: "npm:^19.0.0" react-dom: "npm:^19.0.0" - rescript: "npm:^11.1.0" + rescript: "npm:^12.0.0-beta.4" vitest: "npm:^2.1.8" peerDependencies: "@react-email/components": ^0.3.1 "@rescript/react": ^0.14.0-rc.1 react: ^19.0.0 react-dom: ^19.0.0 + rescript: ^12.0.0-beta.4 languageName: unknown linkType: soft -"@greenfinity/rescript-vitest@npm:^0.1.0": - version: 0.1.2 - resolution: "@greenfinity/rescript-vitest@npm:0.1.2" +"@greenfinity/rescript-vitest@npm:^0.2.0": + version: 0.2.0 + resolution: "@greenfinity/rescript-vitest@npm:0.2.0" dependencies: "@vitest/coverage-v8": "npm:^2.1.8" jsdom: "npm:^25.0.1" vitest: "npm:^2.1.8" - checksum: 10/20bdacc7ca0b0e53a4e46c2102291cc636517e2fbef011472fe4bdbf844340bd5ef7f46cb612e661e52de725fa451ae89721c2de2094890da3fa2c0714fb05c3 + peerDependencies: + rescript: ^12.0.0-beta.4 + checksum: 10/ed97513735fc1a936def1faf66a0b33372ff8af6cdeaeb0fcf7f88d7d6c4d7bca6620af14029c9add494d346aba7cc803184317d74344abf30debef72a9a41ab languageName: node linkType: hard @@ -622,6 +625,34 @@ __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/react@npm:^0.14.0-rc.1": version: 0.14.0-rc.1 resolution: "@rescript/react@npm:0.14.0-rc.1" @@ -632,6 +663,13 @@ __metadata: 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.45.0": version: 4.45.0 resolution: "@rollup/rollup-android-arm-eabi@npm:4.45.0" @@ -2495,14 +2533,33 @@ __metadata: languageName: node linkType: hard -"rescript@npm:^11.1.0": - version: 11.1.4 - resolution: "rescript@npm:11.1.4" +"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