create-conformal 0.3.4 → 0.4.0

package/CHANGELOG.md

@@ -0,0 +1,15 @@
+# create-conformal
+
+## 0.4.0
+
+### Minor Changes
+
+- 07e7800: Default to Rust 2024 edition
+- 07e7800: Use workspace to control edition
+
+### Patch Changes
+
+- 07e7800: Lock rust version in bootstrap github action
+- Updated dependencies [07e7800]
+- Updated dependencies [07e7800]
+  - @conformal/create-plugin@0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-conformal",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Project generator script for conformal projects",
   "homepage": "https://russellmcc.github.io/conformal",
   "bugs": "https://github.com/russellmcc/conformal/issues",
@@ -14,8 +14,8 @@
   "bin": "./src/index.ts",
   "type": "module",
   "dependencies": {
-    "@conformal/stamp": "^0.3.4",
-    "@conformal/create-plugin": "^0.3.4",
+    "@conformal/stamp": "workspace:^0.3.5",
+    "@conformal/create-plugin": "workspace:^0.4.0",
     "@commander-js/extra-typings": "^12.1.0",
     "commander": "^12.1.0"
   }

package/package.json.bak

@@ -1,6 +1,6 @@
 {
   "name": "create-conformal",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Project generator script for conformal projects",
   "homepage": "https://russellmcc.github.io/conformal",
   "bugs": "https://github.com/russellmcc/conformal/issues",
@@ -14,8 +14,8 @@
   "bin": "./src/index.ts",
   "type": "module",
   "dependencies": {
-    "@conformal/stamp": "^0.3.4",
-    "@conformal/create-plugin": "^0.3.4",
+    "@conformal/stamp": "workspace:^0.3.5",
+    "@conformal/create-plugin": "workspace:^0.4.0",
     "@commander-js/extra-typings": "^12.1.0",
     "commander": "^12.1.0"
   }

package/src/config.ts

@@ -2,7 +2,6 @@ import { ConfigMetadata, stampTemplate } from "@conformal/stamp";
 import {
   Config as PlugConfig,
   metadatas as plugMetadatas,
-  toEnv,
   toTemplate,
   postBuild as plugPostBuild,
 } from "@conformal/create-plugin";
@@ -23,8 +22,11 @@ export const metadatas: Record<keyof Config, ConfigMetadata> = {
   },
 };
 
-export const postBuild = async (config: Config, root?: string) => {
-  const env = await toEnv(config);
+export const postBuild = async (
+  config: Config,
+  env: Record<string, string>,
+  root?: string,
+) => {
   const template = await toTemplate(config);
   const dest =
     root === undefined ? config.proj_slug : path.join(root, config.proj_slug);

package/src/template.test.ts

@@ -34,8 +34,13 @@ describe("create-conformal template", () => {
           const rewireDeps = async (dest: string) => {
             // Note we use perl as a sed replacement because of https://github.com/oven-sh/bun/issues/13197,
             // which makes sed unusable on macOS.
-            const perl_command = `s!"\\@conformal/([^"]+)": "workspace:\\*"!"\\@conformal/$1": "file://${tmpDir}/conformal-$1-0.0.0.tgz"!`;
+            const perl_command = `s!"\\@conformal/([^"]+)": "[^"]+"!"\\@conformal/$1": "file://${tmpDir}/conformal-$1-0.0.0.tgz"!`;
             await $`perl -pi -e ${perl_command} package.json`.cwd(dest);
+
+            // Replace the version with 0.0.0
+            await $`perl -pi -e 's!"version": "[^"]+"!"version": "0.0.0"!' package.json`.cwd(
+              dest,
+            );
           };
 
           // Note that bun skips dependencies when installing packages from local paths :'(,
@@ -51,7 +56,17 @@ describe("create-conformal template", () => {
             await $`npm pack --pack-destination=${tmpDir}`.cwd(
               path.join(workspacePath, "web", dep),
             );
-            const tgzPath = path.join(tmpDir, `conformal-${dep}-0.0.0.tgz`);
+            const tgzGlob = new Bun.Glob(`conformal-${dep}-*.tgz`);
+            let tgzPath: string | undefined;
+            for await (const tgzPathCandidate of tgzGlob.scan(tmpDir)) {
+              if (tgzPath !== undefined) {
+                throw new Error(`Found multiple tarballs for ${dep}`);
+              }
+              tgzPath = path.join(tmpDir, tgzPathCandidate);
+            }
+            if (tgzPath === undefined) {
+              throw new Error(`No tarball found for ${dep}`);
+            }
             expect(Bun.file(tgzPath).exists()).resolves.toBe(true);
 
             // Extract the tarball to a sub-directory of tmpDir
@@ -83,19 +98,25 @@ describe("create-conformal template", () => {
             await unlink(tgzPath);
             // Re-pack the tarball
             await $`npm pack --pack-destination=${tmpDir}`.cwd(extractDir);
-            expect(Bun.file(tgzPath).exists()).resolves.toBe(true);
+
+            const rewiredTgzPath = path.join(
+              tmpDir,
+              `conformal-${dep}-0.0.0.tgz`,
+            );
+            expect(Bun.file(rewiredTgzPath).exists()).resolves.toBe(true);
 
             await rm(extractDir, { recursive: true });
           }
 
           // stamp the template
           const dest = path.join(tmpDir, TEST_CONFIG.proj_slug);
+          const env = await toEnv(TEST_CONFIG, { rustVersionMode: "mock" });
           await stampTemplate(
             dest,
             path.join(workspacePath, "web", "create", "template"),
-            await toEnv(TEST_CONFIG),
+            env,
           );
-          await postBuild(TEST_CONFIG, tmpDir);
+          await postBuild(TEST_CONFIG, env, tmpDir);
 
           await rewireDeps(dest);
 
@@ -116,7 +137,7 @@ describe("create-conformal template", () => {
           const createDependencies = ["component", "vst_wrapper", "poly"];
           for (const dep of createDependencies) {
             const crateVersion = `{ path = "${path.join(workspacePath, "rust", dep.replace("_", "-"))}" }`;
-            await $`find rust -type f -exec perl -pi -e 's!conformal_${dep} = "0.0.0"!conformal_${dep} = ${crateVersion}!' {} +`.cwd(
+            await $`find rust -type f -exec perl -pi -e 's!conformal_${dep} = "[^"]+"!conformal_${dep} = ${crateVersion}!' {} +`.cwd(
               dest,
             );
           }

package/template/.github/actions/bootstrap/action.yml

@@ -7,5 +7,5 @@ runs:
       shell: bash
     - run: bun install --frozen-lockfile
       shell: bash
-    - run: bun run bootstrap
+    - run: bun run bootstrap --rust-version 1.85.0
       shell: bash

package/template/Cargo.toml

@@ -3,7 +3,8 @@ resolver = "2"
 members = []
 
 [workspace.package]
-rust-version = "1.84.1"
+rust-version = "1.85.0"
+edition = "2024"
 
 [workspace.lints.rust]
 nonstandard_style = "warn"

package/template/package.json

@@ -31,7 +31,7 @@
     "@vitejs/plugin-react-swc": "^3.6.0",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-plugin-prefer-arrow-functions": "^3.3.2",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -41,8 +41,8 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.9",
-    "@conformal/scripts": "^0.3.4",
-    "@conformal/plugin": "^0.3.4",
+    "@conformal/scripts": "^0.3.5",
+    "@conformal/plugin": "^0.3.5",
     "rollup-plugin-license": "^3.4.0"
   }
 }