Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
# Only need a cache hit or miss,
# cached dependencies aren't used until following jobs
Expand All @@ -38,8 +38,8 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
key: ${{ runner.os }}-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true
Expand All @@ -55,10 +55,10 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ steps.restore-build-cache.outputs.cache-primary-key }}
2 changes: 1 addition & 1 deletion .github/workflows/ci-salt.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
In CI, the contents of this file are hashed to save and restore dependencies between workflows.
Change anything here to force a cache miss even if repo-state.json hasn't changed.
2026-06-26T05:20:40.660Z
2026-06-30T08:38:56.477Z
18 changes: 9 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true

- name: Configure Discord Secrets
run: (cd discord && ./client_config_ci.sh)
run: (cd projects/discord && ./client_config_ci.sh)
env:
# Repository-level secrets
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
Expand All @@ -52,7 +52,7 @@ jobs:

# FIXME: support new deployment target
# - name: Configure Deploy Secrets
# run: (cd deploy && ./client_config_ci.sh)
# run: (cd projects/deploy && ./client_config_ci.sh)
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -65,7 +65,7 @@ jobs:
# - name: Upload Deployment Artifacts
# # Artifacts are uploaded via aws s3 but could also be done with https://github.com/actions/upload-artifact
# # Downloading artifacts to new instances is already convenient via aws credentials and cli
# run: (cd deploy && npm run upload ${{ inputs.environment }})
# run: (cd projects/deploy && npm run upload ${{ inputs.environment }})

# - name: Deploy
# run: (cd deploy && npm start ${{ inputs.environment }})
# run: (cd projects/deploy && npm start ${{ inputs.environment }})
12 changes: 6 additions & 6 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true

- name: Configure Discord Secrets
run: (cd discord && ./client_config_ci.sh)
run: (cd projects/discord && ./client_config_ci.sh)
env:
# Repository-level secrets
DISCORD_CLIENT_ID: ${{ secrets.DISCORD_CLIENT_ID }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
key: ${{ runner.os }}-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
# Only need a cache hit or miss,
Expand All @@ -39,7 +39,7 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
14 changes: 7 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true

- name: Configure Discord Secrets
run: (cd discord && ./client_config_ci.sh)
run: (cd projects/discord && ./client_config_ci.sh)
env:
# Any values will do, discord application does not run during this job
DISCORD_CLIENT_ID: fake_discord_client_id
Expand All @@ -40,7 +40,7 @@ jobs:
DISCORD_REDIRECT_URI: fake_discord_redirect_uri

- name: Configure Deploy Secrets
run: (cd deploy && ./client_config_ci.sh)
run: (cd projects/deploy && ./client_config_ci.sh)
env:
# Any values will do, deploy application does not run during this job
AWS_ACCESS_KEY_ID: fake_aws_access_key_id
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/type-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true

- name: Configure Discord Secrets
run: (cd discord && ./client_config_ci.sh)
run: (cd projects/discord && ./client_config_ci.sh)
env:
# Any values will do, discord application does not run during this job
DISCORD_CLIENT_ID: fake_discord_client_id
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
with:
path: |
common/temp
*/.rush/temp
*/node_modules
projects/*/.rush/temp
projects/*/node_modules
~/.cache/Cypress
*/dist
client/lib
components/lib
projects/*/dist
projects/client/lib
projects/components/lib
key: ${{ runner.os }}-build-${{ hashFiles('common/config/rush/repo-state.json', 'common/config/rush/pnpm-config.json', 'rush.json', '.github/workflows/ci-salt.txt') }}
fail-on-cache-miss: true

- name: Configure Discord Secrets
run: (cd discord && ./client_config_ci.sh)
run: (cd projects/discord && ./client_config_ci.sh)
env:
# Any values will do, discord application does not run during this job
DISCORD_CLIENT_ID: fake_discord_client_id
Expand Down
20 changes: 4 additions & 16 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
{
"eslint.workingDirectories": [
"client",
"components",
"deploy",
"discord",
"eslint-config-jest",
"eslint-config-node",
"eslint-config-react",
"eslint-config-typescript",
"eslint-config",
"jest-stdout-reporter",
"markdownlint-config",
"scaffold",
"typescript"
"projects/*"

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nesting projects under new directory makes it more convenient to define working directories via glob

],
"files.associations": {
"rush.json": "jsonc",
"command-line.json": "jsonc",
"common-versions.json": "jsonc"
"common-versions.json": "jsonc",
"rush.json": "jsonc"
}
}
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ git commit -m 'build: update rush from x to y'
(with Homebrew: `brew install jq`)

[--reject]: https://www.npmjs.com/package/npm-check-updates#reject
[@trshcmpctr/scaffold]: ./scaffold
[@trshcmpctr/scaffold]: ./projects/scaffold
[command-line.json]: ./common/config/rush/command-line.json
[common/scripts]: ./common/scripts
[npm-check-updates]: https://www.npmjs.com/package/npm-check-updates
Expand Down
2 changes: 1 addition & 1 deletion common/autoinstallers/rush-lint-staged/.lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"*.{cjs,js,jsx,mjs,ts,tsx}": "eslint --flag v10_config_lookup_from_file --max-warnings 0 --no-warn-ignored",
"package.json": "sort-package-json",
"*.md": "markdownlint-cli2 --config markdownlint-config/src/.markdownlint-cli2.jsonc --no-globs --fix"
"*.md": "markdownlint-cli2 --config projects/markdownlint-config/src/.markdownlint-cli2.jsonc --no-globs --fix"
}
6 changes: 3 additions & 3 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"name": "scaffold",
"summary": "Generate a new project from a template",
"commandKind": "global",
"shellCommand": "node common/scripts/install-run.js plop@4.0.1 plop --plopfile scaffold/src/index.js"
"shellCommand": "node projects/scaffold/src/index.js"
},
{
"name": "test",
Expand Down Expand Up @@ -71,14 +71,14 @@
"summary": "Upgrade dependencies in all projects to the latest version not already satisfied by the semver range. Run after `update-minor`. You must run `rush update` after.",
"commandKind": "global",
"autoinstallerName": "rush-check-updates",
"shellCommand": "npm-check-updates --packageFile {$(rush list --json | jq --raw-output '.projects | map(.path) | join(\",\")')}/package.json --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-major.json && npm-check-updates --packageFile scaffold/src/templates/package.json.hbs --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-major.json"
"shellCommand": "npm-check-updates --packageFile {$(rush list --json | jq --raw-output '.projects | map(.path) | join(\",\")')}/package.json --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-major.json && npm-check-updates --packageFile projects/scaffold/src/templates/package.json.hbs --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-major.json"
},
{
"name": "update-minor",
"summary": "Upgrade dependencies in all projects to the latest minor version not already satisfied by semver range. Run after `rush update --full`. You must run `rush update` after.",
"commandKind": "global",
"autoinstallerName": "rush-check-updates",
"shellCommand": "npm-check-updates --packageFile {$(rush list --json | jq --raw-output '.projects | map(.path) | join(\",\")')}/package.json --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-minor.json && npm-check-updates --packageFile scaffold/src/templates/package.json.hbs --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-minor.json"
"shellCommand": "npm-check-updates --packageFile {$(rush list --json | jq --raw-output '.projects | map(.path) | join(\",\")')}/package.json --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-minor.json && npm-check-updates --packageFile projects/scaffold/src/templates/package.json.hbs --configFilePath common/autoinstallers/rush-check-updates/ --configFileName .ncurc.update-minor.json"
},
{
"name": "update-rush-check-updates",
Expand Down
Loading