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

chore(deps): Upgrade dependencies #2047

Merged
merged 1 commit into from
Jul 12, 2023
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
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# GitHub Actions workflow
# https://help.github.com/actions
# https://www.conventionalcommits.org

name: "conventionalcommits.org"
name: "Conventional Commits"

on:
pull_request:
pull_request_target:
types:
- opened
- edited
- synchronize

permissions:
pull-requests: read

jobs:
main:
name: lint
lint:
name: "Lint PR Title"
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v4
- uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69 changes: 69 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# GitHub Actions workflow
# https://help.github.com/actions

name: CI/CD

on:
push:
branches: [main]
tags:
- "v*"
pull_request:
branches: [main]
schedule:
- cron: "0 7 * * *"
workflow_dispatch:
inputs:
environment:
description: "Environment"
type: environment
default: "test"
required: true

env:
NODE_VERSION: 20.4.x
VERSION: ${{ github.event.pull_request.number }}
HUSKY: 0

jobs:
build:
name: "Build"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

# Configure Node.js and install NPM dependencies
- uses: actions/setup-node@v3
with: { node-version: "${{ env.NODE_VERSION }}", cache: "yarn" }
- run: yarn install

# Analyze code for potential problems
- run: yarn prettier --check .
if: ${{ github.event_name == 'pull_request' }}
- run: yarn lint
if: ${{ github.event_name == 'pull_request' }}
- run: yarn tsc --build
- run: yarn test
if: ${{ github.event_name == 'pull_request' }}

# Compile and save build artifacts
- run: yarn build
- uses: actions/upload-artifact@v3
with: { name: "build", path: "app/dist\nedge/dist\n" }

deploy:
name: "Deploy"
runs-on: ubuntu-latest
needs: [build]
environment:
name: ${{ inputs.environment || 'test' }}
url: ${{ inputs.environment == 'prod' && 'https://example.com' || format('https://{0}.example.com', inputs.environment || 'test') }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with: { node-version: "${{ env.NODE_VERSION }}", cache: "yarn" }
- run: yarn install
- uses: actions/download-artifact@v3
with: { name: "build" }
- run: yarn workspace edge deploy --env=${{ inputs.environment || 'test' }}
if: ${{ false }}
35 changes: 0 additions & 35 deletions .github/workflows/pull_request.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
"swapi",
"tslib",
"typechecking",
"vite",
"vitest",
"webflow",
"yarnpkg",
"yarnrc"
Expand Down
877 changes: 0 additions & 877 deletions .yarn/releases/yarn-4.0.0-rc.45.cjs

This file was deleted.

881 changes: 881 additions & 0 deletions .yarn/releases/yarn-4.0.0-rc.48.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint",
"version": "8.42.0-sdk",
"version": "8.44.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
6 changes: 3 additions & 3 deletions .yarn/sdks/prettier/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/index.js
// Setup the environment to be able to require prettier
require(absPnpApiPath).setup();
}
}

// Defer to the real prettier/index.js your application uses
module.exports = absRequire(`prettier/index.js`);
// Defer to the real prettier your application uses
module.exports = absRequire(`prettier`);
2 changes: 1 addition & 1 deletion .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.8.8-sdk",
"version": "3.0.0-sdk",
"main": "./index.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "5.0.4-sdk",
"version": "5.1.6-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
11 changes: 5 additions & 6 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
compressionLevel: mixed

enableGlobalCache: true

nodeLinker: pnp

packageExtensions:
"@miniflare/r2@*":
dependencies:
"@miniflare/core": ^2.14.0
"local-pkg@*":
local-pkg@*:
dependencies:
"happy-dom": ^9.20.3
happy-dom: ^9.20.3

yarnPath: .yarn/releases/yarn-4.0.0-rc.45.cjs
yarnPath: .yarn/releases/yarn-4.0.0-rc.48.cjs
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
32 changes: 16 additions & 16 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
"app:deploy": "yarn workspace app deploy"
},
"dependencies": {
"@babel/runtime": "^7.22.3",
"@emotion/react": "^11.11.0",
"@babel/runtime": "^7.22.6",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.11.16",
"@mui/lab": "^5.0.0-alpha.133",
"@mui/material": "^5.13.4",
"firebase": "^9.22.1",
"@mui/icons-material": "^5.14.0",
"@mui/lab": "^5.0.0-alpha.136",
"@mui/material": "^5.14.0",
"firebase": "^10.0.0",
"localforage": "^1.10.0",
"notistack": "^3.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.12.0",
"react-router-dom": "^6.14.1",
"recoil": "^0.7.7"
},
"devDependencies": {
"@babel/core": "^7.22.1",
"@babel/core": "^7.22.8",
"@emotion/babel-plugin": "^11.11.0",
"@types/node": "^18.16.16",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.2.4",
"@vitejs/plugin-react": "^4.0.0",
"@types/node": "^20.4.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@vitejs/plugin-react": "^4.0.3",
"envars": "^0.4.0",
"happy-dom": "^9.20.3",
"typescript": "~5.0.4",
"vite": "^4.3.9",
"vitest": "^0.32.0"
"happy-dom": "^10.1.1",
"typescript": "~5.1.6",
"vite": "^4.4.3",
"vitest": "^0.33.0"
}
}
3 changes: 2 additions & 1 deletion app/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ export default defineProject({
},

plugins: [
// https://github.com/vitejs/vite/tree/main/packages/plugin-react
// The default Vite plugin for React projects
// https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md
react({
jsxImportSource: "@emotion/react",
babel: {
Expand Down
18 changes: 10 additions & 8 deletions edge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,30 @@
"test": "vitest",
"coverage": "vitest run --coverage",
"deploy": "node ../scripts/wrangler.js deploy",
"logs": "node ../scripts/wrangler.js tail",
"wrangler": "node ../scripts/wrangler.js",
"edge:cf": "node ../scripts/wrangler.js",
"edge:tsc": "tsc",
"edge:test": "vitest",
"edge:build": "vite build",
"edge:deploy": "node ../scripts/wrangler.js deploy"
"edge:deploy": "node ../scripts/wrangler.js deploy",
"edge:logs": "node ../scripts/wrangler.js tail"
},
"dependencies": {
"@hono/zod-validator": "^0.1.3",
"hono": "^3.2.4",
"hono": "^3.3.0",
"jose": "^4.14.4",
"web-auth-library": "^1.0.3",
"zod": "^3.21.4"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20230518.0",
"@types/node": "^18.16.16",
"happy-dom": "^9.20.3",
"@cloudflare/workers-types": "^4.20230710.0",
"@types/node": "^20.4.1",
"happy-dom": "^10.1.1",
"toml": "^3.0.0",
"typescript": "~5.0.4",
"vite": "^4.3.9",
"vitest": "^0.32.0",
"typescript": "~5.1.6",
"vite": "^4.4.3",
"vitest": "^0.33.0",
"vitest-environment-miniflare": "^2.14.0"
}
}
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "root",
"version": "0.0.0",
"private": true,
"packageManager": "yarn@4.0.0-rc.45",
"packageManager": "yarn@4.0.0-rc.48",
"type": "module",
"workspaces": [
"app",
Expand All @@ -21,25 +21,25 @@
"devDependencies": {
"@emotion/babel-plugin": "^11.11.0",
"@emotion/eslint-plugin": "^11.11.0",
"@types/eslint": "^8.40.0",
"@typescript-eslint/eslint-plugin": "^5.59.9",
"@typescript-eslint/parser": "^5.59.9",
"eslint": "^8.42.0",
"@types/eslint": "^8.44.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"graphql": "^16.6.0",
"happy-dom": "^9.20.3",
"graphql": "^16.7.1",
"happy-dom": "^10.1.1",
"husky": "^8.0.3",
"prettier": "^2.8.8",
"prettier": "^3.0.0",
"react": "^18.2.0",
"relay-config": "^12.0.1",
"typescript": "~5.0.4",
"vite": "^4.3.9",
"vitest": "^0.32.0"
"typescript": "~5.1.6",
"vite": "^4.4.3",
"vitest": "^0.33.0"
},
"prettier": {
"printWidth": 80,
Expand Down
12 changes: 6 additions & 6 deletions scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"execa": "^7.1.1",
"get-port": "^7.0.0",
"got": "^13.0.0",
"graphql": "^16.6.0",
"graphql": "^16.7.1",
"lodash-es": "^4.17.21",
"miniflare": "^2.14.0",
"prettier": "^2.8.8",
"miniflare": "^3.20230710.0",
"prettier": "^3.0.0",
"toml": "^3.0.0",
"vite": "^4.3.9",
"wrangler": "^3.1.0",
"zx": "^7.2.2"
"vite": "^4.4.3",
"wrangler": "^3.2.0",
"zx": "^7.2.3"
}
}
Loading