This commit is contained in:
parent
8756180ad1
commit
c12f242cfa
@ -110,7 +110,6 @@ function getConfig(env) {
|
|||||||
},
|
},
|
||||||
cssRule,
|
cssRule,
|
||||||
sassRule,
|
sassRule,
|
||||||
// Process TypeScript with TSC through HappyPack.
|
|
||||||
{
|
{
|
||||||
test: /\.tsx?$/,
|
test: /\.tsx?$/,
|
||||||
include: [paths.clientDir, paths.commonDir],
|
include: [paths.clientDir, paths.commonDir],
|
||||||
@ -126,7 +125,7 @@ function getConfig(env) {
|
|||||||
loader: "ts-loader",
|
loader: "ts-loader",
|
||||||
options: {
|
options: {
|
||||||
configFile: paths.clientTsConfig,
|
configFile: paths.clientTsConfig,
|
||||||
happyPackMode: true
|
transpileOnly: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -72,7 +72,7 @@ export function typedEventEmitter<
|
|||||||
const NewClass = class extends Base {
|
const NewClass = class extends Base {
|
||||||
constructor(...args: any[]) {
|
constructor(...args: any[]) {
|
||||||
super(...args);
|
super(...args);
|
||||||
EventEmitter.call(this);
|
EventEmitter.call(this as any);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Object.getOwnPropertyNames(EventEmitter.prototype).forEach(name => {
|
Object.getOwnPropertyNames(EventEmitter.prototype).forEach(name => {
|
||||||
|
@ -79,7 +79,7 @@ export function write(value: any) {
|
|||||||
} else {
|
} else {
|
||||||
fn = console.log;
|
fn = console.log;
|
||||||
}
|
}
|
||||||
fn.apply(null, args);
|
fn.apply(null, args as any);
|
||||||
}
|
}
|
||||||
|
|
||||||
function filter(value: any) {
|
function filter(value: any) {
|
||||||
|
126
package.json
126
package.json
@ -43,115 +43,115 @@
|
|||||||
"commands": "./dist/commands"
|
"commands": "./dist/commands"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@oclif/command": "^1.5.0",
|
"@oclif/command": "^1.5.6",
|
||||||
"@oclif/config": "^1.7.4",
|
"@oclif/config": "^1.9.0",
|
||||||
"@oclif/plugin-help": "^2.1.1",
|
"@oclif/plugin-help": "^2.1.4",
|
||||||
"@types/split2": "^2.1.6",
|
"@types/split2": "^2.1.6",
|
||||||
"bcrypt": "^3.0.0",
|
"bcrypt": "^3.0.2",
|
||||||
"body-parser": "^1.18.3",
|
"body-parser": "^1.18.3",
|
||||||
"chalk": "^2.4.1",
|
"chalk": "^2.4.1",
|
||||||
"cli-ux": "^4.8.1",
|
"cli-ux": "^4.9.3",
|
||||||
"express": "^4.16.3",
|
"express": "^4.16.4",
|
||||||
"express-pino-logger": "^4.0.0",
|
"express-pino-logger": "^4.0.0",
|
||||||
"express-promise-router": "^3.0.3",
|
"express-promise-router": "^3.0.3",
|
||||||
"jsonwebtoken": "^8.3.0",
|
"jsonwebtoken": "^8.4.0",
|
||||||
"lodash": "^4.17.10",
|
"lodash": "^4.17.11",
|
||||||
"mobx": "^5.1.0",
|
"mobx": "^5.7.0",
|
||||||
"mobx-utils": "^5.0.1",
|
"mobx-utils": "^5.1.0",
|
||||||
"module-alias": "^2.1.0",
|
"module-alias": "^2.1.0",
|
||||||
"moment": "^2.22.2",
|
"moment": "^2.22.2",
|
||||||
"mqtt": "^2.18.8",
|
"mqtt": "^2.18.8",
|
||||||
"pg": "^7.4.3",
|
"pg": "^7.7.1",
|
||||||
"pino": "^5.4.0",
|
"pino": "^5.10.0",
|
||||||
"pump": "^3.0.0",
|
"pump": "^3.0.0",
|
||||||
"reflect-metadata": "^0.1.12",
|
"reflect-metadata": "^0.1.12",
|
||||||
"serializr": "^1.3.0",
|
"serializr": "^1.3.0",
|
||||||
"split2": "^3.0.0",
|
"split2": "^3.0.0",
|
||||||
"through2": "^2.0.3",
|
"through2": "^3.0.0",
|
||||||
"typeorm": "^0.2.7",
|
"typeorm": "^0.2.9",
|
||||||
"ws": "^6.0.0"
|
"ws": "^6.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/async": "^2.0.49",
|
"@types/async": "^2.0.50",
|
||||||
"@types/bcrypt": "^2.0.0",
|
"@types/bcrypt": "^3.0.0",
|
||||||
"@types/classnames": "^2.2.6",
|
"@types/classnames": "^2.2.6",
|
||||||
"@types/core-js": "^2.5.0",
|
"@types/core-js": "^2.5.0",
|
||||||
"@types/express": "^4.16.0",
|
"@types/express": "^4.16.0",
|
||||||
"@types/jsonwebtoken": "^7.2.8",
|
"@types/jsonwebtoken": "^8.3.0",
|
||||||
"@types/lodash": "^4.14.116",
|
"@types/lodash": "^4.14.119",
|
||||||
"@types/module-alias": "^2.0.0",
|
"@types/module-alias": "^2.0.0",
|
||||||
"@types/node": "^10.9.4",
|
"@types/node": "^10.12.12",
|
||||||
"@types/object-assign": "^4.0.30",
|
"@types/object-assign": "^4.0.30",
|
||||||
"@types/pino": "^5.20.0",
|
"@types/pino": "^5.20.0",
|
||||||
"@types/prop-types": "^15.5.5",
|
"@types/prop-types": "^15.5.7",
|
||||||
"@types/pump": "^1.0.1",
|
"@types/pump": "^1.0.1",
|
||||||
"@types/query-string": "^6.1.0",
|
"@types/query-string": "^6.1.1",
|
||||||
"@types/react": "16.4.13",
|
"@types/react": "16.7.13",
|
||||||
"@types/react-dom": "16.0.7",
|
"@types/react-dom": "16.0.11",
|
||||||
"@types/react-hot-loader": "^4.1.0",
|
"@types/react-hot-loader": "^4.1.0",
|
||||||
"@types/react-router-dom": "^4.3.0",
|
"@types/react-router-dom": "^4.3.1",
|
||||||
"@types/react-sortable-hoc": "^0.6.4",
|
"@types/react-sortable-hoc": "^0.6.4",
|
||||||
"@types/through2": "^2.0.33",
|
"@types/through2": "^2.0.34",
|
||||||
"@types/webpack-env": "^1.13.6",
|
"@types/webpack-env": "^1.13.6",
|
||||||
"@types/ws": "^6.0.0",
|
"@types/ws": "^6.0.1",
|
||||||
"async": "^2.6.1",
|
"async": "^2.6.1",
|
||||||
"autoprefixer": "^9.1.3",
|
"autoprefixer": "^9.4.2",
|
||||||
"cache-loader": "^1.2.2",
|
"cache-loader": "^1.2.5",
|
||||||
"case-sensitive-paths-webpack-plugin": "^2.1.2",
|
"case-sensitive-paths-webpack-plugin": "^2.1.2",
|
||||||
"classnames": "^2.2.6",
|
"classnames": "^2.2.6",
|
||||||
"css-loader": "^1.0.0",
|
"css-loader": "^2.0.0",
|
||||||
"dotenv": "^6.0.0",
|
"dotenv": "^6.2.0",
|
||||||
"favicons-webpack-plugin": "^0.0.9",
|
"favicons-webpack-plugin": "^0.0.9",
|
||||||
"file-loader": "^2.0.0",
|
"file-loader": "^2.0.0",
|
||||||
"font-awesome": "^4.7.0",
|
"font-awesome": "^4.7.0",
|
||||||
"fork-ts-checker-webpack-plugin": "^0.4.9",
|
"fork-ts-checker-webpack-plugin": "^0.5.1",
|
||||||
"html-webpack-plugin": "^3.2.0",
|
"html-webpack-plugin": "^3.2.0",
|
||||||
"mini-css-extract-plugin": "^0.4.2",
|
"mini-css-extract-plugin": "^0.5.0",
|
||||||
"mobx-react": "^5.2.5",
|
"mobx-react": "^5.4.2",
|
||||||
"mobx-react-devtools": "^6.0.3",
|
"mobx-react-devtools": "^6.0.3",
|
||||||
"mobx-react-router": "^4.0.4",
|
"mobx-react-router": "^4.0.5",
|
||||||
"node-sass": "^4.9.3",
|
"node-sass": "^4.11.0",
|
||||||
"nodemon": "^1.18.4",
|
"nodemon": "^1.18.8",
|
||||||
"npm-run-all": "^4.1.3",
|
"npm-run-all": "^4.1.5",
|
||||||
"object-assign": "^4.1.1",
|
"object-assign": "^4.1.1",
|
||||||
"postcss-flexbugs-fixes": "^4.1.0",
|
"postcss-flexbugs-fixes": "^4.1.0",
|
||||||
"postcss-loader": "^3.0.0",
|
"postcss-loader": "^3.0.0",
|
||||||
"postcss-preset-env": "^5.3.0",
|
"postcss-preset-env": "^6.4.0",
|
||||||
"promise": "^8.0.1",
|
"promise": "^8.0.2",
|
||||||
"prop-types": "^15.6.2",
|
"prop-types": "^15.6.2",
|
||||||
"query-string": "^6.1.0",
|
"query-string": "^6.2.0",
|
||||||
"react": "16.4.2",
|
"react": "16.6.3",
|
||||||
"react-dev-utils": "^5.0.2",
|
"react-dev-utils": "^6.1.1",
|
||||||
"react-dom": "16.4.2",
|
"react-dom": "16.6.3",
|
||||||
"react-hot-loader": "^4.3.5",
|
"react-hot-loader": "^4.3.12",
|
||||||
"react-router": "^4.3.1",
|
"react-router": "^4.3.1",
|
||||||
"react-router-dom": "^4.3.1",
|
"react-router-dom": "^4.3.1",
|
||||||
"react-sortable-hoc": "^0.8.3",
|
"react-sortable-hoc": "^0.8.4",
|
||||||
"sass-loader": "^7.1.0",
|
"sass-loader": "^7.1.0",
|
||||||
"semantic-ui-css": "^2.3.3",
|
"semantic-ui-css": "^2.4.1",
|
||||||
"semantic-ui-react": "^0.82.3",
|
"semantic-ui-react": "^0.84.0",
|
||||||
"source-map-loader": "^0.2.4",
|
"source-map-loader": "^0.2.4",
|
||||||
"style-loader": "^0.23.0",
|
"style-loader": "^0.23.1",
|
||||||
"thread-loader": "^1.2.0",
|
"thread-loader": "^1.2.0",
|
||||||
"ts-loader": "^4.5.0",
|
"ts-loader": "^5.3.1",
|
||||||
"tslint": "^5.11.0",
|
"tslint": "^5.11.0",
|
||||||
"tslint-config-prettier": "^1.15.0",
|
"tslint-config-prettier": "^1.17.0",
|
||||||
"tslint-consistent-codestyle": "^1.13.3",
|
"tslint-consistent-codestyle": "^1.14.1",
|
||||||
"tslint-react": "^3.6.0",
|
"tslint-react": "^3.6.0",
|
||||||
"typescript": "^3.0.3",
|
"typescript": "^3.2.2",
|
||||||
"uglify-es": "^3.3.9",
|
"uglify-es": "^3.3.9",
|
||||||
"uglifyjs-webpack-plugin": "^1.3.0",
|
"uglifyjs-webpack-plugin": "^2.0.1",
|
||||||
"url-loader": "^1.1.1",
|
"url-loader": "^1.1.2",
|
||||||
"webpack": "^4.17.1",
|
"webpack": "^4.27.1",
|
||||||
"webpack-bundle-analyzer": "^2.13.1",
|
"webpack-bundle-analyzer": "^3.0.3",
|
||||||
"webpack-cli": "^3.1.0",
|
"webpack-cli": "^3.1.2",
|
||||||
"webpack-dashboard": "^2.0.0",
|
"webpack-dashboard": "^2.0.0",
|
||||||
"webpack-dev-server": "^3.1.7"
|
"webpack-dev-server": "^3.1.10"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"**/@types/react": "16.4.11",
|
"**/@types/react": "16.7.13",
|
||||||
"**/@types/react-dom": "16.0.7",
|
"**/@types/react-dom": "16.0.11",
|
||||||
"**/react": "16.4.2",
|
"**/react": "16.6.3",
|
||||||
"**/react-dom": "16.4.2"
|
"**/react-dom": "16.6.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,24 +2,24 @@
|
|||||||
"extends": "../tsconfig.json",
|
"extends": "../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../dist",
|
"outDir": "../dist",
|
||||||
"sourceMap": true,
|
// "sourceMap": true,
|
||||||
"emitDecoratorMetadata": true,
|
// "emitDecoratorMetadata": true,
|
||||||
"strict": true,
|
// "strict": true,
|
||||||
"allowJs": true,
|
// "allowJs": true,
|
||||||
"baseUrl": "..",
|
// "baseUrl": "..",
|
||||||
"paths": {
|
// "paths": {
|
||||||
"@common/*": [
|
// "@common/*": [
|
||||||
"./common/*"
|
// "./common/*"
|
||||||
],
|
// ],
|
||||||
"@server/*": [
|
// "@server/*": [
|
||||||
"./server/*"
|
// "./server/*"
|
||||||
]
|
// ]
|
||||||
}
|
// }
|
||||||
},
|
}//,
|
||||||
"references": [{
|
// "references": [{
|
||||||
"path": "../common"
|
// "path": "../common"
|
||||||
}],
|
// }],
|
||||||
"include": [
|
// "include": [
|
||||||
"./**/*.ts"
|
// "./**/*.ts"
|
||||||
]
|
// ]
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user