Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump typescript from 4.0.5 to 4.1.2 #71

Merged
merged 5 commits into from
Nov 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ module.exports = {
"no-var": "error",
"no-console": ["error"],
"prettier/prettier": "error",
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off",
},
globals: {
page: true,
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ env:

on:
push:
branches: [ main, production ]
branches: [main, production]
pull_request:
branches: [ main, production, feature/** ]
branches: [main, production, feature/**]

jobs:
static-analysis:
runs-on: ubuntu-latest
steps:
static-analysis:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
Expand All @@ -23,11 +23,11 @@ jobs:
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint

js-tests:
runs-on: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
Expand All @@ -36,7 +36,7 @@ jobs:
run: yarn install --frozen-lockfile
- name: Create Test Build
run: yarn build
- name: Running JS tests
- name: Running JS tests
run: yarn test:ci

build:
Expand Down Expand Up @@ -76,8 +76,8 @@ jobs:
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Deploy to Firebase -- Production
run: yarn deploy:production --token $token
env:
run: yarn deploy:production --token $token
env:
token: ${{ secrets.FIREBASE_TOKEN }}

auto-deploy-to-test:
Expand All @@ -98,6 +98,6 @@ jobs:
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Deploy to Firebase -- Test
run: yarn deploy:test --token $token
env:
run: yarn deploy:test --token $token
env:
token: ${{ secrets.FIREBASE_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

.eslintcache

.env*
!.env.sample

Expand Down
14 changes: 3 additions & 11 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,18 @@
{
"target": "production",
"public": "build",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
},
},
{
"public": "build",
"target": "test",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-scripts": "4.0.1",
"react-spinners": "^0.9.0",
"sass": "^1.29.0",
"typescript": "^4.0.5"
"typescript": "^4.1.2"
},
"engines": {
"node": "^14.11.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import Routes from "routes/routes";

const App: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import "./Button.scss";

export interface ButtonProps {
Expand Down
3 changes: 2 additions & 1 deletion src/components/EmailSubscription/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState } from "react";
import { useState } from "react";
import * as React from "react";
import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
import { ReactComponent as Arrow } from "images/arrow.svg";
import ClipLoader from "react-spinners/ClipLoader";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import Button, { ButtonProps } from "components/Button/index.view";
import "./Navbar.scss";

Expand Down
2 changes: 1 addition & 1 deletion src/components/PostcardStack/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-var-requires */
import React from "react";
import * as React from "react";
import "./PostcardStack.scss";

interface PostcardStackProps {
Expand Down
6 changes: 3 additions & 3 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import { StrictMode } from "react";
import ReactDOM from "react-dom";
import "stylesheets/base.scss";
import App from "./App";
import * as serviceWorker from "./serviceWorker";

ReactDOM.render(
<React.StrictMode>
<StrictMode>
<App />
</React.StrictMode>,
</StrictMode>,
document.getElementById("root")
);

Expand Down
2 changes: 1 addition & 1 deletion src/routes/routes.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
import HomepageView from "views/Home/index.view";

Expand Down
2 changes: 1 addition & 1 deletion src/views/Hero/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import cx from "classnames";
import PostcardStack from "components/PostcardStack/index.view";

Expand Down
2 changes: 1 addition & 1 deletion src/views/Home/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import HeroView from "views/Hero/index.view";
// import Navbar from "components/Navbar/index.view";
import Button from "components/Button/index.view";
Expand Down
2 changes: 1 addition & 1 deletion src/views/Information/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import "./Information.scss";

const InformationPageView: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Schedule/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import "./Schedule.scss";

const SchedulePageView: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Sponsorship/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import "./Sponsorship.scss";

const SponsorshipPageView: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Team/index.view.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import "./Team.scss";

const TeamPageView: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react",
"jsx": "react-jsx",
"sourceMap": true,
"watch": true,
"noFallthroughCasesInSwitch": true
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14448,10 +14448,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^4.0.5:
version "4.0.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
typescript@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==

unbzip2-stream@^1.3.3:
version "1.4.3"
Expand Down