Skip to content

Commit 60eb76a

Browse files
Merge pull request #162 from ImagingDataCommons/revert-161-chore/update-to-0.45.4
Revert "chore: update to slim 0.45.4"
2 parents a7b7b44 + 08c0052 commit 60eb76a

121 files changed

Lines changed: 19369 additions & 13671 deletions

File tree

Some content is hidden

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

.eslintrc.strict.cjs

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/deploy-to-firebase.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ jobs:
1515
- name: Checkout to repository
1616
uses: actions/checkout@v4.2.2
1717

18-
- name: Setup Bun
19-
uses: oven-sh/setup-bun@v2
18+
- name: Setup Node
19+
uses: actions/setup-node@v4.4.0
2020
with:
21-
bun-version: latest
21+
node-version: 20.8.1
22+
23+
- name: Install Yarn
24+
run: sudo npm i -g yarn
2225

2326
- name: Install dependencies
24-
run: bun install --frozen-lockfile
27+
run: yarn
2528

2629
- name: Build
27-
run: REACT_APP_CONFIG=preview PUBLIC_URL=/ bun run build
30+
run: REACT_APP_CONFIG=preview PUBLIC_URL=/ yarn build
2831

2932
- name: Deploy
3033
uses: FirebaseExtended/action-hosting-deploy@v0

.github/workflows/deploy-to-github-pages.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on:
66
pull_request:
77
branches: [master]
88

9-
concurrency:
10-
group: deploy-gh-pages
11-
cancel-in-progress: true
12-
139
jobs:
1410
deploy-to-github-pages:
1511
name: "Deploy to GitHub Pages"
@@ -18,17 +14,20 @@ jobs:
1814
- name: Checkout to repository
1915
uses: actions/checkout@v4.2.2
2016

21-
- name: Setup Bun
22-
uses: oven-sh/setup-bun@v2
17+
- name: Setup Node
18+
uses: actions/setup-node@v4.4.0
2319
with:
24-
bun-version: latest
20+
node-version: 20.8.1
21+
22+
- name: Install Yarn
23+
run: sudo npm i -g yarn
2524

2625
- name: Install dependencies
27-
run: bun install --frozen-lockfile
26+
run: yarn
2827

2928
- name: Build and deploy to GitHub Pages
3029
run: |
3130
git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
32-
bun run deploy -- -u "github-actions-bot <support+actions@github.com>" -f
31+
yarn deploy -- -u "github-actions-bot <support+actions@github.com>"
3332
env:
3433
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
ref: master
1717
persist-credentials: false
1818

19-
- name: Setup Bun
20-
uses: oven-sh/setup-bun@v2
19+
- name: Setup Node
20+
uses: actions/setup-node@v4.4.0
2121
with:
22-
bun-version: latest
22+
node-version: 20.8.1
2323

2424
- name: Install dependencies
25-
run: bun install --frozen-lockfile
25+
run: yarn
2626

2727
- name: Build
28-
run: bun run build
28+
run: yarn build
2929

3030
- name: Zip build
3131
run: zip -r build.zip build
@@ -37,4 +37,4 @@ jobs:
3737
GIT_AUTHOR_EMAIL: ${{ vars.RELEASE_GIT_AUTHOR_EMAIL }}
3838
GIT_COMMITTER_NAME: ${{ vars.RELEASE_GIT_COMMITTER_NAME }}
3939
GIT_COMMITTER_EMAIL: ${{ vars.RELEASE_GIT_COMMITTER_EMAIL }}
40-
run: bunx semantic-release --branches master
40+
run: npx semantic-release --branches master

.github/workflows/unit-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ jobs:
1414
- name: Checkout to repository
1515
uses: actions/checkout@v4.2.2
1616

17-
- name: Setup Bun
18-
uses: oven-sh/setup-bun@v2
17+
- name: Setup Node
18+
uses: actions/setup-node@v4.4.0
1919
with:
20-
bun-version: latest
20+
node-version: 20.8.1
2121

2222
- name: Install dependencies
23-
run: bun install --frozen-lockfile
23+
run: yarn
2424

2525
- name: Build
26-
run: bun run build
26+
run: yarn build
2727

2828
- name: Lint
29-
run: bun run lint
29+
run: yarn lint
3030

3131
- name: Test
32-
run: bun run test
32+
run: yarn test

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
/coverage
1313
.env
1414

15-
.cursorrules
16-
1715
# production
1816
/build
1917

@@ -30,7 +28,7 @@ public/config/*
3028
.env.production.local
3129

3230
npm-debug.log*
33-
bun-debug.log*
34-
bun-error.log*
31+
yarn-debug.log*
32+
yarn-error.log*
3533

3634
/.github

.husky/pre-commit

Lines changed: 0 additions & 3 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,15 @@ The app is built using [craco](https://github.com/gsoft-inc/craco) (with the [cr
3131

3232
Tests are written and run using the [jest](https://jestjs.io/) framework.
3333

34-
The [Bun](https://bun.sh/) runtime and package manager is used to manage dependencies and run scripts specified in `package.json` (`build`, `lint`, `test`, etc.).
34+
The [yarn](https://yarnpkg.com/) package manager is used to manage dependencies and run scripts specified in `package.json` (`build`, `lint`, `test`, etc.).
3535

3636
## Coding style
3737

38-
Source code is linted and formatted using [Biome](https://biomejs.dev/). TypeScript is used with [strict type checking compiler options](https://www.typescriptlang.org/tsconfig#Strict_Type_Checking_Options_6173) enabled. Semicolons are not used at the end of statements (Biome uses `asNeeded`).
38+
Source code is linted using [ts-standard](https://github.com/standard/ts-standard) (based on [eslint](https://eslint.org/)) and TypeScript is used with [strict type checking compiler options](https://www.typescriptlang.org/tsconfig#Strict_Type_Checking_Options_6173) enabled.
3939

40-
Use the following commands to check and fix style:
40+
Use the following command to identify potential coding style and type annotation violations:
4141

42-
$ bun run lint # check for issues
43-
$ bun run lint:fix # auto-fix issues
44-
$ bun run fmt # format code
42+
$ yarn lint
4543

4644

4745
### Documentation

Dockerfile

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,35 @@ RUN apt-get update && \
1010
curl \
1111
dumb-init \
1212
gnupg \
13-
nginx \
14-
unzip && \
13+
nginx && \
1514
apt-get clean
1615

1716
RUN curl -fsSL https://deb.nodesource.com/setup_21.x | bash - && \
17+
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
18+
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
19+
curl -sS https://deb.nodesource.com/setup_21.x | bash - && \
1820
apt-get update && \
1921
apt-get install -y --no-install-suggests --no-install-recommends \
20-
nodejs && \
22+
nodejs \
23+
yarn && \
2124
apt-get clean
2225

23-
# Install Bun (matches packageManager in package.json)
24-
ENV BUN_INSTALL=/usr/local
25-
RUN curl -fsSL https://bun.sh/install | bash -
26-
2726
WORKDIR /usr/local/share/mghcomputationalpathology/slim
2827

2928
# Install dependencies first and then include code for efficient caching
3029
COPY package.json .
31-
COPY bun.lock .
30+
COPY yarn.lock .
3231

33-
RUN bun install --frozen-lockfile
32+
# There are sometimes weird network errors. Increasing the network timeout
33+
# seems to help (see https://github.com/yarnpkg/yarn/issues/5259)
34+
RUN yarn install --frozen-lockfile --network-timeout 100000
3435

3536
COPY craco.config.js .
3637
COPY tsconfig.json .
3738
COPY types ./types
3839
COPY public ./public
39-
COPY scripts ./scripts
4040
COPY src ./src
4141

42-
RUN chmod +x scripts/*.sh
43-
4442

4543
FROM lib AS app
4644

@@ -56,7 +54,7 @@ RUN addgroup --system --gid 101 nginx && \
5654
--shell /bin/false \
5755
nginx
5856

59-
RUN NODE_OPTIONS=--max_old_space_size=8192 bun run build && \
57+
RUN NODE_OPTIONS=--max_old_space_size=8192 yarn run build && \
6058
mkdir -p /var/www/html && \
6159
cp -R build/* /var/www/html/
6260

@@ -81,4 +79,4 @@ RUN useradd -m -s /bin/bash tester && \
8179

8280
USER tester
8381

84-
ENTRYPOINT ["/usr/bin/dumb-init", "--", "bun", "run", "test"]
82+
ENTRYPOINT ["/usr/bin/dumb-init", "--", "yarn", "test"]

0 commit comments

Comments
 (0)