fix: release scripts

rivet-gg · Jan 22, 2025 · 02d4ab7 · 02d4ab7
1 parent d83ab10
commit 02d4ab7
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 35 deletions.
diff --git a/.github/pkg-pr-new.yaml → .github/workflows/pkg-pr-new.yaml b/.github/pkg-pr-new.yaml → .github/workflows/pkg-pr-new.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -34,10 +34,16 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v4
-
+        with:
+          lfs: 'true'
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: 20
+          cache: "yarn"
+
+      - name: Install dependencies
+        run: yarn install
 
       - name: Setup
         env:
@@ -48,16 +54,13 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-          # Setup Corepack
-          corepack enable
-
           # Install Deno
           curl -fsSL https://deno.land/x/install/install.sh | sh
           export PATH=$HOME/.deno/bin:$PATH
 
           # Authenticate NPM
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-          echo "@rivet-gg:registry=https://registry.npmjs.org/" >> ~/.npmrc
+          yarn config set 'npmRegistries["//registry.npmjs.org"].npmAuthToken' ${{ secrets.NPM_TOKEN }}
+          yarn config set 'npmScopes["@rivet-gg"].npmPublishRegistry' https://registry.npmjs.org/
 
           if [ "${{ inputs.latest }}" = "true" ]; then
               ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --setup

diff --git a/frontend/apps/hub/package.json b/frontend/apps/hub/package.json
@@ -18,8 +18,8 @@
 		"@rivet-gg/actor-client": "workspace:*",
 		"@rivet-gg/actor-common": "workspace:^",
 		"@rivet-gg/actor-protocol": "workspace:*",
-		"@rivet-gg/api": "file:vendor/rivet-gg-api.tgz",
-		"@rivet-gg/api-ee": "file:vendor/rivet-gg-api-ee.tgz",
+		"@rivet-gg/api": "file:./vendor/rivet-gg-api.tgz",
+		"@rivet-gg/api-ee": "file:./vendor/rivet-gg-api-ee.tgz",
 		"@rivet-gg/components": "workspace:*",
 		"@rivet-gg/icons": "workspace:*",
 		"@sentry/react": "^8.26.0",

diff --git a/frontend/packages/icons/.gitignore b/frontend/packages/icons/.gitignore
@@ -1,3 +1,3 @@
 *.gen.*
 src/*
-!src/package.json
+dist
diff --git a/frontend/packages/icons/scripts/postinstall.js b/frontend/packages/icons/scripts/postinstall.js
@@ -13,9 +13,15 @@ const packageExistsOptions = {
 	],
 };
 
+const sourceDir = join(__dirname, "..", "src");
+
+if (!fs.existsSync(sourceDir)){
+    fs.mkdirSync(sourceDir, { recursive: true });
+}
+
 if (process.env.FONTAWESOME_PACKAGE_TOKEN) {
 	fs.writeFileSync(
-		"./src/.yarnrc.yml",
+		join(sourceDir, ".yarnrc.yml"),
 		dedent`
     nodeLinker: node-modules
 
@@ -33,20 +39,30 @@ if (process.env.FONTAWESOME_PACKAGE_TOKEN) {
       `,
 	);
 
-	fs.writeFileSync("./src/yarn.lock", "");
+	fs.writeFileSync(join(sourceDir, "./package.json"), JSON.stringify({
+		"name": "@rivet-gg/internal-icons",
+		"private": true,
+		"dependencies": {
+			"@awesome.me/kit-63db24046b": "^1.0.11",
+			"@fortawesome/pro-regular-svg-icons": "6.6.0",
+			"@fortawesome/pro-solid-svg-icons": "6.6.0"
+		}
+	}));
+
+	fs.writeFileSync(join(sourceDir, "yarn.lock"), "");
 
 	spawnSync(
 		"yarn",
 		["config", "set", "-H", "enableImmutableInstalls", "false"],
 		{
 			stdio: "inherit",
-			cwd: join(process.cwd(), "src"),
+			cwd: sourceDir,
 		},
 	);
 
 	spawnSync("yarn", [], {
 		stdio: "inherit",
-		cwd: join(process.cwd(), "src"),
+		cwd: sourceDir,
 		env: {
 			...process.env,
 			CI: 0,
@@ -77,8 +93,8 @@ let indexTsSource = dedent`
 `;
 
 for (const [pkg, { icons }] of Object.entries(manifest)) {
-	const pkgExists = pkg.includes("pro") ? isPro : true;
 	const isCustom = pkg.startsWith("@awesome.me/kit-");
+	const pkgExists = (pkg.includes("pro") || isCustom) ? isPro : true;
 
 	if (isCustom) {
 		if (!pkgExists) {
@@ -112,14 +128,14 @@ for (const [pkg, { icons }] of Object.entries(manifest)) {
 		}
 	}
 }
-fs.writeFileSync("src/index.gen.ts", `${indexTsSource}`);
+fs.writeFileSync(join(sourceDir, "index.gen.ts"), `${indexTsSource}`);
 
 let iconsPackTsSource = `${banner}\n
 import {type IconPack} from "@fortawesome/fontawesome-common-types";\n`;
 
 for (const [pkg, { icons }] of Object.entries(manifest)) {
-	const pkgExists = pkg.includes("pro") ? isPro : true;
 	const isCustom = pkg.startsWith("@awesome.me/kit-");
+	const pkgExists = (pkg.includes("pro")||isCustom) ? isPro : true;
 
 	if (isCustom) {
 		const iconNames = icons.map(({ icon }) => icon);
@@ -169,20 +185,20 @@ for (const [pkg, { icons }] of Object.entries(manifest)) {
 
 iconsPackTsSource += "} as IconPack;\n";
 
-fs.writeFileSync("src/icons-pack.gen.ts", `${iconsPackTsSource}`);
+fs.writeFileSync(join(__dirname, "../src/icons-pack.gen.ts"), `${iconsPackTsSource}`);
 
 async function build() {
 	await vite.build({
 		plugins: [],
-		root: resolve(__dirname, "./src"),
+		root: resolve(sourceDir),
 		build: {
 			outDir: resolve(__dirname, "../dist"),
 			emptyOutDir: true,
 			minify: true,
 			lib: {
 				name: "icons",
 				entry: {
-					index: resolve(__dirname, "../src/index.gen.ts"),
+					index: resolve(sourceDir, "index.gen.ts"),
 				},
 			},
 			rollupOptions: {

diff --git a/frontend/packages/icons/src/package.json b/frontend/packages/icons/src/package.json
diff --git a/yarn.lock b/yarn.lock
@@ -3096,9 +3096,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rivet-gg/api-ee@file:vendor/rivet-gg-api-ee.tgz::locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub":
+"@rivet-gg/api-ee@file:./vendor/rivet-gg-api-ee.tgz::locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub":
   version: 0.0.1
-  resolution: "@rivet-gg/api-ee@file:vendor/rivet-gg-api-ee.tgz#vendor/rivet-gg-api-ee.tgz::hash=1f46df&locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub"
+  resolution: "@rivet-gg/api-ee@file:./vendor/rivet-gg-api-ee.tgz#./vendor/rivet-gg-api-ee.tgz::hash=1f46df&locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub"
   dependencies:
     form-data: "npm:^4.0.0"
     js-base64: "npm:^3.7.5"
@@ -3109,9 +3109,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rivet-gg/api@file:vendor/rivet-gg-api.tgz::locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub":
+"@rivet-gg/api@file:./vendor/rivet-gg-api.tgz::locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub":
   version: 24.1.0
-  resolution: "@rivet-gg/api@file:vendor/rivet-gg-api.tgz#vendor/rivet-gg-api.tgz::hash=46b44b&locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub"
+  resolution: "@rivet-gg/api@file:./vendor/rivet-gg-api.tgz#./vendor/rivet-gg-api.tgz::hash=46b44b&locator=%40rivet-gg%2Fhub%40workspace%3Afrontend%2Fapps%2Fhub"
   dependencies:
     form-data: "npm:^4.0.0"
     js-base64: "npm:^3.7.5"
@@ -3221,8 +3221,8 @@ __metadata:
     "@rivet-gg/actor-client": "workspace:*"
     "@rivet-gg/actor-common": "workspace:^"
     "@rivet-gg/actor-protocol": "workspace:*"
-    "@rivet-gg/api": "file:vendor/rivet-gg-api.tgz"
-    "@rivet-gg/api-ee": "file:vendor/rivet-gg-api-ee.tgz"
+    "@rivet-gg/api": "file:./vendor/rivet-gg-api.tgz"
+    "@rivet-gg/api-ee": "file:./vendor/rivet-gg-api-ee.tgz"
     "@rivet-gg/components": "workspace:*"
     "@rivet-gg/icons": "workspace:*"
     "@sentry/react": "npm:^8.26.0"