Skip to content

Commit 0dfc25e

Browse files
nicholaschiangnicholaschiang
committed
refactor: create separate directories for UIs
I will now have multiple UIs to interact with the same underlying data. I figured keeping everything in a monorepo would be better for now. If I need to break out into separate repositories, I will do so in the future.
1 parent 3fae646 commit 0dfc25e

File tree

830 files changed

+89
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

830 files changed

+89
-28
lines changed

‎.github/workflows/deploy.yml

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
pull_request:
88
merge_group:
99

10+
defaults:
11+
run:
12+
working-directory: ./remix-ui
13+
1014
jobs:
1115
lint:
1216
name: ESLint
@@ -17,14 +21,21 @@ jobs:
1721

1822
- name: Checkout repo
1923
uses: actions/checkout@v3
20-
24+
25+
- name: Get package manager version
26+
id: get-pnpm-version
27+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
28+
2129
- name: Setup pnpm
22-
uses: pnpm/action-setup@v2
30+
uses: pnpm/action-setup@v4
31+
with:
32+
version: ${{ steps.get-pnpm-version.outputs.version }}
2333

2434
- name: Setup node
25-
uses: actions/setup-node@v3
35+
uses: actions/setup-node@v4
2636
with:
27-
node-version-file: package.json
37+
node-version-file: remix-ui/package.json
38+
cache-dependency-path: remix-ui/pnpm-lock.yaml
2839
cache: pnpm
2940

3041
- name: Download deps
@@ -52,13 +63,20 @@ jobs:
5263
- name: Checkout repo
5364
uses: actions/checkout@v3
5465

66+
- name: Get package manager version
67+
id: get-pnpm-version
68+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
69+
5570
- name: Setup pnpm
56-
uses: pnpm/action-setup@v2
71+
uses: pnpm/action-setup@v4
72+
with:
73+
version: ${{ steps.get-pnpm-version.outputs.version }}
5774

5875
- name: Setup node
59-
uses: actions/setup-node@v3
76+
uses: actions/setup-node@v4
6077
with:
61-
node-version-file: package.json
78+
node-version-file: remix-ui/package.json
79+
cache-dependency-path: remix-ui/pnpm-lock.yaml
6280
cache: pnpm
6381

6482
- name: Download deps
@@ -80,13 +98,20 @@ jobs:
8098
- name: Checkout repo
8199
uses: actions/checkout@v3
82100

101+
- name: Get package manager version
102+
id: get-pnpm-version
103+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
104+
83105
- name: Setup pnpm
84-
uses: pnpm/action-setup@v2
106+
uses: pnpm/action-setup@v4
107+
with:
108+
version: ${{ steps.get-pnpm-version.outputs.version }}
85109

86110
- name: Setup node
87-
uses: actions/setup-node@v3
111+
uses: actions/setup-node@v4
88112
with:
89-
node-version-file: package.json
113+
node-version-file: remix-ui/package.json
114+
cache-dependency-path: remix-ui/pnpm-lock.yaml
90115
cache: pnpm
91116

92117
- name: Download deps
@@ -107,20 +132,27 @@ jobs:
107132
- name: Checkout repo
108133
uses: actions/checkout@v3
109134

135+
- name: Get package manager version
136+
id: get-pnpm-version
137+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
138+
110139
- name: Setup pnpm
111-
uses: pnpm/action-setup@v2
140+
uses: pnpm/action-setup@v4
141+
with:
142+
version: ${{ steps.get-pnpm-version.outputs.version }}
112143

113144
- name: Setup node
114-
uses: actions/setup-node@v3
145+
uses: actions/setup-node@v4
115146
with:
116-
node-version-file: package.json
147+
node-version-file: remix-ui/package.json
148+
cache-dependency-path: remix-ui/pnpm-lock.yaml
117149
cache: pnpm
118150

119151
- name: Cache cypress binary
120152
uses: actions/cache@v4
121153
with:
122154
path: ~/.cache/Cypress
123-
key: cypress-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
155+
key: cypress-${{ runner.os }}-${{ hashFiles('remix-ui/pnpm-lock.yaml') }}
124156

125157
- name: Download deps
126158
run: pnpm install --frozen-lockfile

‎.github/workflows/migrate.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches:
55
- main
66

7+
defaults:
8+
run:
9+
working-directory: ./remix-ui
10+
711
jobs:
812
deploy:
913
name: Deploy
@@ -12,13 +16,20 @@ jobs:
1216
- name: Checkout repo
1317
uses: actions/checkout@v3
1418

19+
- name: Get package manager version
20+
id: get-pnpm-version
21+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
22+
1523
- name: Setup pnpm
16-
uses: pnpm/action-setup@v2
24+
uses: pnpm/action-setup@v4
25+
with:
26+
version: ${{ steps.get-pnpm-version.outputs.version }}
1727

1828
- name: Setup node
19-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
2030
with:
21-
node-version-file: package.json
31+
node-version-file: remix-ui/package.json
32+
cache-dependency-path: remix-ui/pnpm-lock.yaml
2233
cache: pnpm
2334

2435
- name: Download deps

‎.github/workflows/release.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on:
1313
- main
1414
- '*.x'
1515

16+
defaults:
17+
run:
18+
working-directory: ./remix-ui
19+
1620
concurrency:
1721
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
1822
cancel-in-progress: true
@@ -34,13 +38,20 @@ jobs:
3438
with:
3539
fetch-depth: 0
3640

41+
- name: Get package manager version
42+
id: get-pnpm-version
43+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
44+
3745
- name: Setup pnpm
38-
uses: pnpm/action-setup@v2
46+
uses: pnpm/action-setup@v4
47+
with:
48+
version: ${{ steps.get-pnpm-version.outputs.version }}
3949

4050
- name: Setup node
41-
uses: actions/setup-node@v3
51+
uses: actions/setup-node@v4
4252
with:
43-
node-version-file: package.json
53+
node-version-file: remix-ui/package.json
54+
cache-dependency-path: remix-ui/pnpm-lock.yaml
4455
cache: pnpm
4556

4657
- name: Download deps
@@ -74,13 +85,20 @@ jobs:
7485
fetch-depth: 0
7586
token: ${{ steps.generate-token.outputs.token }}
7687

88+
- name: Get package manager version
89+
id: get-pnpm-version
90+
run: echo "version=$(cat package.json | jq -r .packageManager | sed s/pnpm@//)" >> $GITHUB_OUTPUT
91+
7792
- name: Setup pnpm
78-
uses: pnpm/action-setup@v2
93+
uses: pnpm/action-setup@v4
94+
with:
95+
version: ${{ steps.get-pnpm-version.outputs.version }}
7996

8097
- name: Setup node
81-
uses: actions/setup-node@v3
98+
uses: actions/setup-node@v4
8299
with:
83-
node-version-file: package.json
100+
node-version-file: remix-ui/package.json
101+
cache-dependency-path: remix-ui/pnpm-lock.yaml
84102
cache: pnpm
85103

86104
- name: Download deps

‎.releaserc.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
{
1616
"replacements": [
1717
{
18-
"files": ["package.json"],
18+
"files": ["remix-ui/package.json"],
1919
"from": "\"version\": \".*\"",
2020
"to": "\"version\": \"${nextRelease.version}\"",
2121
"results": [
2222
{
23-
"file": "package.json",
23+
"file": "remix-ui/package.json",
2424
"hasChanged": true,
2525
"numMatches": 1,
2626
"numReplacements": 1
@@ -29,12 +29,12 @@
2929
"countMatches": true
3030
},
3131
{
32-
"files": ["pyproject.toml"],
32+
"files": ["data-collection/pyproject.toml"],
3333
"from": "^version = \".*\"",
3434
"to": "version = \"${nextRelease.version}\"",
3535
"results": [
3636
{
37-
"file": "pyproject.toml",
37+
"file": "data-collection/pyproject.toml",
3838
"hasChanged": true,
3939
"numMatches": 1,
4040
"numReplacements": 1
@@ -49,7 +49,7 @@
4949
[
5050
"@semantic-release/git",
5151
{
52-
"assets": ["package.json", "pyproject.toml", "CHANGELOG.md"],
52+
"assets": ["remix-ui/package.json", "data-collection/pyproject.toml", "CHANGELOG.md"],
5353
"message": "chore(release): ${nextRelease.version}"
5454
}
5555
]

0 commit comments

Comments
 (0)