diff --git a/.eslintrc b/.eslintrc index 683808c3..1e12bae2 100644 --- a/.eslintrc +++ b/.eslintrc @@ -16,8 +16,5 @@ "fragment": "Fragment", "version": "16.2" } - }, - "rules": { - "react/jsx-uses-react": "error" } } diff --git a/_articles/cloud-gov-pages.md b/_articles/cloud-gov-pages.md index b15a0a2e..a24feb2f 100644 --- a/_articles/cloud-gov-pages.md +++ b/_articles/cloud-gov-pages.md @@ -11,7 +11,7 @@ subcategory: Code Login.gov uses [Cloud.gov Pages][cloud-gov-pages] as its hosting provider for our [static sites][static-sites]. By becoming a user of the Login.gov organization in Cloud.gov Pages, you'll have access to build logs and settings configuration for each of our sites. Organization access also allows you to log in on sites which use Netlify CMS ([including this handbook!][handbook-admin]). [cloud-gov-pages]: https://cloud.gov/pages/ -[static-sites]: {% link _articles/github.md %}#static-sites +[static-sites]: {% link _articles/github-gitlab.md %}#static-sites [handbook-admin]: {{ site.baseurl }}/admin/ ## Requesting Access to Cloud.gov Pages diff --git a/_articles/github.md b/_articles/github-gitlab.md similarity index 93% rename from _articles/github.md rename to _articles/github-gitlab.md index a9e84a5e..0b1efb01 100644 --- a/_articles/github.md +++ b/_articles/github-gitlab.md @@ -1,15 +1,18 @@ --- -title: GitHub +title: GitHub & GitLab description: Team code repos, permissions, notification strategies layout: article category: Development subcategory: Code cspell: ignore omniauth +redirect_from: /articles/github.html --- ## Repositories -View a [list of all repositories](https://github.com/topics/login-gov) tagged for Login.gov +View a [list of all repositories](https://github.com/topics/login-gov) tagged for Login.gov. + +Some repositories in GitHub are mirrored from our self-hosted GitLab. ### Applications @@ -69,7 +72,7 @@ View a [list of all repositories](https://github.com/topics/login-gov) tagged fo ### Platform and Infrastructure -- [**`18f/identity-devops`**](https://github.com/18f/identity-devops) +- [**`lg/identity-devops`**](https://gitlab.login.gov/lg/identity-devops) Platform CLI tools, Terraform for infrastructure as code (IaC), Chef for instance (server) provisioning, and so much more! (Too much more?) - [**`18f/identity-devops-private`**](https://github.com/18f/identity-devops-private) @@ -129,9 +132,12 @@ View a [list of all repositories](https://github.com/topics/login-gov) tagged fo Hosted on: [Cloud.gov Pages](https://pages.cloud.gov/)
This handbook! -- [**`18f/identity-handbook-private`**](https://github.com/18f/identity-handbook-private)
- [login-handbook.app.cloud.gov](https://login-handbook.app.cloud.gov/)
- Hosted on: [Cloud.gov](https://dashboard.fr.cloud.gov/)
+- [**`lg-public/identity-internal-handbook`**](https://gitlab.login.gov/lg-public/identity-internal-handbook/)
+ [lg-public.pages.production.gitlab.login.gov/identity-internal-handbook/](https://lg-public.pages.production.gitlab.login.gov/identity-internal-handbook/)
+ Hosted on: GitLab Pages (self-hosted)
+ Internal version of this handbook (Private to Login.gov team only) + +- [**`18f/identity-handbook-private`**](https://github.com/18f/identity-handbook-private){: .deprecated-link} (Archived)
Old, private version of this handbook! (Private to Login.gov team only) ## Permissions diff --git a/_articles/pull-request-review.md b/_articles/pull-request-review.md index 1578e433..6fcafc3f 100644 --- a/_articles/pull-request-review.md +++ b/_articles/pull-request-review.md @@ -19,7 +19,7 @@ for contributions from the Login.gov team (anybody in the [external contributions](#external-contributions) for more information on changes from outside. -[github-repositories]: {% link _articles/github.md %}#repositories +[github-repositories]: {% link _articles/github-gitlab.md %}#repositories - **Who reviews**: at least one member of the engineering team must review and approve a pull request before it can be merged. @@ -37,7 +37,7 @@ changes from outside. author is unavailable, it may be acceptable for another to merge on their behalf. -[github-permissions]: {% link _articles/github.md %}#permissions +[github-permissions]: {% link _articles/github-gitlab.md %}#permissions ## External Contributions @@ -59,4 +59,4 @@ minimize usages of it to absolutely critical changes needed. The handbook's GitHub article includes information about other GitHub features, such as: -- [Running continuous integration outside of a pull request]({% link _articles/github.md %}#running-ci-outside-of-a-pull-request) or [sharing work with other engineers]({% link _articles/github.md %}#sharing-work-with-other-engineers) +- [Running continuous integration outside of a pull request]({% link _articles/github-gitlab.md %}#running-ci-outside-of-a-pull-request) or [sharing work with other engineers]({% link _articles/github-gitlab.md %}#sharing-work-with-other-engineers) diff --git a/_categories/private.md b/_categories/private.md index 9cdc7ab7..62a635f5 100644 --- a/_categories/private.md +++ b/_categories/private.md @@ -3,20 +3,5 @@ title: Private Articles permalink: /private/ layout: article icon: lock +redirect_to: https://lg-public.pages.production.gitlab.login.gov/identity-internal-handbook/ --- -{% if site.env.BRANCH == 'main' %} - {% assign private_handbook_branch = site.env.PRIVATE_HANDBOOK_BRANCH %} -{% else %} - {% assign private_handbook_branch = site.env.PRIVATE_HANDBOOK_BRANCH_PREVIEW %} -{% endif %} -{% assign private_handbook_branch = private_handbook_branch | default: 'main' %} - -
- - diff --git a/_includes/article_url.txt b/_includes/article_url.txt index fe455414..254d2e5c 100644 --- a/_includes/article_url.txt +++ b/_includes/article_url.txt @@ -1,9 +1,13 @@ +{% comment %} +Includes: +- article: page to link to (or directly to its .redirect_to) +{% endcomment %} {%- if include.article.redirect_to -%} - {%- if include.redirect_to contains '://' -%} - {{ article.redirect_to }} + {%- if include.article.redirect_to contains '://' -%} + {{ include.article.redirect_to }} {%- else -%} - {{ article.redirect_to | prepend: site.baseurl }} + {{ include.article.redirect_to | prepend: site.baseurl }} {%- endif -%} {%- else -%} - {{ article.url | prepend: site.baseurl }} + {{ include.article.url | prepend: site.baseurl }} {%- endif -%} diff --git a/_layouts/default.html b/_layouts/default.html index b3695629..cd58afe7 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -25,9 +25,6 @@
-
@@ -45,7 +45,7 @@ to [avoid contributing sensitive information][sensitive-information]. {% for category in site.categories %} -### [{{ category.title }}]({{ category.url | prepend: site.baseurl }}) +### [{{category.title}}]({% include article_url.txt article=category %}) {{ category.description}} diff --git a/package-lock.json b/package-lock.json index 38831411..04d94df8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,24 +11,15 @@ "anchor-js": "^4.2.2", "concurrently": "^8.0.1", "esbuild": "^0.17.15", - "htm": "^3.1.0", - "js-yaml": "^4.1.0", - "marked": "^4.0.12", - "preact": "^10.6.6", - "preact-fetching": "^0.1.0", - "preact-markup": "^2.1.1", "simple-jekyll-search": "^1.10.0" }, "devDependencies": { "@18f/eslint-plugin-identity": "^2.0.0", - "@types/js-yaml": "^4.0.5", - "@types/marked": "^4.0.3", "@typescript-eslint/eslint-plugin": "^5.16.0", "@typescript-eslint/parser": "^5.16.0", "cspell": "^6.28.0", "eslint": "^8.11.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.29.4", "eslint-plugin-react-hooks": "^4.3.0", @@ -232,6 +223,7 @@ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", "dev": true, + "peer": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -244,6 +236,7 @@ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.7.tgz", "integrity": "sha512-TvliGJjhxis5m7xIMvlXH/xG8Oa/LK0SCUCyfKD6nLi42n5fB4WibDJ0g9trmmBB6hwpMNx+Lzbxy9/4gpMaVw==", "dev": true, + "peer": true, "dependencies": { "core-js-pure": "^3.20.2", "regenerator-runtime": "^0.13.4" @@ -1043,12 +1036,6 @@ "node": ">= 8" } }, - "node_modules/@types/js-yaml": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz", - "integrity": "sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==", - "dev": true - }, "node_modules/@types/json-schema": { "version": "7.0.10", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.10.tgz", @@ -1061,12 +1048,6 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, - "node_modules/@types/marked": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.3.tgz", - "integrity": "sha512-HnMWQkLJEf/PnxZIfbm0yGJRRZYYMhb++O9M36UCTA9z53uPvVoSlAwJr3XOpDEryb7Hwl1qAx/MV6YIW1RXxg==", - "dev": true - }, "node_modules/@types/uswds__uswds": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.7.0.tgz", @@ -1404,13 +1385,15 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/aria-query": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", "dev": true, + "peer": true, "dependencies": { "@babel/runtime": "^7.10.2", "@babel/runtime-corejs3": "^7.10.2" @@ -1491,13 +1474,15 @@ "version": "0.0.7", "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", - "dev": true + "dev": true, + "peer": true }, "node_modules/axe-core": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz", "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -1506,7 +1491,8 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", - "dev": true + "dev": true, + "peer": true }, "node_modules/balanced-match": { "version": "1.0.2", @@ -1843,6 +1829,7 @@ "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==", "dev": true, "hasInstallScript": true, + "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" @@ -2215,7 +2202,8 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true + "dev": true, + "peer": true }, "node_modules/date-fns": { "version": "2.29.3", @@ -2328,7 +2316,8 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/error-ex": { "version": "1.3.2", @@ -2638,6 +2627,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz", "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==", "dev": true, + "peer": true, "dependencies": { "@babel/runtime": "^7.16.3", "aria-query": "^4.2.2", @@ -3236,11 +3226,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/htm": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz", - "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q==" - }, "node_modules/ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -3570,6 +3555,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -3629,13 +3615,15 @@ "version": "0.3.21", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz", "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/language-tags": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=", "dev": true, + "peer": true, "dependencies": { "language-subtag-registry": "~0.3.2" } @@ -3919,17 +3907,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/marked": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", - "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==", - "bin": { - "marked": "bin/marked.js" - }, - "engines": { - "node": ">= 12" - } - }, "node_modules/matches-selector": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz", @@ -4272,31 +4249,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/preact": { - "version": "10.6.6", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.6.tgz", - "integrity": "sha512-dgxpTFV2vs4vizwKohYKkk7g7rmp1wOOcfd4Tz3IB3Wi+ivZzsn/SpeKJhRENSE+n8sUfsAl4S3HiCVT923ABw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - } - }, - "node_modules/preact-fetching": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/preact-fetching/-/preact-fetching-0.1.1.tgz", - "integrity": "sha512-i1SwOrkXnco2ZEGkLGc3P80jsn4noG6XT4rlXMA6rfQrGc1SwocHTr8Oxo30twrF+dCK4sAKQKlxY5Wwt0fsSA==", - "peerDependencies": { - "preact": ">=10" - } - }, - "node_modules/preact-markup": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/preact-markup/-/preact-markup-2.1.1.tgz", - "integrity": "sha512-8JL2p36mzK8XkspOyhBxUSPjYwMxDM0L5BWBZWxsZMVW8WsGQrYQDgVuDKkRspt2hwrle+Cxr/053hpc9BJwfw==", - "peerDependencies": { - "preact": ">=10" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -4402,7 +4354,8 @@ "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "dev": true, + "peer": true }, "node_modules/regexp.prototype.flags": { "version": "1.4.1", @@ -5556,6 +5509,7 @@ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz", "integrity": "sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==", "dev": true, + "peer": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -5565,6 +5519,7 @@ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.7.tgz", "integrity": "sha512-TvliGJjhxis5m7xIMvlXH/xG8Oa/LK0SCUCyfKD6nLi42n5fB4WibDJ0g9trmmBB6hwpMNx+Lzbxy9/4gpMaVw==", "dev": true, + "peer": true, "requires": { "core-js-pure": "^3.20.2", "regenerator-runtime": "^0.13.4" @@ -6130,12 +6085,6 @@ "fastq": "^1.6.0" } }, - "@types/js-yaml": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz", - "integrity": "sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==", - "dev": true - }, "@types/json-schema": { "version": "7.0.10", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.10.tgz", @@ -6148,12 +6097,6 @@ "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, - "@types/marked": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.3.tgz", - "integrity": "sha512-HnMWQkLJEf/PnxZIfbm0yGJRRZYYMhb++O9M36UCTA9z53uPvVoSlAwJr3XOpDEryb7Hwl1qAx/MV6YIW1RXxg==", - "dev": true - }, "@types/uswds__uswds": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/@types/uswds__uswds/-/uswds__uswds-3.7.0.tgz", @@ -6360,13 +6303,15 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "aria-query": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", "dev": true, + "peer": true, "requires": { "@babel/runtime": "^7.10.2", "@babel/runtime-corejs3": "^7.10.2" @@ -6423,19 +6368,22 @@ "version": "0.0.7", "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", - "dev": true + "dev": true, + "peer": true }, "axe-core": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.1.tgz", "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==", - "dev": true + "dev": true, + "peer": true }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", - "dev": true + "dev": true, + "peer": true }, "balanced-match": { "version": "1.0.2", @@ -6667,7 +6615,8 @@ "version": "3.21.1", "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz", "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==", - "dev": true + "dev": true, + "peer": true }, "core-util-is": { "version": "1.0.3", @@ -6931,7 +6880,8 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true + "dev": true, + "peer": true }, "date-fns": { "version": "2.29.3", @@ -7008,7 +6958,8 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "dev": true, + "peer": true }, "error-ex": { "version": "1.3.2", @@ -7258,6 +7209,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz", "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==", "dev": true, + "peer": true, "requires": { "@babel/runtime": "^7.16.3", "aria-query": "^4.2.2", @@ -7687,11 +7639,6 @@ "has-symbols": "^1.0.2" } }, - "htm": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz", - "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q==" - }, "ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -7924,6 +7871,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -7974,13 +7922,15 @@ "version": "0.3.21", "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz", "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==", - "dev": true + "dev": true, + "peer": true }, "language-tags": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=", "dev": true, + "peer": true, "requires": { "language-subtag-registry": "~0.3.2" } @@ -8120,11 +8070,6 @@ "semver": "^6.0.0" } }, - "marked": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", - "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==" - }, "matches-selector": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz", @@ -8372,23 +8317,6 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, - "preact": { - "version": "10.6.6", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.6.tgz", - "integrity": "sha512-dgxpTFV2vs4vizwKohYKkk7g7rmp1wOOcfd4Tz3IB3Wi+ivZzsn/SpeKJhRENSE+n8sUfsAl4S3HiCVT923ABw==" - }, - "preact-fetching": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/preact-fetching/-/preact-fetching-0.1.1.tgz", - "integrity": "sha512-i1SwOrkXnco2ZEGkLGc3P80jsn4noG6XT4rlXMA6rfQrGc1SwocHTr8Oxo30twrF+dCK4sAKQKlxY5Wwt0fsSA==", - "requires": {} - }, - "preact-markup": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/preact-markup/-/preact-markup-2.1.1.tgz", - "integrity": "sha512-8JL2p36mzK8XkspOyhBxUSPjYwMxDM0L5BWBZWxsZMVW8WsGQrYQDgVuDKkRspt2hwrle+Cxr/053hpc9BJwfw==", - "requires": {} - }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -8462,7 +8390,8 @@ "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "dev": true, + "peer": true }, "regexp.prototype.flags": { "version": "1.4.1", diff --git a/package.json b/package.json index 039bfd53..a3360f58 100644 --- a/package.json +++ b/package.json @@ -6,24 +6,15 @@ "anchor-js": "^4.2.2", "concurrently": "^8.0.1", "esbuild": "^0.17.15", - "htm": "^3.1.0", - "js-yaml": "^4.1.0", - "marked": "^4.0.12", - "preact": "^10.6.6", - "preact-fetching": "^0.1.0", - "preact-markup": "^2.1.1", "simple-jekyll-search": "^1.10.0" }, "devDependencies": { "@18f/eslint-plugin-identity": "^2.0.0", - "@types/js-yaml": "^4.0.5", - "@types/marked": "^4.0.3", "@typescript-eslint/eslint-plugin": "^5.16.0", "@typescript-eslint/parser": "^5.16.0", "cspell": "^6.28.0", "eslint": "^8.11.0", "eslint-plugin-import": "^2.25.4", - "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.29.4", "eslint-plugin-react-hooks": "^4.3.0", @@ -45,7 +36,7 @@ "watch": "concurrently npm:watch:*", "prestart": "npm run clean:js", "start": "npm run watch", - "lint": "eslint assets/js --ext .js,.jsx,.ts,.tsx", + "lint": "eslint assets/js --ext .js,.ts", "typecheck": "tsc", "pages": "npm run build" } diff --git a/tsconfig.json b/tsconfig.json index ed8440ce..d806d803 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,13 +3,11 @@ "strict": true, "esModuleInterop": true, "noEmit": true, - "jsx": "react-jsx", - "jsxImportSource": "preact", "baseUrl": ".", "paths": { "*": ["assets/js/typings/*"] }, - "lib": ["ES2020"] + "lib": ["ES2020", "DOM"] }, "include": ["assets/js/*"] }