Skip to content

chore: cleanup views and lint config #383

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 18, 2020
Merged

chore: cleanup views and lint config #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2290276
fix: cleanup views
shaunwarman Apr 18, 2020
6be4dc3
chore: clean up lint-staged config
shaunwarman Apr 18, 2020
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
8 changes: 8 additions & 0 deletions .lintstagedrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ']
};
16 changes: 1 addition & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down
15 changes: 3 additions & 12 deletions template/app/views/layout.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
4 changes: 2 additions & 2 deletions template/app/views/my-account/security.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 2 additions & 12 deletions template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down
16 changes: 8 additions & 8 deletions template/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down