Merge pull request #18 from artsector/master
Update dependencies to latest versions, delete unnecessary files
This commit is contained in:
commit
7d1c03c318
7 changed files with 16 additions and 3401 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1 @@
|
||||||
node_modules/
|
node_modules
|
||||||
static/bundle.js
|
|
||||||
.vscode
|
|
||||||
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
|
|
@ -1,5 +0,0 @@
|
||||||
// Place your settings in this file to overwrite default and user settings.
|
|
||||||
{
|
|
||||||
"editor.tabSize": 2,
|
|
||||||
"editor.insertSpaces": true
|
|
||||||
}
|
|
||||||
190
.vscode/tasks.json
vendored
190
.vscode/tasks.json
vendored
|
|
@ -1,190 +0,0 @@
|
||||||
// Available variables which can be used inside of strings.
|
|
||||||
// ${workspaceRoot}: the root folder of the team
|
|
||||||
// ${file}: the current opened file
|
|
||||||
// ${fileBasename}: the current opened file's basename
|
|
||||||
// ${fileDirname}: the current opened file's dirname
|
|
||||||
// ${fileExtname}: the current opened file's extension
|
|
||||||
// ${cwd}: the current working directory of the spawned process
|
|
||||||
|
|
||||||
// A task runner that calls the Typescript compiler (tsc) and
|
|
||||||
// Compiles a HelloWorld.ts program
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
|
|
||||||
// The command is tsc. Assumes that tsc has been installed using npm install -g typescript
|
|
||||||
"command": "npm",
|
|
||||||
|
|
||||||
// The command is a shell script
|
|
||||||
"isShellCommand": true,
|
|
||||||
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "always",
|
|
||||||
|
|
||||||
// args is the HelloWorld program to compile.
|
|
||||||
"args": ["run", "build"],
|
|
||||||
|
|
||||||
// use the standard tsc problem matcher to find compile problems
|
|
||||||
// in the output.
|
|
||||||
"problemMatcher": "$tsc"
|
|
||||||
}
|
|
||||||
|
|
||||||
// A task runner that calls the Typescript compiler (tsc) and
|
|
||||||
// compiles based on a tsconfig.json file that is present in
|
|
||||||
// the root of the folder open in VSCode
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
|
|
||||||
// The command is tsc. Assumes that tsc has been installed using npm install -g typescript
|
|
||||||
"command": "tsc",
|
|
||||||
|
|
||||||
// The command is a shell script
|
|
||||||
"isShellCommand": true,
|
|
||||||
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "silent",
|
|
||||||
|
|
||||||
// Tell the tsc compiler to use the tsconfig.json from the open folder.
|
|
||||||
"args": ["-p", "."],
|
|
||||||
|
|
||||||
// use the standard tsc problem matcher to find compile problems
|
|
||||||
// in the output.
|
|
||||||
"problemMatcher": "$tsc"
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// A task runner configuration for gulp. Gulp provides a less task
|
|
||||||
// which compiles less to css.
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
"command": "gulp",
|
|
||||||
"isShellCommand": true,
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"taskName": "less",
|
|
||||||
// Make this the default build command.
|
|
||||||
"isBuildCommand": true,
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "silent",
|
|
||||||
// Use the standard less compilation problem matcher.
|
|
||||||
"problemMatcher": "$lessCompile"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Uncomment the following section to use jake to build a workspace
|
|
||||||
// cloned from https://github.com/Microsoft/TypeScript.git
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
// Task runner is jake
|
|
||||||
"command": "jake",
|
|
||||||
// Need to be executed in shell / cmd
|
|
||||||
"isShellCommand": true,
|
|
||||||
"showOutput": "silent",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
// TS build command is local.
|
|
||||||
"taskName": "local",
|
|
||||||
// Make this the default build command.
|
|
||||||
"isBuildCommand": true,
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "silent",
|
|
||||||
// Use the redefined Typescript output problem matcher.
|
|
||||||
"problemMatcher": [
|
|
||||||
"$tsc"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Uncomment the section below to use msbuild and generate problems
|
|
||||||
// for csc, cpp, tsc and vb. The configuration assumes that msbuild
|
|
||||||
// is available on the path and a solution file exists in the
|
|
||||||
// workspace folder root.
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
"command": "msbuild",
|
|
||||||
"args": [
|
|
||||||
// Ask msbuild to generate full paths for file names.
|
|
||||||
"/property:GenerateFullPaths=true"
|
|
||||||
],
|
|
||||||
"taskSelector": "/t:",
|
|
||||||
"showOutput": "silent",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"taskName": "build",
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "silent",
|
|
||||||
// Use the standard MS compiler pattern to detect errors, warnings
|
|
||||||
// and infos in the output.
|
|
||||||
"problemMatcher": "$msCompile"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Uncomment the following section to use msbuild which compiles Typescript
|
|
||||||
// and less files.
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
"command": "msbuild",
|
|
||||||
"args": [
|
|
||||||
// Ask msbuild to generate full paths for file names.
|
|
||||||
"/property:GenerateFullPaths=true"
|
|
||||||
],
|
|
||||||
"taskSelector": "/t:",
|
|
||||||
"showOutput": "silent",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"taskName": "build",
|
|
||||||
// Show the output window only if unrecognized errors occur.
|
|
||||||
"showOutput": "silent",
|
|
||||||
// Use the standard MS compiler pattern to detect errors, warnings
|
|
||||||
// and infos in the output.
|
|
||||||
"problemMatcher": [
|
|
||||||
"$msCompile",
|
|
||||||
"$lessCompile"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
// A task runner example that defines a problemMatcher inline instead of using
|
|
||||||
// a predfined one.
|
|
||||||
/*
|
|
||||||
{
|
|
||||||
"version": "0.1.0",
|
|
||||||
"command": "tsc",
|
|
||||||
"isShellCommand": true,
|
|
||||||
"args": ["HelloWorld.ts"],
|
|
||||||
"showOutput": "silent",
|
|
||||||
"problemMatcher": {
|
|
||||||
// The problem is owned by the typescript language service. Ensure that the problems
|
|
||||||
// are merged with problems produced by Visual Studio's language service.
|
|
||||||
"owner": "typescript",
|
|
||||||
// The file name for reported problems is relative to the current working directory.
|
|
||||||
"fileLocation": ["relative", "${cwd}"],
|
|
||||||
// The actual pattern to match problems in the output.
|
|
||||||
"pattern": {
|
|
||||||
// The regular expression. Matches HelloWorld.ts(2,10): error TS2339: Property 'logg' does not exist on type 'Console'.
|
|
||||||
"regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
|
|
||||||
// The match group that denotes the file containing the problem.
|
|
||||||
"file": 1,
|
|
||||||
// The match group that denotes the problem location.
|
|
||||||
"location": 2,
|
|
||||||
// The match group that denotes the problem's severity. Can be omitted.
|
|
||||||
"severity": 3,
|
|
||||||
// The match group that denotes the problem code. Can be omitted.
|
|
||||||
"code": 4,
|
|
||||||
// The match group that denotes the problem's message.
|
|
||||||
"message": 5
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
21
package.json
21
package.json
|
|
@ -23,18 +23,17 @@
|
||||||
},
|
},
|
||||||
"homepage": "http://mobxjs.github.com/mobx",
|
"homepage": "http://mobxjs.github.com/mobx",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "^15.0.39",
|
"@types/react-dom": "^16.0.9",
|
||||||
"@types/react-dom": "^15.5.1",
|
"awesome-typescript-loader": "^5.2.1",
|
||||||
"awesome-typescript-loader": "^3.2.1",
|
"typescript": "^3.1.3",
|
||||||
"typescript": "^2.4.2",
|
"webpack": "^4.22.0",
|
||||||
"webpack": "^3.0.0",
|
"webpack-dev-server": "^3.1.10"
|
||||||
"webpack-dev-server": "^2.6.1"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"mobx": "^3.2.1",
|
"mobx": "^5.5.2",
|
||||||
"mobx-react": "^4.2.2",
|
"mobx-react": "^5.3.5",
|
||||||
"mobx-react-devtools": "^4.2.15",
|
"mobx-react-devtools": "^6.0.3",
|
||||||
"react": "^15.6.1",
|
"react": "^16.5.2",
|
||||||
"react-dom": "^15.6.1"
|
"react-dom": "^16.5.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,8 @@
|
||||||
"removeComments": true,
|
"removeComments": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"jsx": "react",
|
"jsx": "react",
|
||||||
"outDir": "dist"
|
"outDir": "dist",
|
||||||
|
"lib": ["dom", "es2015"]
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ var webpack = require('webpack');
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
devtool: 'eval',
|
devtool: 'eval',
|
||||||
|
mode: 'development',
|
||||||
entry: [
|
entry: [
|
||||||
'webpack-dev-server/client?http://localhost:3000',
|
'webpack-dev-server/client?http://localhost:3000',
|
||||||
'./src/index'
|
'./src/index'
|
||||||
|
|
@ -16,13 +17,9 @@ module.exports = {
|
||||||
extensions: ['.js', '.ts', '.tsx']
|
extensions: ['.js', '.ts', '.tsx']
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [{
|
rules: [{
|
||||||
test: /\.tsx?$/,
|
test: /\.tsx?$/,
|
||||||
use: [
|
loader: "awesome-typescript-loader",
|
||||||
{
|
|
||||||
loader: "awesome-typescript-loader"
|
|
||||||
},
|
|
||||||
],
|
|
||||||
include: path.join(__dirname, 'src')
|
include: path.join(__dirname, 'src')
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue