diff --git a/Gruntfile.js b/Gruntfile.js index 1cdbb9cd6..85780b473 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -14,26 +14,13 @@ module.exports = grunt => { sourceMap: true, importer: importOnce, }, - dev: { + + dist: { files: { 'stylesheets/manifest.css': 'stylesheets/manifest.scss', }, }, }, - watch: { - protobuf: { - files: ['./protos/SignalService.proto'], - tasks: ['exec:build-protobuf'], - }, - sass: { - files: ['./stylesheets/*.scss'], - tasks: ['sass'], - }, - transpile: { - files: ['./ts/**/*.ts', './ts/**/*.tsx', './ts/**/**/*.tsx', './test/ts/**.ts'], - tasks: ['exec:transpile'], - }, - }, exec: { transpile: { cmd: 'yarn transpile', @@ -75,12 +62,11 @@ module.exports = grunt => { updateLocalConfig({ commitHash: hash }); }); - grunt.registerTask('dev', ['default', 'watch']); grunt.registerTask('date', ['gitinfo']); grunt.registerTask('default', [ 'exec:build-protobuf', - 'exec:transpile', 'sass', + 'exec:transpile', 'date', 'getCommitHash', ]); diff --git a/background.html b/background.html index 2ee89ec0d..f833c1ee8 100644 --- a/background.html +++ b/background.html @@ -26,9 +26,6 @@ Session - @@ -40,9 +37,6 @@ - diff --git a/debug_log.html b/debug_log.html index a2ae79656..2620a303c 100644 --- a/debug_log.html +++ b/debug_log.html @@ -15,17 +15,10 @@ style-src 'self' 'unsafe-inline';" /> - -
- diff --git a/debug_log_preload.js b/debug_log_preload.js index 4fa7f0fc8..b467cc8cf 100644 --- a/debug_log_preload.js +++ b/debug_log_preload.js @@ -2,7 +2,9 @@ const { ipcRenderer } = require('electron'); const url = require('url'); + const i18n = require('./ts/util/i18n'); + const config = url.parse(window.location.toString(), true).query; const { locale } = config; const localeMessages = ipcRenderer.sendSync('locale-data'); diff --git a/stylesheets/_session_password.scss b/stylesheets/_session_password.scss index e55a192d9..4236bcdc4 100644 --- a/stylesheets/_session_password.scss +++ b/stylesheets/_session_password.scss @@ -40,7 +40,6 @@ background-color: rgba($session-color-primary, 0.3); } padding: $session-margin-xs $session-margin-sm; - font-size: $session-font-xs; text-align: center; } } diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss index f9baf5c70..2001c4f37 100644 --- a/stylesheets/manifest.scss +++ b/stylesheets/manifest.scss @@ -47,3 +47,5 @@ @import 'session_slider'; @import 'session_conversation'; + +@import '_session_password'; diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx index 5b5333e44..e6be77136 100644 --- a/ts/components/SessionPasswordPrompt.tsx +++ b/ts/components/SessionPasswordPrompt.tsx @@ -86,17 +86,19 @@ class SessionPasswordPromptInner extends React.PureComponent<{}, State> { ); return ( -
-
-
- {infoIcon} - -

{infoTitle}

+
+
+
+
+ {infoIcon} + +

{infoTitle}

+
+ + {featureElement} + {errorSection} + {buttonGroup}
- - {featureElement} - {errorSection} - {buttonGroup}
); diff --git a/ts/mains/about_start.ts b/ts/mains/about_start.ts index c435a1c98..3a3d95ab7 100644 --- a/ts/mains/about_start.ts +++ b/ts/mains/about_start.ts @@ -16,6 +16,7 @@ global.setTimeout(() => { states.push(window.getAppInstance()); } if (version) { + // tslint:disable: no-inner-html version.innerHTML = `v${window.getVersion()}`; } diff --git a/ts/node/config.ts b/ts/node/config.ts index 5890f8dc9..2b142d6cb 100644 --- a/ts/node/config.ts +++ b/ts/node/config.ts @@ -32,8 +32,9 @@ if (environment === 'production') { // We load config after we've made our modifications to NODE_ENV //tslint-disable no-require-imports no-var-requires +// tslint:disable-next-line: no-require-imports no-var-requires const c = require('config'); -(c as any).environment = environment; +c.environment = environment; // Log resulting env vars in use by config ['NODE_ENV', 'NODE_APP_INSTANCE', 'NODE_CONFIG_DIR', 'NODE_CONFIG'].forEach(s => { diff --git a/ts/node/encrypt_attachment_buffer.ts b/ts/node/encrypt_attachment_buffer.ts index e3b067408..cce492e72 100644 --- a/ts/node/encrypt_attachment_buffer.ts +++ b/ts/node/encrypt_attachment_buffer.ts @@ -53,6 +53,7 @@ export async function encryptAttachmentBufferNode( ); //tslint-disable restrict-plus-operands + // tslint:disable-next-line: restrict-plus-operands const encryptedBufferWithHeader = new Uint8Array(bufferOut.length + header.length); encryptedBufferWithHeader.set(header); encryptedBufferWithHeader.set(bufferOut, header.length); diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts index 28e30eb1e..d6d7dbc6a 100644 --- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts +++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts @@ -3,6 +3,7 @@ import { beforeEach } from 'mocha'; import Sinon from 'sinon'; import * as DecryptedAttachmentsManager from '../../../../session/crypto/DecryptedAttachmentsManager'; import { TestUtils } from '../../../test-utils'; +// tslint:disable: chai-vague-errors no-unused-expression describe('DecryptedAttachmentsManager', () => { // tslint:disable-next-line: no-empty @@ -49,7 +50,7 @@ describe('DecryptedAttachmentsManager', () => { beforeEach(() => { readFileContent = Sinon.stub(DecryptedAttachmentsManager, 'readFileContent').resolves( - Buffer.from(new String('this is a test')) + Buffer.from('this is a test') ); getItemById = TestUtils.stubDataItem('getItemById') .withArgs('local_attachment_encrypted_key') @@ -133,7 +134,7 @@ describe('DecryptedAttachmentsManager', () => { expect(resolved2.startsWith(now2.slice(0, 9))).to.be.true; }); }); - }); + }); // tslint:disable: no-empty it.skip('cleanUpOldDecryptedMedias', () => {}); it.skip('getDecryptedBlob', () => {}); diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts index 34440afbf..6f96ae0a7 100644 --- a/ts/test/test-utils/utils/stubbing.ts +++ b/ts/test/test-utils/utils/stubbing.ts @@ -33,7 +33,8 @@ export function stubUtilWorker(fnName: string, returnedValue: any): sinon.SinonS } export function stubCreateObjectUrl() { (global as any).URL = {}; - (global as any).URL.createObjectURL = function() { + (global as any).URL.createObjectURL = () => { + // tslint:disable-next-line: insecure-random return `${Date.now()}:${Math.floor(Math.random() * 1000)}`; }; } diff --git a/ts/test/types/initializeAttachmentMetadata_test.ts b/ts/test/types/initializeAttachmentMetadata_test.ts index 7e03185e4..e8c126370 100644 --- a/ts/test/types/initializeAttachmentMetadata_test.ts +++ b/ts/test/types/initializeAttachmentMetadata_test.ts @@ -6,6 +6,7 @@ import { hasVisualMediaAttachmentInMessage, } from '../../types/message/initializeAttachmentMetadata'; import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../test-utils/utils'; +// tslint:disable: chai-vague-errors no-unused-expression // tslint:disable-next-line: max-func-body-length describe('initializeAttachmentMetadata', () => { @@ -16,7 +17,7 @@ describe('initializeAttachmentMetadata', () => { it('no attachments should return false', () => { const msgModel = generateFakeIncomingPrivateMessage(); - expect(hasFileAttachmentInMessage(msgModel)).to.be.false; + expect(hasFileAttachmentInMessage(msgModel)).to.be.eq(false); }); it('empty list attachments should return false', () => { @@ -203,81 +204,81 @@ describe('initializeAttachmentMetadata', () => { }); describe('getAttachmentMetadata', () => { - it('no attachments should return false x3', async () => { + it('no attachments should return false x3', () => { const msgModel = generateFakeIncomingPrivateMessage(); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(0); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('empty attachments [] should return false x3', async () => { + it('empty attachments [] should return false x3', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', []); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(0); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('has one image attachment only', async () => { + it('has one image attachment only', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: 'image/jpeg' }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(1); }); - it('has two image attachment only', async () => { + it('has two image attachment only', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: 'image/jpeg' }, { contentType: 'image/jpeg' }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(1); }); - it('has one audio attachment only', async () => { + it('has one audio attachment only', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: 'audio/mp3' }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('has one file attachment only', async () => { + it('has one file attachment only', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: 'whatever' }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(1); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('has two file attachment only', async () => { + it('has two file attachment only', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: 'whatever' }, { contentType: 'whatever' }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(1); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('has two attachments with undefined contenttype', async () => { + it('has two attachments with undefined contenttype', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: undefined }, { contentType: undefined }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(0); expect(mt.hasVisualMediaAttachments).to.be.eq(0); }); - it('has two attachments with null contenttype', async () => { + it('has two attachments with null contenttype', () => { const msgModel = generateFakeIncomingPrivateMessage(); msgModel.set('attachments', [{ contentType: null }, { contentType: null }]); - const mt = await getAttachmentMetadata(msgModel); + const mt = getAttachmentMetadata(msgModel); expect(mt.hasAttachments).to.be.eq(1); expect(mt.hasFileAttachments).to.be.eq(1); expect(mt.hasVisualMediaAttachments).to.be.eq(0); diff --git a/ts/views/DebugLogView.tsx b/ts/views/DebugLogView.tsx index d1ba8d940..5c31a6102 100644 --- a/ts/views/DebugLogView.tsx +++ b/ts/views/DebugLogView.tsx @@ -11,6 +11,7 @@ const StyledContent = styled.div` const DebugLogTextArea = (props: { content: string }) => { console.warn('DebugLogTextArea ', props.content); + // tslint:disable-next-line: react-a11y-input-elements return