diff --git a/package-lock.json b/package-lock.json index 10d7e06..046c88c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,19 @@ { "name": "create-rescript-app", - "version": "1.7.0", + "version": "1.7.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "create-rescript-app", - "version": "1.7.0", + "version": "1.7.1", "license": "ISC", "bin": { "create-rescript-app": "out/create-rescript-app.mjs" }, "devDependencies": { "@clack/prompts": "0.7.0", - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", @@ -120,12 +120,12 @@ } }, "node_modules/@rescript/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.2.0.tgz", - "integrity": "sha512-/crGFHKPGeCCrwkVZQ0ugJZxjh79pT5nIPdlfITwiQvO4FoxwnABRiHWiJ7bi2H0RiU1KRrUtVwA5CQV4hJVnQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.3.0.tgz", + "integrity": "sha512-wNZOZ63sYcaIYZCmTZeIPCeLa3HCGgPbIOR8zjyNkoBYUlxNV8Nb2ZyqlXR5Mb9ttvv8fTV56JbKhyVEZEYo8g==", "dev": true, "peerDependencies": { - "rescript": ">=11.0.0 || ^11.1.0-rc.2" + "rescript": "^11.1.0-rc.7" } }, "node_modules/@rollup/plugin-commonjs": { diff --git a/package.json b/package.json index 291703f..2bd3516 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "create-rescript-app", - "version": "1.7.0", + "version": "1.7.1", "description": "Quickly create new ReScript apps from project templates.", "main": "out/create-rescript-app.mjs", "scripts": { @@ -37,7 +37,7 @@ }, "devDependencies": { "@clack/prompts": "0.7.0", - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", diff --git a/src/RescriptVersions.res b/src/RescriptVersions.res index ac00a3f..ce7a0a4 100644 --- a/src/RescriptVersions.res +++ b/src/RescriptVersions.res @@ -23,6 +23,15 @@ let getPackageVersions = async (packageName, range) => { versions } +let getCompatibleRescriptCoreVersions = (~rescriptVersion, ~rescriptCoreVersions) => + if CompareVersions.compareVersions(rescriptVersion, "11.1.0")->Ordering.isLess { + rescriptCoreVersions->Array.filter(coreVersion => + CompareVersions.compareVersions(coreVersion, "1.3.0")->Ordering.isLess + ) + } else { + rescriptCoreVersions + } + let promptVersions = async () => { let s = P.spinner() @@ -44,6 +53,11 @@ let promptVersions = async () => { })->P.resultOrRaise } + let rescriptCoreVersions = getCompatibleRescriptCoreVersions( + ~rescriptVersion, + ~rescriptCoreVersions, + ) + let rescriptCoreVersion = switch rescriptCoreVersions { | [version] => version | _ => diff --git a/templates/rescript-template-basic/package.json b/templates/rescript-template-basic/package.json index 1f0dc42..fc86171 100644 --- a/templates/rescript-template-basic/package.json +++ b/templates/rescript-template-basic/package.json @@ -12,7 +12,7 @@ "author": "", "license": "MIT", "dependencies": { - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "rescript": "^11.1.0" } } diff --git a/templates/rescript-template-nextjs/package-lock.json b/templates/rescript-template-nextjs/package-lock.json index 6a387e6..2d26ac9 100644 --- a/templates/rescript-template-nextjs/package-lock.json +++ b/templates/rescript-template-nextjs/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "license": "Apache-2.0", "dependencies": { - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rescript/react": "^0.12.1", "next": "^14.0.4", "react": "^18.2.0", @@ -260,11 +260,11 @@ } }, "node_modules/@rescript/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.2.0.tgz", - "integrity": "sha512-/crGFHKPGeCCrwkVZQ0ugJZxjh79pT5nIPdlfITwiQvO4FoxwnABRiHWiJ7bi2H0RiU1KRrUtVwA5CQV4hJVnQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.3.0.tgz", + "integrity": "sha512-wNZOZ63sYcaIYZCmTZeIPCeLa3HCGgPbIOR8zjyNkoBYUlxNV8Nb2ZyqlXR5Mb9ttvv8fTV56JbKhyVEZEYo8g==", "peerDependencies": { - "rescript": ">=11.0.0 || ^11.1.0-rc.2" + "rescript": "^11.1.0-rc.7" } }, "node_modules/@rescript/react": { @@ -2416,9 +2416,9 @@ } }, "@rescript/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.2.0.tgz", - "integrity": "sha512-/crGFHKPGeCCrwkVZQ0ugJZxjh79pT5nIPdlfITwiQvO4FoxwnABRiHWiJ7bi2H0RiU1KRrUtVwA5CQV4hJVnQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.3.0.tgz", + "integrity": "sha512-wNZOZ63sYcaIYZCmTZeIPCeLa3HCGgPbIOR8zjyNkoBYUlxNV8Nb2ZyqlXR5Mb9ttvv8fTV56JbKhyVEZEYo8g==", "requires": {} }, "@rescript/react": { diff --git a/templates/rescript-template-nextjs/package.json b/templates/rescript-template-nextjs/package.json index 027af17..781ad3d 100644 --- a/templates/rescript-template-nextjs/package.json +++ b/templates/rescript-template-nextjs/package.json @@ -4,7 +4,7 @@ "author": "Patrick Ecker ", "license": "Apache-2.0", "dependencies": { - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rescript/react": "^0.12.1", "next": "^14.0.4", "react": "^18.2.0", diff --git a/templates/rescript-template-vite/package-lock.json b/templates/rescript-template-vite/package-lock.json index ecb9a2c..a6f561a 100644 --- a/templates/rescript-template-vite/package-lock.json +++ b/templates/rescript-template-vite/package-lock.json @@ -8,7 +8,7 @@ "name": "rescript-template-vite", "version": "0.0.0", "dependencies": { - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rescript/react": "^0.12.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -854,11 +854,11 @@ } }, "node_modules/@rescript/core": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.2.0.tgz", - "integrity": "sha512-/crGFHKPGeCCrwkVZQ0ugJZxjh79pT5nIPdlfITwiQvO4FoxwnABRiHWiJ7bi2H0RiU1KRrUtVwA5CQV4hJVnQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@rescript/core/-/core-1.3.0.tgz", + "integrity": "sha512-wNZOZ63sYcaIYZCmTZeIPCeLa3HCGgPbIOR8zjyNkoBYUlxNV8Nb2ZyqlXR5Mb9ttvv8fTV56JbKhyVEZEYo8g==", "peerDependencies": { - "rescript": ">=11.0.0 || ^11.1.0-rc.2" + "rescript": "^11.1.0-rc.7" } }, "node_modules/@rescript/react": { diff --git a/templates/rescript-template-vite/package.json b/templates/rescript-template-vite/package.json index 1052b55..d5b9ea2 100644 --- a/templates/rescript-template-vite/package.json +++ b/templates/rescript-template-vite/package.json @@ -12,7 +12,7 @@ "preview": "vite preview" }, "dependencies": { - "@rescript/core": "^1.2.0", + "@rescript/core": "^1.3.0", "@rescript/react": "^0.12.1", "react": "^18.2.0", "react-dom": "^18.2.0",