Skip to content

Commit

Permalink
build: move back to pnpm workspaces, fix macOS sync issue
Browse files Browse the repository at this point in the history
Moves back to pnpm workspaces, dependencies are installed similarly to
yarn with node-linker set to node-modules.

Created a default.project.json file in the root directory with a
different structure, as Rojo is currently not able to detect changes at
relative paths on macOS.
  • Loading branch information
paradoxuum committed Dec 22, 2024
1 parent a5133dc commit df95da2
Show file tree
Hide file tree
Showing 21 changed files with 6,343 additions and 9,294 deletions.
31 changes: 0 additions & 31 deletions .github/scripts/publish.mjs

This file was deleted.

71 changes: 0 additions & 71 deletions .github/scripts/util.mjs

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "yarn"
cache: "pnpm"

- name: Install dependencies
run: yarn install
run: pnpm install

- name: Build website
run: yarn workspace docs build
run: pnpm --filter docs build
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "yarn"
cache: "pnpm"

- name: Install dependencies
run: yarn install
run: pnpm install

- name: Run Biome
run: yarn biome ci
run: pnpm biome ci

- name: Build project
run: yarn packages:build
run: pnpm packages:build
45 changes: 0 additions & 45 deletions .github/workflows/publish.yml

This file was deleted.

13 changes: 1 addition & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,5 @@ include/
dist/
.astro/

# Yarn
.yarn/*
!.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn-debug.log*
yarn-error.log*

# macOS-specific files
.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node-linker=hoisted
node-linker=node-modules
provenance=true
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.5.0.cjs

This file was deleted.

5 changes: 0 additions & 5 deletions .yarnrc.yml

This file was deleted.

12 changes: 12 additions & 0 deletions .zed/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Folder-specific settings
//
// For a full list of overridable settings, and general information on folder-specific settings,
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
{
"formatter": {
"language_server": {
"name": "biome"
}
},
"hard_tabs": true
}
66 changes: 66 additions & 0 deletions default.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"name": "centurion",
"globIgnorePaths": [
"**/package.json",
"**/tsconfig.json",
"**/*/@rbxts/centurion"
],
"tree": {
"$className": "DataModel",
"ReplicatedStorage": {
"$className": "ReplicatedStorage",
"rbxts_include": {
"$path": "test/include",
"node_modules": {
"$className": "Folder",
"@rbxts": {
"$path": "packages/core/node_modules/@rbxts",
"centurion": {
"$className": "Folder",
"out": {
"$path": "packages/core/out"
}
},
"centurion-ui": {
"$className": "Folder",
"out": {
"$path": "packages/ui/out"
},
"node_modules": {
"$className": "Folder",
"@rbxts": {
"$path": "packages/ui/node_modules/@rbxts"
}
}
}
}
}
},
"TS": {
"$path": "test/out/shared"
}
},
"ServerScriptService": {
"$className": "ServerScriptService",
"TS": {
"$path": "test/out/server"
}
},
"StarterPlayer": {
"$className": "StarterPlayer",
"StarterPlayerScripts": {
"$className": "StarterPlayerScripts",
"TS": {
"$path": "test/out/client"
}
}
},
"TestService": {
"$className": "TestService",
"$properties": {
"ExecuteWithStudioRun": true
},
"$path": "test/out/test"
}
}
}
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/starlight": "^0.28.6",
"@astrojs/starlight": "^0.30.3",
"@fontsource-variable/jetbrains-mono": "^5.1.1",
"@lorenzo_lewis/starlight-utils": "^0.2.0",
"astro": "^4.16.14",
"astro": "^5.1.1",
"sharp": "^0.33.5",
"starlight-links-validator": "^0.13.2",
"typescript": "^5.6.3"
"starlight-links-validator": "^0.14.1",
"typescript": "^5.7.2"
},
"devDependencies": {
"sass": "^1.81.0"
"sass": "^1.83.0"
}
}
2 changes: 1 addition & 1 deletion lefthook.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[pre-commit.commands.lint]
run = "yarn biome check --write --unsafe"
run = "pnpm biome check --write --unsafe"
glob = "*.{ts,tsx,toml,json}"
stage_fixed = true
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"name": "centurion",
"private": true,
"packageManager": "[email protected]",
"workspaces": [
"packages/*",
"docs",
"test"
],
"scripts": {
"packages:build": "yarn workspaces foreach -R --from \"{@rbxts/centurion,@rbxts/centurion-ui}\" run build",
"core:build": "yarn workspace @rbxts/centurion build",
"core:dev": "yarn workspace @rbxts/centurion dev",
"ui:build": "yarn workspace @rbxts/centurion-ui build",
"ui:dev": "yarn workspace @rbxts/centurion-ui dev",
"test:build": "yarn workspace test build",
"test:dev": "yarn workspace test dev",
"test:serve": "yarn workspace test serve"
},
"devDependencies": {
"@biomejs/biome": "1.9.0",
"lefthook": "^1.8.4"
}
"name": "centurion",
"private": true,
"packageManager": "[email protected]",
"workspaces": [
"packages/*",
"docs",
"test"
],
"scripts": {
"packages:build": "pnpm --filter \"./packages/**\" build",
"core:build": "pnpm --filter @rbxts/centurion build",
"core:dev": "pnpm --filter @rbxts/centurion dev",
"ui:build": "pnpm --filter @rbxts/centurion-ui build",
"ui:dev": "pnpm --filter @rbxts/centurion-ui dev",
"test:build": "pnpm --filter test build",
"test:dev": "pnpm --filter test dev",
"serve": "rojo serve"
},
"devDependencies": {
"@biomejs/biome": "1.9.0",
"lefthook": "^1.10.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"access": "public"
},
"scripts": {
"prepack": "yarn build",
"prepack": "pnpm build",
"build": "shx rm -rf out && rbxtsc --verbose",
"dev": "shx rm -rf out && rbxtsc -w"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"access": "public"
},
"scripts": {
"prepack": "yarn build",
"prepack": "pnpm build",
"build": "shx rm -rf out && rbxtsc --verbose",
"dev": "shx rm -rf out && rbxtsc -w"
},
Expand All @@ -42,7 +42,7 @@
"dependencies": {
"@rbxts/services": "^1.5.5",
"@rbxts/set-timeout": "^1.1.2",
"@rbxts/vide": "^0.5.0"
"@rbxts/vide": "^0.5.3"
},
"peerDependencies": {
"@rbxts/centurion": "workspace:^"
Expand Down
Loading

0 comments on commit df95da2

Please sign in to comment.