From 2290276e65a44955a41b9155e42915ab1c8621a8 Mon Sep 17 00:00:00 2001 From: Shaun Warman Date: Sat, 18 Apr 2020 01:05:26 -0500 Subject: [PATCH 1/2] fix: cleanup views --- template/app/views/layout.pug | 15 +++------------ template/app/views/my-account/security.pug | 4 ++-- template/package.json | 2 +- template/yarn.lock | 8 ++++---- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/template/app/views/layout.pug b/template/app/views/layout.pug index 4a6a28b7..13cff1bd 100644 --- a/template/app/views/layout.pug +++ b/template/app/views/layout.pug @@ -126,19 +126,10 @@ html(lang=locale).h-100 script(src=`https://polyfill.io/v3/polyfill${config.env === 'production' ? '.min' : ''}.js?features=${polyfills.join(',')}`) //- factor bundle (common shared assets across all files) - if config.env === 'production' - script(src=manifest('factor-bundle.js') integrity=manifest('factor-bundle.js', 'integrity')) - else - script(src=manifest('factor-bundle.js')) + script(src=manifest('factor-bundle.js') integrity=manifest('factor-bundle.js', 'integrity')) //- uncaught (handles errors, similar to TraceKit but with CabinJS + StackTrace.JS) - if config.env === 'production' - script(src=manifest('uncaught.js') integrity=manifest('uncaught.js', 'integrity')) - else - script(src=manifest('uncaught.js')) + script(src=manifest('uncaught.js') integrity=manifest('uncaught.js', 'integrity')) //- scripts - if config.env === 'production' - script(src=manifest('core.js') integrity=manifest('core.js', 'integrity')) - else - script(src=manifest('core.js')) + script(src=manifest('core.js') integrity=manifest('core.js', 'integrity')) diff --git a/template/app/views/my-account/security.pug b/template/app/views/my-account/security.pug index d0020bf4..c9ef58de 100644 --- a/template/app/views/my-account/security.pug +++ b/template/app/views/my-account/security.pug @@ -35,8 +35,8 @@ block body = t('Copy') .modal-footer .form-check - input#recovery-keys-stored(type='checkbox', name="recovery-keys-stored", value='true' data-toggle='collapse' data-target='#recovery-key-submit') - label(for='recovery-keys-stored')= t('I have stored these recovery keys in a safe place') + input#recovery-keys-stored(type='checkbox', name="recovery-keys-stored", value='true' data-toggle='collapse' data-target='#recovery-key-submit').form-check-input + label(for='recovery-keys-stored').form-check-label= t('I have stored these recovery keys in a safe place') #recovery-key-submit.collapse button(data-toggle='modal', data-target='#modal-enable-2fa-verify', data-dismiss='modal', type='button').btn.btn-primary.btn-lg.float-right= t('Continue') #modal-enable-2fa-verify(tabindex='-1', role='dialog').modal.fade diff --git a/template/package.json b/template/package.json index 7b0d03e5..978ca184 100644 --- a/template/package.json +++ b/template/package.json @@ -83,7 +83,7 @@ "koa-views-render": "^0.0.1", "lodash": "^4.17.15", "mandarin": "^2.0.3", - "manifest-rev": "^1.0.0", + "manifest-rev": "^1.0.2", "markdown-it": "^10.0.0", "markdown-it-emoji": "^1.4.0", "markdown-it-github-headings": "^2.0.0", diff --git a/template/yarn.lock b/template/yarn.lock index 1d51028f..031f3945 100644 --- a/template/yarn.lock +++ b/template/yarn.lock @@ -10564,10 +10564,10 @@ mandarin@^2.0.3: remark-textr "^3.0.4" rev-hash "^3.0.0" -manifest-rev@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/manifest-rev/-/manifest-rev-1.0.0.tgz#8556b527db0c663f308c04fbb6a46d35ef35148e" - integrity sha512-yQVITfe4FIaOVpVvdOlrAojeNygJrxEOb8yEAOsAY5JASsmLfvwQMFKdF9kBVLWgD05sUViB9gAlPTBTO30Z9A== +manifest-rev@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/manifest-rev/-/manifest-rev-1.0.2.tgz#b0bfa8c6f3d4ff881d9a19f7e08cd17c090d2abf" + integrity sha512-bZIXwhhK59+u9gXtfYzxQpyte14bWf3YIhC1PDY5N+bM0Tfh0XkTx3cFR/9d2BsYHi/aRPSmVTOoytHOYBKEvQ== map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" From 6be4dc360952c950dfdd392c3f213a01c38a0184 Mon Sep 17 00:00:00 2001 From: Shaun Warman Date: Sat, 18 Apr 2020 01:28:58 -0500 Subject: [PATCH 2/2] chore: clean up lint-staged config --- .lintstagedrc.js | 8 ++++++++ package.json | 16 +--------------- template/package.json | 12 +----------- template/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 5 files changed, 18 insertions(+), 34 deletions(-) create mode 100644 .lintstagedrc.js diff --git a/.lintstagedrc.js b/.lintstagedrc.js new file mode 100644 index 00000000..cce0c1b9 --- /dev/null +++ b/.lintstagedrc.js @@ -0,0 +1,8 @@ +module.exports = { + "*.md,!test/snapshots/**/*.md,!test/**/snapshots/**/*.md,!locales/README.md": [ + filenames => filenames.map(filename => `remark ${filename} -qfo`), + 'git add' + ], + 'package.json': ['fixpack', 'git add'], + '*.js': ['xo --fix', 'git add '] +}; diff --git a/package.json b/package.json index b95cffdb..4d1bf17a 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "eslint-config-xo-lass": "^1.0.3", "eslint-plugin-compat": "^3.5.1", "husky": "^3.1.0", - "lint-staged": "^10.1.3", + "lint-staged": "^10.1.4", "nyc": "^15.0.1", "remark-cli": "^8.0.0", "remark-preset-github": "^1.0.0", @@ -95,20 +95,6 @@ "yeoman" ], "license": "MIT", - "lint-staged": { - "*.js": [ - "xo --fix", - "git add" - ], - "*.md,!test/snapshots/**/*.md,!template/test/snapshots/**/*.md,!template/test/**/*snapshots/**/*.md,!template/README.md,!template/locales/README.md": [ - "remark . -qfo", - "git add" - ], - "package.json": [ - "fixpack", - "git add" - ] - }, "main": "sao.js", "nyc": { "reporter": [ diff --git a/template/package.json b/template/package.json index 978ca184..fb2e8789 100644 --- a/template/package.json +++ b/template/package.json @@ -162,7 +162,7 @@ "gulp-xo": "^0.24.0", "husky": "^4.2.3", "imagemin-pngquant": "^8.0.0", - "lint-staged": "^10.1.3", + "lint-staged": "10.1.1", "make-dir": "^3.0.2", "ms": "^2.1.2", "node-sass": "^4.13.1", @@ -204,16 +204,6 @@ "lass" ], "license": "Unlicensed", - "lint-staged": { - "*.md,!test/snapshots/**/*.md,!test/**/snapshots/**/*.md,!locales/README.md": [ - "remark . -qfo", - "git add" - ], - "package.json": [ - "fixpack", - "git add" - ] - }, "main": "index.js", "nodemonConfig": { "ignore": [ diff --git a/template/yarn.lock b/template/yarn.lock index 031f3945..f22dcdd3 100644 --- a/template/yarn.lock +++ b/template/yarn.lock @@ -9878,10 +9878,10 @@ linkify-it@2.2.0, linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -lint-staged@^10.1.3: - version "10.1.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.3.tgz#da27713d3ac519da305381b4de87d5f866b1d2f1" - integrity sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ== +lint-staged@10.1.1: + version "10.1.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.1.tgz#1c8569b66d684e6e3553cd760c03053f41fca152" + integrity sha512-wAeu/ePaBAOfwM2+cVbgPWDtn17B0Sxiv0NvNEqDAIvB8Yhvl60vafKFiK4grcYn87K1iK+a0zVoETvKbdT9/Q== dependencies: chalk "^3.0.0" commander "^4.0.1" diff --git a/yarn.lock b/yarn.lock index 6d1f4583..15a26cdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4395,10 +4395,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^10.1.3: - version "10.1.3" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.3.tgz#da27713d3ac519da305381b4de87d5f866b1d2f1" - integrity sha512-o2OkLxgVns5RwSC5QF7waeAjJA5nz5gnUfqL311LkZcFipKV7TztrSlhNUK5nQX9H0E5NELAdduMQ+M/JPT7RQ== +lint-staged@^10.1.4: + version "10.1.4" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.1.4.tgz#c0e0930ed5568ada2a7fbd9d300318c87803a4b0" + integrity sha512-bFfQE6U8LASGKANl+JSN8nfL9Id6vq2YmWMgkynvmicMVQFR11OFU8lqcnI1y0fsPr3PwHa6xeMCh+SWB8TPkg== dependencies: chalk "^3.0.0" commander "^4.0.1"