diff --git a/.babelrc b/.babelrc index 6cf63216f..09f1f3e18 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,6 @@ { "presets": [ - "es2015", + "env", "react", "stage-2" ], @@ -12,5 +12,5 @@ "regenerator": true, "moduleName": "babel-runtime" } - ]] + ],["transform-decorators-legacy"]] } \ No newline at end of file diff --git a/.gitignore b/.gitignore index cf867fc58..504353b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* yarn.lock +package-lock.json # Runtime data pids @@ -38,7 +39,7 @@ bower_components # Compiled binary addons (https://nodejs.org/api/addons.html) build/ - +src/.umi/ # Dependency directories node_modules/ jspm_packages/ @@ -87,3 +88,5 @@ typings/ .DS_Store .idea/* +.forgeplus-react.sublime-workspace + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a319c472b..b6bb1a5df 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,291 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +