Introduce React/TypeScript/TSLint into app for new UI components
npm run transpile Works on files under js/react/ Outputs files right next to the .tsx file This is part of our `grunt dev` task, as well as the default grunt task, which does everything else necessary to get a raw git checkout ready to run.
This commit is contained in:
parent
f86a6ef752
commit
893fb1cb9e
|
@ -7,13 +7,16 @@ libtextsecure/**
|
||||||
# these aren't ready yet, pulling files in one-by-one
|
# these aren't ready yet, pulling files in one-by-one
|
||||||
js/*.js
|
js/*.js
|
||||||
js/models/**/*.js
|
js/models/**/*.js
|
||||||
js/react/**/*.js
|
|
||||||
js/views/**/*.js
|
js/views/**/*.js
|
||||||
test/*.js
|
test/*.js
|
||||||
test/models/*.js
|
test/models/*.js
|
||||||
test/views/*.js
|
test/views/*.js
|
||||||
/*.js
|
/*.js
|
||||||
|
|
||||||
|
# typescript-generated files
|
||||||
|
js/react/**/*.js
|
||||||
|
|
||||||
|
|
||||||
# ES2015+ files
|
# ES2015+ files
|
||||||
!js/background.js
|
!js/background.js
|
||||||
!js/backup.js
|
!js/backup.js
|
||||||
|
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -22,3 +22,6 @@ js/libtextsecure.js
|
||||||
stylesheets/*.css
|
stylesheets/*.css
|
||||||
test/test.js
|
test/test.js
|
||||||
libtextsecure/test/test.js
|
libtextsecure/test/test.js
|
||||||
|
|
||||||
|
# React / TypeScript
|
||||||
|
js/react/**/*.js
|
||||||
|
|
14
Gruntfile.js
14
Gruntfile.js
|
@ -108,6 +108,7 @@ module.exports = function(grunt) {
|
||||||
'!js/backup.js',
|
'!js/backup.js',
|
||||||
'!js/modules/**/*.js',
|
'!js/modules/**/*.js',
|
||||||
'!js/views/conversation_search_view.js',
|
'!js/views/conversation_search_view.js',
|
||||||
|
'!js/react/**/*.js',
|
||||||
'!js/views/debug_log_view.js',
|
'!js/views/debug_log_view.js',
|
||||||
'!js/signal_protocol_store.js',
|
'!js/signal_protocol_store.js',
|
||||||
'!js/database.js',
|
'!js/database.js',
|
||||||
|
@ -162,6 +163,7 @@ module.exports = function(grunt) {
|
||||||
'!js/libsignal-protocol-worker.js',
|
'!js/libsignal-protocol-worker.js',
|
||||||
'!js/components.js',
|
'!js/components.js',
|
||||||
'!js/modules/**/*.js',
|
'!js/modules/**/*.js',
|
||||||
|
'!js/react/**/*.js',
|
||||||
'test/**/*.js',
|
'test/**/*.js',
|
||||||
'!test/blanket_mocha.js',
|
'!test/blanket_mocha.js',
|
||||||
'!test/modules/**/*.js',
|
'!test/modules/**/*.js',
|
||||||
|
@ -190,10 +192,17 @@ module.exports = function(grunt) {
|
||||||
files: ['<%= jscs.all.src %>'],
|
files: ['<%= jscs.all.src %>'],
|
||||||
tasks: ['jscs']
|
tasks: ['jscs']
|
||||||
},
|
},
|
||||||
|
transpile: {
|
||||||
|
files: ['./js/react/**/*.js'],
|
||||||
|
tasks: ['exec:transpile']
|
||||||
|
}
|
||||||
},
|
},
|
||||||
exec: {
|
exec: {
|
||||||
'tx-pull': {
|
'tx-pull': {
|
||||||
cmd: 'tx pull'
|
cmd: 'tx pull'
|
||||||
|
},
|
||||||
|
'transpile': {
|
||||||
|
cmd: 'npm run transpile',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'test-release': {
|
'test-release': {
|
||||||
|
@ -477,5 +486,8 @@ module.exports = function(grunt) {
|
||||||
grunt.registerTask('copy_dist', ['gitinfo', 'copy:res', 'copy:src']);
|
grunt.registerTask('copy_dist', ['gitinfo', 'copy:res', 'copy:src']);
|
||||||
grunt.registerTask('date', ['gitinfo', 'getExpireTime']);
|
grunt.registerTask('date', ['gitinfo', 'getExpireTime']);
|
||||||
grunt.registerTask('prep-release', ['gitinfo', 'clean-release', 'fetch-release']);
|
grunt.registerTask('prep-release', ['gitinfo', 'clean-release', 'fetch-release']);
|
||||||
grunt.registerTask('default', ['concat', 'copy:deps', 'sass', 'date']);
|
grunt.registerTask(
|
||||||
|
'default',
|
||||||
|
['concat', 'copy:deps', 'sass', 'date', 'exec:transpile']
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
38
js/react/sub/test2.tsx
Normal file
38
js/react/sub/test2.tsx
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
interface IProps { name: string; }
|
||||||
|
|
||||||
|
interface IState { count: number; }
|
||||||
|
|
||||||
|
|
||||||
|
const items = [
|
||||||
|
'one',
|
||||||
|
'two',
|
||||||
|
'three',
|
||||||
|
'four',
|
||||||
|
];
|
||||||
|
|
||||||
|
export class InlineReply extends React.Component<IProps, IState> {
|
||||||
|
constructor(props: IProps) {
|
||||||
|
super(props);
|
||||||
|
|
||||||
|
this.state = {
|
||||||
|
count: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public render() {
|
||||||
|
const { name } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
This is a basic component. Hi there, {name}!
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function greeter2(person: any) {
|
||||||
|
// console.log(items);
|
||||||
|
return `Hello, ${person}`;
|
||||||
|
}
|
7
js/react/test.ts
Normal file
7
js/react/test.ts
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
import { InlineReply } from './sub/test2';
|
||||||
|
|
||||||
|
// console.log(InlineReply);
|
||||||
|
|
||||||
|
export function greeter(person: any) {
|
||||||
|
return 'Hello, ' + person;
|
||||||
|
}
|
13
package.json
13
package.json
|
@ -41,6 +41,9 @@
|
||||||
"test-server": "mocha --recursive test/server",
|
"test-server": "mocha --recursive test/server",
|
||||||
"test-server-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/server",
|
"test-server-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/server",
|
||||||
"eslint": "eslint .",
|
"eslint": "eslint .",
|
||||||
|
"tslint": "tslint ./js/react/**/*.{ts,tsx}",
|
||||||
|
"transpile": "tsc",
|
||||||
|
"clean-transpile": "rimraf js/built/",
|
||||||
"open-coverage": "open coverage/lcov-report/index.html"
|
"open-coverage": "open coverage/lcov-report/index.html"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -50,6 +53,7 @@
|
||||||
"blueimp-canvas-to-blob": "^3.14.0",
|
"blueimp-canvas-to-blob": "^3.14.0",
|
||||||
"blueimp-load-image": "^2.18.0",
|
"blueimp-load-image": "^2.18.0",
|
||||||
"bunyan": "^1.8.12",
|
"bunyan": "^1.8.12",
|
||||||
|
"classnames": "^2.2.5",
|
||||||
"config": "^1.28.1",
|
"config": "^1.28.1",
|
||||||
"decompress": "^4.2.0",
|
"decompress": "^4.2.0",
|
||||||
"electron-config": "^1.0.0",
|
"electron-config": "^1.0.0",
|
||||||
|
@ -74,6 +78,8 @@
|
||||||
"os-locale": "^2.1.0",
|
"os-locale": "^2.1.0",
|
||||||
"pify": "^3.0.0",
|
"pify": "^3.0.0",
|
||||||
"proxy-agent": "^2.1.0",
|
"proxy-agent": "^2.1.0",
|
||||||
|
"react": "^16.2.0",
|
||||||
|
"react-dom": "^16.2.0",
|
||||||
"read-last-lines": "^1.3.0",
|
"read-last-lines": "^1.3.0",
|
||||||
"rimraf": "^2.6.2",
|
"rimraf": "^2.6.2",
|
||||||
"semver": "^5.4.1",
|
"semver": "^5.4.1",
|
||||||
|
@ -84,6 +90,8 @@
|
||||||
"websocket": "^1.0.25"
|
"websocket": "^1.0.25"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/react": "^16.3.1",
|
||||||
|
"@types/react-dom": "^16.0.4",
|
||||||
"asar": "^0.14.0",
|
"asar": "^0.14.0",
|
||||||
"bower": "^1.8.2",
|
"bower": "^1.8.2",
|
||||||
"chai": "^4.1.2",
|
"chai": "^4.1.2",
|
||||||
|
@ -113,7 +121,10 @@
|
||||||
"nsp": "^3.2.1",
|
"nsp": "^3.2.1",
|
||||||
"nyc": "^11.4.1",
|
"nyc": "^11.4.1",
|
||||||
"sinon": "^4.4.2",
|
"sinon": "^4.4.2",
|
||||||
"spectron": "^3.8.0"
|
"spectron": "^3.8.0",
|
||||||
|
"tslint": "^5.9.1",
|
||||||
|
"tslint-react": "^3.5.1",
|
||||||
|
"typescript": "^2.8.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^8.2.1"
|
"node": "^8.2.1"
|
||||||
|
|
|
@ -108,6 +108,9 @@ window.nodeBuffer = Buffer;
|
||||||
window.nodeFetch = require('node-fetch');
|
window.nodeFetch = require('node-fetch');
|
||||||
window.nodeNotifier = require('node-notifier');
|
window.nodeNotifier = require('node-notifier');
|
||||||
window.ProxyAgent = require('proxy-agent');
|
window.ProxyAgent = require('proxy-agent');
|
||||||
|
|
||||||
|
window.React = require('react');
|
||||||
|
window.ReactDOM = require('react-dom');
|
||||||
window.moment = require('moment');
|
window.moment = require('moment');
|
||||||
|
|
||||||
const { setup } = require('./js/i18n');
|
const { setup } = require('./js/i18n');
|
||||||
|
@ -147,6 +150,8 @@ window.Signal.Database = require('./js/modules/database');
|
||||||
window.Signal.Debug = require('./js/modules/debug');
|
window.Signal.Debug = require('./js/modules/debug');
|
||||||
window.Signal.Logs = require('./js/modules/logs');
|
window.Signal.Logs = require('./js/modules/logs');
|
||||||
|
|
||||||
|
window.Signal.React = {};
|
||||||
|
|
||||||
window.Signal.Migrations = {};
|
window.Signal.Migrations = {};
|
||||||
window.Signal.Migrations.deleteAttachmentData =
|
window.Signal.Migrations.deleteAttachmentData =
|
||||||
Attachment.deleteData(deleteAttachmentData);
|
Attachment.deleteData(deleteAttachmentData);
|
||||||
|
|
57
tsconfig.json
Normal file
57
tsconfig.json
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
/* Basic Options */
|
||||||
|
"target": "es2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
|
||||||
|
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
|
||||||
|
// "lib": [], /* Specify library files to be included in the compilation. */
|
||||||
|
// "allowJs": true, /* Allow javascript files to be compiled. */
|
||||||
|
// "checkJs": true, /* Report errors in .js files. */
|
||||||
|
"jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
|
||||||
|
// "declaration": true, /* Generates corresponding '.d.ts' file. */
|
||||||
|
// "sourceMap": true, /* Generates corresponding '.map' file. */
|
||||||
|
// "outFile": "./", /* Concatenate and emit output to single file. */
|
||||||
|
// "outDir": "./", /* Redirect output structure to the directory. */
|
||||||
|
"rootDir": "./js/react", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
|
||||||
|
// "removeComments": true, /* Do not emit comments to output. */
|
||||||
|
// "noEmit": true, /* Do not emit outputs. */
|
||||||
|
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
|
||||||
|
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
|
||||||
|
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
|
||||||
|
|
||||||
|
/* Strict Type-Checking Options */
|
||||||
|
"strict": true, /* Enable all strict type-checking options. */
|
||||||
|
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
|
||||||
|
// "strictNullChecks": true, /* Enable strict null checks. */
|
||||||
|
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
|
||||||
|
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
|
||||||
|
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
|
||||||
|
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
|
||||||
|
|
||||||
|
/* Additional Checks */
|
||||||
|
"noUnusedLocals": true, /* Report errors on unused locals. */
|
||||||
|
"noUnusedParameters": true, /* Report errors on unused parameters. */
|
||||||
|
"noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
|
||||||
|
"noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
|
||||||
|
|
||||||
|
/* Module Resolution Options */
|
||||||
|
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
|
||||||
|
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
|
||||||
|
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
|
||||||
|
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
|
||||||
|
// "typeRoots": [], /* List of folders to include type definitions from. */
|
||||||
|
// "types": [], /* Type declaration files to be included in compilation. */
|
||||||
|
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
|
||||||
|
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
|
||||||
|
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
|
||||||
|
|
||||||
|
/* Source Map Options */
|
||||||
|
// "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
|
||||||
|
// "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||||
|
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
|
||||||
|
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
|
||||||
|
|
||||||
|
/* Experimental Options */
|
||||||
|
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
|
||||||
|
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
|
||||||
|
}
|
||||||
|
}
|
13
tslint.json
Normal file
13
tslint.json
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{
|
||||||
|
"defaultSeverity": "error",
|
||||||
|
"extends": [
|
||||||
|
"tslint:recommended",
|
||||||
|
"tslint-react"
|
||||||
|
],
|
||||||
|
"jsRules": {},
|
||||||
|
"rules": {
|
||||||
|
"quotemark": [true, "single", "jsx-double", "avoid-template", "avoid-escape"],
|
||||||
|
"no-consecutive-blank-lines": [true, 2]
|
||||||
|
},
|
||||||
|
"rulesDirectory": []
|
||||||
|
}
|
Loading…
Reference in a new issue