Skip to content

Commit

Permalink
Merge pull request #51 from Eldemarkki/vite-migration
Browse files Browse the repository at this point in the history
Migrate from CRA to Vite
  • Loading branch information
ahnl authored Jan 31, 2024
2 parents c689d1d + 8104b24 commit ffe6407
Show file tree
Hide file tree
Showing 34 changed files with 4,770 additions and 32,049 deletions.
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
build
dist
node_modules
package.json
package-lock.json
yarn.lock
public/3rd-party/
scripts
config
31 changes: 15 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,34 @@ name: React app deployement

on:
push:
branches: [ main ]
branches: [main]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2

- name: Restore CI Cache
uses: actions/cache@v2
id: cache
with:
- name: Restore CI Cache
uses: actions/cache@v2
id: cache
with:
path: node_modules
key: ${{ runner.os }}-16-${{ hashFiles('**/yarn.lock') }}

- name: Install Dependencies
if: ${{ !steps.cache.outputs.cache-hit }}
run: yarn --frozen-lockfile
- run: |
- name: Install Dependencies
if: ${{ !steps.cache.outputs.cache-hit }}
run: yarn --frozen-lockfile

- run: |
npm ci
npm run build
echo "matikkaeditori.fi" >> build/CNAME
echo "matikkaeditori.fi" >> dist/CNAME
echo "VERSION: " >> build/VERSION
echo $(git rev-parse --short "$GITHUB_SHA") >> build/VERSION
echo $(git rev-parse --short "$GITHUB_SHA") >> dist/VERSION
git config user.name github-actions
git config user.email [email protected]
git --work-tree build add --all
git --work-tree dist add --all
git commit -m "Automatic React build & deploy"
git push origin HEAD:gh-pages --force
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

lib/
lib/
dist/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

In the project directory, you can run:

### `yarn start`
### `npm run dev`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
Open http://localhost:5173 to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.
Expand Down
104 changes: 0 additions & 104 deletions config/env.js

This file was deleted.

66 changes: 0 additions & 66 deletions config/getHttpsConfig.js

This file was deleted.

29 changes: 0 additions & 29 deletions config/jest/babelTransform.js

This file was deleted.

14 changes: 0 additions & 14 deletions config/jest/cssTransform.js

This file was deleted.

40 changes: 0 additions & 40 deletions config/jest/fileTransform.js

This file was deleted.

Loading

0 comments on commit ffe6407

Please sign in to comment.