Skip to content

Commit

Permalink
Merge pull request #2527 from coronasafe/cra-5
Browse files Browse the repository at this point in the history
React 18; Tailwind v3; Minor Refactoring
  • Loading branch information
mathew-alex committed May 27, 2022
2 parents 4c7a785 + d3c46f9 commit b3f80b9
Show file tree
Hide file tree
Showing 53 changed files with 20,630 additions and 68,612 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/eslint-recommended",
Expand All @@ -25,7 +24,7 @@
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"plugins": ["@typescript-eslint"],
"rules": {
"quotes": ["error", "double"],
"no-unused-vars": "off",
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: "npm"
- package-ecosystem: "yarn"
directory: "/"
schedule:
interval: "daily"
Expand All @@ -10,5 +10,5 @@ updates:
assignees:
- "tomahawk_pilot"
labels:
- "npm"
- "yarn"
- "dependencies"
15 changes: 9 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
# production
/build

src/index.css
src/style/index.css

# misc
.DS_Store
.env.local
Expand All @@ -29,7 +26,7 @@ dist
build
.swp
stats.json
yarn.lock
package-lock.json
public/build-meta.json


Expand All @@ -41,5 +38,11 @@ public/build-meta.json
*.gen
.bsb.lock

# Generated CSS file from Tailwind
src/style/index.css
# Yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ lib
build
*.css
*.gen.tsx
*.bs.js
*.bs.js
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-outdated.cjs

Large diffs are not rendered by default.

786 changes: 786 additions & 0 deletions .yarn/releases/yarn-3.2.1.cjs

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v2"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#build-stage
FROM node:lts-buster-slim as build-stage
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY package.json ./
RUN yarn install
COPY . .
RUN npm run build
RUN yarn run build

#production-stage
FROM nginx:stable-alpine as production-stage
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ attach. a screenshot for all Prs

In the project directory, you can run:

### `npm start`
### `yarn start`

Runs the app in the development mode.<br />
Open [http://localhost:4000](http://localhost:4000) to view it in the browser.

The page will reload if you make edits.<br />
You will also see any lint errors in the console.

### `npm run build`
### `yarn run build`

Builds the app for production to the `build` folder.<br />
It correctly bundles React in production mode and optimizes the build for the best performance.

### `npm run start:Dev`
### `yarn run start:Dev`

Starts a production http-server in local to run the project with Service worker

Expand Down

0 comments on commit b3f80b9

Please sign in to comment.