From 0b8e97cc14c4f779fffc219b7dbc3e488ffb3997 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jul 2021 13:13:29 +0530 Subject: [PATCH 1/5] Bump eslint-config-next from 11.0.0 to 11.0.1 (#196) Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 11.0.0 to 11.0.1. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v11.0.1/packages/eslint-config-next) --- updated-dependencies: - dependency-name: eslint-config-next dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 75 +++++++++++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff6330e7..d8e26df2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ }, "devDependencies": { "eslint": "^7.29.0", - "eslint-config-next": "^11.0.0", + "eslint-config-next": "^11.0.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-react": "^7.24.0", "postcss": "^8.3.5", @@ -572,9 +572,9 @@ "integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA==" }, "node_modules/@next/eslint-plugin-next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.0.tgz", - "integrity": "sha512-fPZ0904yY1box6bRpR9rJqIkNxJdvzzxH7doXS+cdjyBAdptMR7wj3mcx1hEikBHzWduU8BOXBvRg2hWc09YDQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.1.tgz", + "integrity": "sha512-UzdX3y6XSrj9YuASUb/p4sRvfjP2klj2YgIOfMwrWoLTTPJQMh00hREB9Ftr7m7RIxjVSAaaLXIRLdxvq948GA==", "dev": true }, "node_modules/@next/polyfill-module": { @@ -2022,19 +2022,30 @@ } }, "node_modules/eslint-config-next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.0.tgz", - "integrity": "sha512-pmatg4zqb5Vygu2HrSPxbsCBudXO9OZQUMKQCyrPKRvfL8PJ3lOIOzzwsiW68eMPXOZwOc1yxTRZWKNY8OJT0w==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.1.tgz", + "integrity": "sha512-yy63K4Bmy8amE6VMb26CZK6G99cfVX3JaMTvuvmq/LL8/b8vKHcauUZREBTAQ+2DrIvlH4YrFXrkQ1vpYDL9Eg==", "dev": true, "dependencies": { - "@next/eslint-plugin-next": "11.0.0", + "@next/eslint-plugin-next": "11.0.1", "@rushstack/eslint-patch": "^1.0.6", "@typescript-eslint/parser": "^4.20.0", "eslint-import-resolver-node": "^0.3.4", + "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.23.1", "eslint-plugin-react-hooks": "^4.2.0" + }, + "peerDependencies": { + "eslint": "^7.23.0", + "next": ">=10.2.0", + "typescript": ">=3.3.1" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/eslint-import-resolver-node": { @@ -2062,6 +2073,26 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, + "node_modules/eslint-import-resolver-typescript": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.4.0.tgz", + "integrity": "sha512-useJKURidCcldRLCNKWemr1fFQL1SzB3G4a0li6lFGvlc5xGe1hY343bvG07cbpCzPuM/lK19FIJB3XGFSkplA==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "resolve": "^1.17.0", + "tsconfig-paths": "^3.9.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "*", + "eslint-plugin-import": "*" + } + }, "node_modules/eslint-module-utils": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", @@ -7389,9 +7420,9 @@ "integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA==" }, "@next/eslint-plugin-next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.0.tgz", - "integrity": "sha512-fPZ0904yY1box6bRpR9rJqIkNxJdvzzxH7doXS+cdjyBAdptMR7wj3mcx1hEikBHzWduU8BOXBvRg2hWc09YDQ==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-11.0.1.tgz", + "integrity": "sha512-UzdX3y6XSrj9YuASUb/p4sRvfjP2klj2YgIOfMwrWoLTTPJQMh00hREB9Ftr7m7RIxjVSAaaLXIRLdxvq948GA==", "dev": true }, "@next/polyfill-module": { @@ -8667,15 +8698,16 @@ } }, "eslint-config-next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.0.tgz", - "integrity": "sha512-pmatg4zqb5Vygu2HrSPxbsCBudXO9OZQUMKQCyrPKRvfL8PJ3lOIOzzwsiW68eMPXOZwOc1yxTRZWKNY8OJT0w==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-11.0.1.tgz", + "integrity": "sha512-yy63K4Bmy8amE6VMb26CZK6G99cfVX3JaMTvuvmq/LL8/b8vKHcauUZREBTAQ+2DrIvlH4YrFXrkQ1vpYDL9Eg==", "dev": true, "requires": { - "@next/eslint-plugin-next": "11.0.0", + "@next/eslint-plugin-next": "11.0.1", "@rushstack/eslint-patch": "^1.0.6", "@typescript-eslint/parser": "^4.20.0", "eslint-import-resolver-node": "^0.3.4", + "eslint-import-resolver-typescript": "^2.4.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.23.1", @@ -8709,6 +8741,19 @@ } } }, + "eslint-import-resolver-typescript": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.4.0.tgz", + "integrity": "sha512-useJKURidCcldRLCNKWemr1fFQL1SzB3G4a0li6lFGvlc5xGe1hY343bvG07cbpCzPuM/lK19FIJB3XGFSkplA==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "resolve": "^1.17.0", + "tsconfig-paths": "^3.9.0" + } + }, "eslint-module-utils": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", diff --git a/package.json b/package.json index 1c272cee..7c8b88f2 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ }, "devDependencies": { "eslint": "^7.29.0", - "eslint-config-next": "^11.0.0", + "eslint-config-next": "^11.0.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-react": "^7.24.0", "postcss": "^8.3.5", From 83e4c55b7037258d26aed16683e7eea1161d0fed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jul 2021 13:13:47 +0530 Subject: [PATCH 2/5] Bump next from 11.0.0 to 11.0.1 (#197) Bumps [next](https://github.com/vercel/next.js) from 11.0.0 to 11.0.1. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v11.0.0...v11.0.1) --- updated-dependencies: - dependency-name: next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 113 ++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8e26df2..355030e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/react-fontawesome": "^0.1.14", - "next": "11.0.0", + "next": "11.0.1", "react": "^17.0.2", "react-countdown": "^2.3.2", "react-dom": "^17.0.2", @@ -567,9 +567,9 @@ "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" }, "node_modules/@next/env": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.0.tgz", - "integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.1.tgz", + "integrity": "sha512-yZfKh2U6R9tEYyNUrs2V3SBvCMufkJ07xMH5uWy8wqcl5gAXoEw6A/1LDqwX3j7pUutF9d1ZxpdGDA3Uag+aQQ==" }, "node_modules/@next/eslint-plugin-next": { "version": "11.0.1", @@ -578,14 +578,14 @@ "dev": true }, "node_modules/@next/polyfill-module": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.0.tgz", - "integrity": "sha512-gydtFzRqsT549U8+sY8382I/f4HFcelD8gdUGnAofQJa/jEU1jkxmjCHC8tmEiyeMLidl7iDZgchfSCpmMzzUg==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.1.tgz", + "integrity": "sha512-Cjs7rrKCg4CF4Jhri8PCKlBXhszTfOQNl9AjzdNy4K5jXFyxyoSzuX2rK4IuoyE+yGp5A3XJCBEmOQ4xbUp9Mg==" }, "node_modules/@next/react-dev-overlay": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.0.tgz", - "integrity": "sha512-q+Wp+eStEMThe77zxdeJ/nbuODkHR6P+/dfUqYXZSqbLf6x5c5xwLBauwwVbkCYFZpAlDuL8Jk8QSAH1OsqC2w==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.1.tgz", + "integrity": "sha512-lvUjMVpLsgzADs9Q8wtC5LNqvfdN+M0BDMSrqr04EDWAyyX0vURHC9hkvLbyEYWyh+WW32pwjKBXdkMnJhoqMg==", "dependencies": { "@babel/code-frame": "7.12.11", "anser": "1.4.9", @@ -598,6 +598,10 @@ "source-map": "0.8.0-beta.0", "stacktrace-parser": "0.1.10", "strip-ansi": "6.0.0" + }, + "peerDependencies": { + "react": "^17.0.2", + "react-dom": "^17.0.2" } }, "node_modules/@next/react-dev-overlay/node_modules/@babel/code-frame": { @@ -618,6 +622,9 @@ }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/@next/react-dev-overlay/node_modules/source-map": { @@ -632,9 +639,18 @@ } }, "node_modules/@next/react-refresh-utils": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.0.tgz", - "integrity": "sha512-hi5eY+KBn4QGtUv7VL2OptdM33fI2hxhd7+omOFmAK+S0hDWhg1uqHqqGJk0W1IfqlWEzzL10WvTJDPRAtDugQ==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.1.tgz", + "integrity": "sha512-K347DM6Z7gBSE+TfUaTTceWvbj0B6iNAsFZXbFZOlfg3uyz2sbKpzPYYFocCc27yjLaS8OfR8DEdS2mZXi8Saw==", + "peerDependencies": { + "react-refresh": "0.8.3", + "webpack": "^4 || ^5" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + } + } }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -3813,16 +3829,16 @@ "dev": true }, "node_modules/next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/next/-/next-11.0.0.tgz", - "integrity": "sha512-1OA0ccCTwVtdLats/1v7ReiBVx+Akya0UVhHo9IBr8ZkpDI3/SGNcaruJBp5agy8ROF97VDKkZamoUXxRB9NUA==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/next/-/next-11.0.1.tgz", + "integrity": "sha512-yR7be7asNbvpVNpi6xxEg28wZ7Gqmj1nOt0sABH9qORmF3+pms2KZ7Cng33oK5nqPIzEEFJD0pp2PCe3/ueMIg==", "dependencies": { "@babel/runtime": "7.12.5", "@hapi/accept": "5.0.2", - "@next/env": "11.0.0", - "@next/polyfill-module": "11.0.0", - "@next/react-dev-overlay": "11.0.0", - "@next/react-refresh-utils": "11.0.0", + "@next/env": "11.0.1", + "@next/polyfill-module": "11.0.1", + "@next/react-dev-overlay": "11.0.1", + "@next/react-refresh-utils": "11.0.1", "assert": "2.0.0", "ast-types": "0.13.2", "browserify-zlib": "0.2.0", @@ -3873,6 +3889,24 @@ }, "engines": { "node": ">=12.0.0" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + } } }, "node_modules/next/node_modules/@babel/runtime": { @@ -7415,9 +7449,9 @@ "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" }, "@next/env": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.0.tgz", - "integrity": "sha512-VKpmDvTYeCpEQjREg3J4pCmVs/QjEzoLmkM8shGFK6e9AmFd0G9QXOL8HGA8qKhy/XmNb7dHeMqrcMiBua4OgA==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.1.tgz", + "integrity": "sha512-yZfKh2U6R9tEYyNUrs2V3SBvCMufkJ07xMH5uWy8wqcl5gAXoEw6A/1LDqwX3j7pUutF9d1ZxpdGDA3Uag+aQQ==" }, "@next/eslint-plugin-next": { "version": "11.0.1", @@ -7426,14 +7460,14 @@ "dev": true }, "@next/polyfill-module": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.0.tgz", - "integrity": "sha512-gydtFzRqsT549U8+sY8382I/f4HFcelD8gdUGnAofQJa/jEU1jkxmjCHC8tmEiyeMLidl7iDZgchfSCpmMzzUg==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.0.1.tgz", + "integrity": "sha512-Cjs7rrKCg4CF4Jhri8PCKlBXhszTfOQNl9AjzdNy4K5jXFyxyoSzuX2rK4IuoyE+yGp5A3XJCBEmOQ4xbUp9Mg==" }, "@next/react-dev-overlay": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.0.tgz", - "integrity": "sha512-q+Wp+eStEMThe77zxdeJ/nbuODkHR6P+/dfUqYXZSqbLf6x5c5xwLBauwwVbkCYFZpAlDuL8Jk8QSAH1OsqC2w==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.0.1.tgz", + "integrity": "sha512-lvUjMVpLsgzADs9Q8wtC5LNqvfdN+M0BDMSrqr04EDWAyyX0vURHC9hkvLbyEYWyh+WW32pwjKBXdkMnJhoqMg==", "requires": { "@babel/code-frame": "7.12.11", "anser": "1.4.9", @@ -7476,9 +7510,10 @@ } }, "@next/react-refresh-utils": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.0.tgz", - "integrity": "sha512-hi5eY+KBn4QGtUv7VL2OptdM33fI2hxhd7+omOFmAK+S0hDWhg1uqHqqGJk0W1IfqlWEzzL10WvTJDPRAtDugQ==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.0.1.tgz", + "integrity": "sha512-K347DM6Z7gBSE+TfUaTTceWvbj0B6iNAsFZXbFZOlfg3uyz2sbKpzPYYFocCc27yjLaS8OfR8DEdS2mZXi8Saw==", + "requires": {} }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -10143,16 +10178,16 @@ "dev": true }, "next": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/next/-/next-11.0.0.tgz", - "integrity": "sha512-1OA0ccCTwVtdLats/1v7ReiBVx+Akya0UVhHo9IBr8ZkpDI3/SGNcaruJBp5agy8ROF97VDKkZamoUXxRB9NUA==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/next/-/next-11.0.1.tgz", + "integrity": "sha512-yR7be7asNbvpVNpi6xxEg28wZ7Gqmj1nOt0sABH9qORmF3+pms2KZ7Cng33oK5nqPIzEEFJD0pp2PCe3/ueMIg==", "requires": { "@babel/runtime": "7.12.5", "@hapi/accept": "5.0.2", - "@next/env": "11.0.0", - "@next/polyfill-module": "11.0.0", - "@next/react-dev-overlay": "11.0.0", - "@next/react-refresh-utils": "11.0.0", + "@next/env": "11.0.1", + "@next/polyfill-module": "11.0.1", + "@next/react-dev-overlay": "11.0.1", + "@next/react-refresh-utils": "11.0.1", "assert": "2.0.0", "ast-types": "0.13.2", "browserify-zlib": "0.2.0", diff --git a/package.json b/package.json index 7c8b88f2..43158fd2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/react-fontawesome": "^0.1.14", - "next": "11.0.0", + "next": "11.0.1", "react": "^17.0.2", "react-countdown": "^2.3.2", "react-dom": "^17.0.2", From 07ccab1dce34858bcc6562390b0c9d52f0c6bc20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Jul 2021 13:16:49 +0530 Subject: [PATCH 3/5] Bump eslint from 7.29.0 to 7.30.0 (#195) Bumps [eslint](https://github.com/eslint/eslint) from 7.29.0 to 7.30.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.29.0...v7.30.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 53 ++++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 355030e4..782f2f61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "stylelint-config-sass-guidelines": "^8.0.0" }, "devDependencies": { - "eslint": "^7.29.0", + "eslint": "^7.30.0", "eslint-config-next": "^11.0.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-react": "^7.24.0", @@ -566,6 +566,26 @@ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz", "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "node_modules/@next/env": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.1.tgz", @@ -1982,13 +2002,14 @@ } }, "node_modules/eslint": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz", - "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==", + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz", + "integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==", "dev": true, "dependencies": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.2", + "@humanwhocodes/config-array": "^0.5.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -7448,6 +7469,23 @@ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz", "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" }, + "@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "@next/env": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/@next/env/-/env-11.0.1.tgz", @@ -8669,13 +8707,14 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz", - "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==", + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz", + "integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.2", + "@humanwhocodes/config-array": "^0.5.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", diff --git a/package.json b/package.json index 43158fd2..c5509cdc 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ ] }, "devDependencies": { - "eslint": "^7.29.0", + "eslint": "^7.30.0", "eslint-config-next": "^11.0.1", "eslint-plugin-import": "^2.23.4", "eslint-plugin-react": "^7.24.0", From 439de2f98dde3cf832134c82cb699fdf491860a8 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Wed, 7 Jul 2021 14:07:08 -0700 Subject: [PATCH 4/5] chore: ignores README-only changes for actions triggers (#199) While working on #187, I noticed that we "waste" a bit of Actions time rebuilding, linting, and running CodeQL against PRs that only introduce changes to `README.md`. Since we aren't using a markdown linter like `remark`, these Actions are all going to be a no-op. So, this PR disables these actions on commits that only change `README.md`. If this is useful, we may want to: * expand the set of files that we don't run changes against * push this change upstream to other react projects we use, particularly the react starters that Teach LA uses --- .github/workflows/codeql-analysis.yml | 4 ++++ .github/workflows/lint.yml | 6 +++++- .github/workflows/node-build.yml | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 204737b8..08f46e64 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,9 +14,13 @@ name: "CodeQL" on: push: branches: [ main ] + paths-ignore: + - '**/README.md' pull_request: # The branches below must be a subset of the branches above branches: [ main ] + paths-ignore: + - '**/README.md' schedule: - cron: '42 22 * * 2' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 615412d6..65fe921a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,9 +5,13 @@ name: Lint on: push: - branches: [ main] + branches: [ main ] + paths-ignore: + - '**/README.md' pull_request: branches: [ main ] + paths-ignore: + - '**/README.md' jobs: lint: diff --git a/.github/workflows/node-build.yml b/.github/workflows/node-build.yml index 27a23a35..b422854d 100644 --- a/.github/workflows/node-build.yml +++ b/.github/workflows/node-build.yml @@ -6,8 +6,12 @@ name: Node.js CI on: push: branches: [ main ] + paths-ignore: + - '**/README.md' pull_request: branches: [ main ] + paths-ignore: + - '**/README.md' jobs: build: From be38f509ace8825034be6defffa76b5d06c8fd2a Mon Sep 17 00:00:00 2001 From: Advaith G <67539191+advaithg@users.noreply.github.com> Date: Thu, 8 Jul 2021 10:49:33 +0530 Subject: [PATCH 5/5] converts about page --- pages/about.js | 68 +++++++++++++------ styles/App.scss | 2 +- .../pages/{about.scss => About.module.scss} | 51 ++++++++++---- 3 files changed, 84 insertions(+), 37 deletions(-) rename styles/pages/{about.scss => About.module.scss} (66%) diff --git a/pages/about.js b/pages/about.js index 8e27bf2b..2a54b1ea 100644 --- a/pages/about.js +++ b/pages/about.js @@ -11,51 +11,75 @@ import data from '../data'; import acmCommittees from '../public/images/acm_committees.png'; import acmHowToJoin from '../public/images/how-to-join.png'; +import styles from '../styles/pages/About.module.scss'; + function About() { const { officers } = data; return ( -
+
-
-
- a picture of acm students at our annual CS BBQ! +
+
+ a picture of acm students at our annual CS BBQ! {/* TODO: use next image without breaking deploy */} -
-
+
+
-
+

What is ACM?

-

As a student chapter of the international Association for Computing Machinery, ACM at UCLA is the largest Computer Science student organization at UCLA and in Southern California. We welcome students of all backgrounds and skill levels to join our community and share our love for technology!

-

With events such as infosessions, workshops, speaker panels, hackathons, and competitions, we cover a variety of topics including artificial intelligence, virtual reality, cybersecurity, mobile and web development, diversity initiatives, community outreach, and much more. Our events are open to everyone, regardless of major or experience!

+

As a student chapter of the international Association for Computing Machinery, ACM at UCLA is the largest Computer Science student organization at UCLA and in Southern California. We welcome students of all backgrounds and skill levels to join our community and share our love for technology!

+

+ With events such as infosessions, workshops, speaker panels, hackathons, and competitions, + we cover a variety of topics including artificial intelligence, virtual reality, cybersecurity, + mobile and web development, diversity initiatives, community outreach, and much more. + Our events are open to everyone, regardless of major or experience! +

-
-
+
+
the logos of all ACM committees
-
+

What are ACM committees?

-

ACM is comprised of eight committees — each serving a different topic and mission. We strive to cover a plethora of interests and encourage members to explore new topics, too!

+

+ ACM is comprised of eight committees — each serving a different topic and mission. + We strive to cover a plethora of interests and encourage members to explore new topics, too! +

-
-
+
+
photos of acm events
-
+

How do I get involved?

-

No matter what your background or major is, we would love to have you at our events and activities!

-

To keep up with what’s happening, we recommend joining our membership portal, our Facebook group, and our weekly newsletter. We will keep you up to date with everything ACM, and earning points on the portal might even earn you a prize!

+

+ No matter what your background or major is, + we would love to have you at our events and activities! +

+

+ To keep up with what’s happening, we recommend joining + + our membership portal + , + + our Facebook group + , and + + our weekly newsletter + . + We will keep you up to date with everything ACM, and earning points on the portal + might even earn you a prize! +

Here’s our social media, where you can see what we’re up to:

- {/* TODO: can we un-inline this? */} -
+
- {/* TODO: can we un-inline this? */} -
+

Leadership

diff --git a/styles/App.scss b/styles/App.scss index c8cc5bb7..9ab7bf7a 100644 --- a/styles/App.scss +++ b/styles/App.scss @@ -25,7 +25,7 @@ /* pages */ @import 'pages/index'; -@import 'pages/about'; +// @import 'pages/about'; @import 'pages/committees'; @import 'pages/events'; @import 'pages/sponsors'; diff --git a/styles/pages/about.scss b/styles/pages/About.module.scss similarity index 66% rename from styles/pages/about.scss rename to styles/pages/About.module.scss index b40cdb04..ca1b6614 100644 --- a/styles/pages/about.scss +++ b/styles/pages/About.module.scss @@ -1,10 +1,12 @@ +@import "../variables.scss"; + .ornament { position: absolute; right: 30px; top: 70px; } -.square-ornament { +.squareOrnament { background: $acm-tint; border-radius: 40px; height: 200px; @@ -12,7 +14,7 @@ width: 200px; } -.image-ornament { +.imageOrnament { max-width: 270px; top: 40px; width: 100%; @@ -22,19 +24,19 @@ } } -.ornament-left { +.ornamentLeft { left: -70px; } -.image-ornament-left { +.imageOrnamentLeft { left: 60px; } -.image-ornament-right { +.imageOrnamentRight { right: 20px; } -.square-splash { +.squareSplash { border-radius: 50px; height: 250px; left: 30px; @@ -43,7 +45,7 @@ width: 250px; } -.square-small { +.squareSmall { background-color: $acm-cobalt; border-radius: 10px; height: 50px; @@ -53,7 +55,7 @@ width: 50px; } -.square-tiny { +.squareTiny { background-color: $acm-cobalt; border-radius: 4px; //Roudning up from 3.6px height: 18px; @@ -63,23 +65,44 @@ width: 18px; } -.about-page .content-section { +.aboutPage .contentSection { + max-width: 800px; + padding: 0 20px; + position: relative; margin: 20px auto 40px; - .text-section { + .textSection { display: inline-block; max-width: 56%; text-align: left; } h1 { + font-size: 2em; + margin: 0; + padding: 20px; line-height: 110%; text-align: left; } + + p { + font-size: 0.8em; + line-height: 150%; + margin: 0 22px 14px; + } +} + +.leadership{ + margin-bottom: 0 !important; //overrides contentSection +} + +.socialMedia{ + display: flex; + justify-content: center; } @media (max-width: 600px) { - .square-ornament { + .squareOrnament { display: block; left: -70px; @@ -88,15 +111,15 @@ right: 0; } - .image-ornament { + .imageOrnament { display: block; left: 0; margin: 0 auto 80px; position: relative; } - .about-page .content-section { - .text-section { + .aboutPage .contentSection { + .textSection { display: inline-block; max-width: 100%; text-align: left;