Skip to content

Commit b581923

Browse files
one-communityone-community
authored
Merge pull request #5218 from OneCommunityGlobal/revert-5213-development
Revert "Frontend Release to Main [4.87]"
2 parents 3dee6fa + 646220f commit b581923

470 files changed

Lines changed: 15348 additions & 32673 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.

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20
26-
cache: 'npm'
26+
cache: 'yarn'
2727
- name: Install Dependencies
28-
run: npm ci
28+
run: yarn install --frozen-lockfile
2929
# We don't run tests here since we assume it's already done during PR process.
3030
# - name: Update Browser List
3131
# run: npx browserslist@latest --update-db
3232
- name: Build React App
33-
run: npm run build && cp build/index.html build/200.html
33+
run: yarn run build && cp build/index.html build/200.html
3434
env:
3535
NODE_ENV: ${{ github.ref_name == 'main' && 'production' || 'development' }}
3636
REACT_APP_APIENDPOINT: ${{ vars.REACT_APP_API_ENDPOINT }}

‎.github/workflows/pull_request_test.yml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,13 @@ jobs:
4646
- uses: actions/checkout@v4
4747
with:
4848
fetch-depth: 0
49-
- uses: actions/setup-node@v4
50-
with:
51-
node-version: 20
52-
cache: 'yarn'
53-
- name: Enable Corepack
54-
run: corepack enable
55-
- name: Install Dependencies
56-
run: yarn install --frozen-lockfile
57-
- name: Run Unit Tests for Changed Files Only
58-
run: yarn test:changed
59-
- name: Run Lint
60-
run: yarn lint
49+
- uses: actions/setup-node@v4
50+
with:
51+
node-version: 20
52+
cache: 'yarn'
53+
- name: Install Dependencies
54+
run: yarn install --frozen-lockfile
55+
- name: Run Unit Tests for Changed Files Only
56+
run: yarn run test:changed
57+
- name: Run Lint
58+
run: yarn run lint

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@v3
1414

15-
- name: Set up Node.js & cache npm
15+
- name: Set up Node.js & cache Yarn
1616
uses: actions/setup-node@v4
1717
with:
1818
node-version: 20
1919
cache: yarn
2020

21-
- name: Enable Corepack
22-
run: corepack enable
23-
2421
- name: Install dependencies
25-
run: yarn install --frozen-lockfile
22+
run: yarn install
2623

2724
- name: Run tests
2825
run: yarn test

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# dependencies
44
/node_modules
5+
package-lock.json
56
# testing
67
/coverage
78
*.code-snippets
@@ -31,4 +32,5 @@ yarn-error.log*
3132

3233
**\ **
3334

34-
/public/tinymce/
35+
/public/tinymce/
36+
package-lock.json

‎.husky/pre-push‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ if [ -n "$style_files" ]; then
4444
style_status=$?
4545
fi
4646

47-
4847
# Block push if either fails
4948
if [ $test_status -ne 0 ] || [ $lint_status -ne 0 ] || [ $style_status -ne 0 ]; then
5049
echo "❌ Push blocked: changed-file validation failed."

‎fix-conflicts.js‎

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

‎index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/" />
45
<meta charset="utf-8" />
56
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
67
<meta name="theme-color" content="#000000" />

‎jsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
},
88
"include": ["src"]
99
}
10+

0 commit comments

Comments
 (0)