diff --git a/assets/styles/nvrf.scss b/assets/styles/nvrf.scss index fcf4af680..12f98ded8 100644 --- a/assets/styles/nvrf.scss +++ b/assets/styles/nvrf.scss @@ -50,3 +50,7 @@ overflow: hidden; } } + +#touchpoints-form-embed .fba-modal-dialog { + margin: 0; +} diff --git a/content/en/nvrf-test/index.html b/content/en/national-voter-registration-form/index.html similarity index 100% rename from content/en/nvrf-test/index.html rename to content/en/national-voter-registration-form/index.html diff --git a/gulp/nvrf.js b/gulp/nvrf.js index b1b5c4ff4..a371a2f63 100644 --- a/gulp/nvrf.js +++ b/gulp/nvrf.js @@ -2,7 +2,7 @@ var gulp = require('gulp'); var log = require('fancy-log'); var colors = require('ansi-colors'); -var destPagePath = 'nvrf-test'; +var destPagePath = 'national-voter-registration-form'; gulp.task('nvrf-assets', function () { var stream = gulp.src([ diff --git a/package-lock.json b/package-lock.json index b38a73641..4f25dfb55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "sass": "^1.56.1", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.3.0" + "vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.4.0" }, "devDependencies": { "axe-core": "^4.5.2", @@ -7269,6 +7269,14 @@ "node": ">= 0.10" } }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", @@ -10043,6 +10051,25 @@ "react": "^18.2.0" } }, + "node_modules/react-fast-compare": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", + "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" + }, + "node_modules/react-helmet-async": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-2.0.4.tgz", + "integrity": "sha512-yxjQMWposw+akRfvpl5+8xejl4JtUlHnEBcji6u8/e6oc7ozT+P9PNTWMhCbz2y9tc5zPegw2BvKjQA+NwdEjQ==", + "dependencies": { + "invariant": "^2.2.4", + "react-fast-compare": "^3.2.2", + "shallowequal": "^1.1.0" + }, + "peerDependencies": { + "react": "^16.6.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.6.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-refresh": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", @@ -10981,6 +11008,11 @@ "sha.js": "bin.js" } }, + "node_modules/shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, "node_modules/shasum-object": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", @@ -13200,9 +13232,9 @@ } }, "node_modules/vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz", + "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -13273,18 +13305,19 @@ }, "node_modules/vote-gov-nvrf-app": { "version": "0.1.0", - "resolved": "git+ssh://git@github.com/usagov/vote-gov-nvrf-app.git#6a6f70e0cda8b0b7beb0de91af28bc657c473aea", + "resolved": "git+ssh://git@github.com/usagov/vote-gov-nvrf-app.git#1a3415d7459d2a98e81f968c9bf5e53e81f1d98e", "hasInstallScript": true, "dependencies": { "@trussworks/react-uswds": "^4.2.1", - "@types/react": "^18.0.37", - "@types/react-dom": "^18.0.11", - "@vitejs/plugin-react": "^4.0.0", + "@types/react": "^18.2.36", + "@types/react-dom": "^18.2.14", + "@vitejs/plugin-react": "^4.1.1", "dompurify": "^3.0.6", "pdf-lib": "^1.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "vite": "^4.3.9" + "react-helmet-async": "^2.0.4", + "vite": "^4.5.0" } }, "node_modules/vote-gov-nvrf-app/node_modules/@trussworks/react-uswds": { @@ -18960,6 +18993,14 @@ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "requires": { + "loose-envify": "^1.0.0" + } + }, "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", @@ -21002,6 +21043,21 @@ "scheduler": "^0.23.0" } }, + "react-fast-compare": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", + "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" + }, + "react-helmet-async": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-2.0.4.tgz", + "integrity": "sha512-yxjQMWposw+akRfvpl5+8xejl4JtUlHnEBcji6u8/e6oc7ozT+P9PNTWMhCbz2y9tc5zPegw2BvKjQA+NwdEjQ==", + "requires": { + "invariant": "^2.2.4", + "react-fast-compare": "^3.2.2", + "shallowequal": "^1.1.0" + } + }, "react-refresh": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", @@ -21698,6 +21754,11 @@ "safe-buffer": "^5.0.1" } }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, "shasum-object": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", @@ -23406,9 +23467,9 @@ } }, "vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.1.tgz", + "integrity": "sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==", "requires": { "esbuild": "^0.18.10", "fsevents": "~2.3.2", @@ -23430,18 +23491,19 @@ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, "vote-gov-nvrf-app": { - "version": "git+ssh://git@github.com/usagov/vote-gov-nvrf-app.git#6a6f70e0cda8b0b7beb0de91af28bc657c473aea", - "from": "vote-gov-nvrf-app@github:usagov/vote-gov-nvrf-app#v0.3.0", + "version": "git+ssh://git@github.com/usagov/vote-gov-nvrf-app.git#1a3415d7459d2a98e81f968c9bf5e53e81f1d98e", + "from": "vote-gov-nvrf-app@github:usagov/vote-gov-nvrf-app#v0.4.0", "requires": { "@trussworks/react-uswds": "^4.2.1", - "@types/react": "^18.0.37", - "@types/react-dom": "^18.0.11", - "@vitejs/plugin-react": "^4.0.0", + "@types/react": "^18.2.36", + "@types/react-dom": "^18.2.14", + "@vitejs/plugin-react": "^4.1.1", "dompurify": "^3.0.6", "pdf-lib": "^1.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "vite": "^4.3.9" + "react-helmet-async": "^2.0.4", + "vite": "^4.5.0" }, "dependencies": { "@trussworks/react-uswds": { diff --git a/package.json b/package.json index 2690ac8c3..a573c468a 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "sass": "^1.56.1", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.3.0" + "vote-gov-nvrf-app": "github:usagov/vote-gov-nvrf-app#v0.4.0" }, "devDependencies": { "axe-core": "^4.5.2",