cleaning scripts & jspm config

updated typings dep

Author: piotrwitek

.gitignore

@@ -30,3 +30,4 @@ node_modules
 jspm_packages
 typings
 dist/app.js
+out

dist/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <title>react / ts / jspm - starter kit</title>
+  <title>React / TypeScript / JSPM - Starter-Kit</title>
   <link rel="stylesheet" href="loader-style.css">
 </head>
 
@@ -27,14 +27,14 @@
   </div>
   <!-- body bottom scripts -->
   <script src="/jspm_packages/system.js"></script>
-  <script src="/jspm.browser.js"></script>
   <script src="/jspm.config.js"></script>
   <script type="text/javascript">
     System.import('systemjs-hot-reloader').then(function(HotReloader) {
       // if you're running server on custom port please remember to update below
       new HotReloader.default('http://localhost:8888');
     });
     // load main module of your app
+    System.trace = true;
     System.import('src/app');
   </script>
 </body>

index.html

@@ -1,4 +1,37 @@
 SystemJS.config({
+  paths: {
+    "github:": "jspm_packages/github/",
+    "npm:": "jspm_packages/npm/",
+    "app/": "src/"
+  },
+  browserConfig: {
+    "baseURL": "."
+  },
+  devConfig: {
+    "map": {
+      "plugin-typescript": "github:frankwallis/plugin-typescript@4.0.16",
+      "systemjs-hot-reloader": "github:capaj/systemjs-hot-reloader@0.6.0"
+    },
+    "packages": {
+      "github:frankwallis/plugin-typescript@4.0.16": {
+        "map": {
+          "typescript": "npm:typescript@1.8.10"
+        }
+      },
+      "github:capaj/systemjs-hot-reloader@0.6.0": {
+        "map": {
+          "debug": "npm:debug@2.2.0",
+          "weakee": "npm:weakee@1.0.0",
+          "socket.io-client": "github:socketio/socket.io-client@1.4.6"
+        }
+      },
+      "npm:debug@2.2.0": {
+        "map": {
+          "ms": "npm:ms@0.7.1"
+        }
+      }
+    }
+  },
   transpiler: "plugin-typescript",
   typescriptOptions: {
     "target": "es5",
@@ -10,8 +43,9 @@ SystemJS.config({
   },
   packages: {
     "app": {
-      "main": "main.tsx",
+      "main": "app.tsx",
       "defaultExtension": "tsx",
+      "format": "esm",
       "meta": {
         "*.tsx": {
           "loader": "plugin-typescript"
@@ -31,8 +65,7 @@ SystemJS.config({
     "assert": "github:jspm/nodelibs-assert@0.2.0-alpha",
     "buffer": "github:jspm/nodelibs-buffer@0.2.0-alpha",
     "child_process": "github:jspm/nodelibs-child_process@0.2.0-alpha",
-    "clean-css": "npm:clean-css@3.4.10",
-    "css": "github:systemjs/plugin-css@0.1.20",
+    "css": "github:systemjs/plugin-css@0.1.23",
     "events": "github:jspm/nodelibs-events@0.2.0-alpha",
     "fs": "github:jspm/nodelibs-fs@0.2.0-alpha",
     "http": "github:jspm/nodelibs-http@0.2.0-alpha",
@@ -41,29 +74,15 @@ SystemJS.config({
     "net": "github:jspm/nodelibs-net@0.2.0-alpha",
     "os": "github:jspm/nodelibs-os@0.2.0-alpha",
     "path": "github:jspm/nodelibs-path@0.2.0-alpha",
-    "plugin-typescript": "github:frankwallis/plugin-typescript@4.0.2",
     "process": "github:jspm/nodelibs-process@0.2.0-alpha",
     "react": "npm:react@0.14.7",
     "react-dom": "npm:react-dom@0.14.7",
     "stream": "github:jspm/nodelibs-stream@0.2.0-alpha",
-    "systemjs-hot-reloader": "github:capaj/systemjs-hot-reloader@0.5.6",
     "tty": "github:jspm/nodelibs-tty@0.2.0-alpha",
     "url": "github:jspm/nodelibs-url@0.2.0-alpha",
     "util": "github:jspm/nodelibs-util@0.2.0-alpha"
   },
   packages: {
-    "github:capaj/systemjs-hot-reloader@0.5.6": {
-      "map": {
-        "debug": "npm:debug@2.2.0",
-        "socket.io-client": "github:socketio/socket.io-client@1.4.5",
-        "weakee": "npm:weakee@1.0.0"
-      }
-    },
-    "github:frankwallis/plugin-typescript@4.0.2": {
-      "map": {
-        "typescript": "npm:typescript@1.8.7"
-      }
-    },
     "github:jspm/nodelibs-buffer@0.2.0-alpha": {
       "map": {
         "buffer-browserify": "npm:buffer@4.5.0"
@@ -96,22 +115,6 @@ SystemJS.config({
         "isarray": "npm:isarray@1.0.0"
       }
     },
-    "npm:clean-css@3.4.10": {
-      "map": {
-        "commander": "npm:commander@2.8.1",
-        "source-map": "npm:source-map@0.4.4"
-      }
-    },
-    "npm:commander@2.8.1": {
-      "map": {
-        "graceful-readlink": "npm:graceful-readlink@1.0.1"
-      }
-    },
-    "npm:debug@2.2.0": {
-      "map": {
-        "ms": "npm:ms@0.7.1"
-      }
-    },
     "npm:react@0.14.7": {
       "map": {
         "fbjs": "npm:fbjs@0.6.1"
@@ -127,11 +130,6 @@ SystemJS.config({
         "util-deprecate": "npm:util-deprecate@1.0.2"
       }
     },
-    "npm:source-map@0.4.4": {
-      "map": {
-        "amdefine": "npm:amdefine@1.0.0"
-      }
-    },
     "npm:stream-browserify@2.0.1": {
       "map": {
         "inherits": "npm:inherits@2.0.1",

jspm.browser.js

@@ -12,39 +12,35 @@
     "postinstall": "jspm install && typings install",
     "precommit": "npm run lint",
     "prepush": "npm run lint && npm test",
-    "build-test": "jspm build src/main dist/app.js",
-    "build-prod": "jspm build src/main dist/app.js --minify --skip-source-maps",
     "bundle-dev": "./node_modules/.bin/jspm bundle dev-bundle.config.js out/dev-bundle.js -id",
     "unbundle": "./node_modules/.bin/jspm unbundle",
-    "bundle-deps": "./node_modules/.bin/jspm bundle react + react-dom + mobx + mobx-react dist/deps-bundle.js --minify --skip-source-maps",
-    "bundle-app": "./node_modules/.bin/jspm bundle src/app - react-dom - mobx - mobx-react dist/app.js --minify --skip-source-maps",
-    "bundle-app-debug": "./node_modules/.bin/jspm bundle src/app - react-dom - mobx - mobx-react dist/app.js",
+    "bundle-deps": "./node_modules/.bin/jspm bundle react + react-dom dist/deps-bundle.js --minify --skip-source-maps",
+    "bundle-app": "./node_modules/.bin/jspm bundle src/app - react-dom dist/app-bundle.js --minify --skip-source-maps",
+    "bundle-app-debug": "./node_modules/.bin/jspm bundle src/app - react-dom dist/app-bundle.js",
     "build": "npm run bundle-app && npm run regenerator",
     "build-deps": "npm run unbundle && cp jspm_packages/system.js dist/ && cp jspm.config.js dist/ && npm run bundle-deps && npm run bundle-dev",
-    "regenerator": "cd out && cp ../dist/app.js . && regenerator -r app.js > app.regenerator.js && cp app.regenerator.js ../dist/app.js",
-    "init-deploy": "mkdir dist && git clone https://github.com/piotrwitek/training-management-tool --branch gh-pages dist",
+    "regenerator": "cd out && cp ../dist/app-bundle.js . && regenerator -r app-bundle.js > app-bundle.regenerator.js && cp app-bundle.regenerator.js ../dist/app-bundle.js",
+    "init-deploy": "mkdir dist && git clone https://github.com/piotrwitek/react-ts-jspm-starter-kit --branch gh-pages dist",
     "deploy": "cd dist && git checkout gh-pages && git add --all && git commit -m \"New Release\" && git push",
     "bd": "npm run build && npm run deploy",
     "bdd": "npm run build-deps && npm run deploy",
-    "test": "jspm run ./tests/run-tests.ts",
+    "test": "echo \"Tests to be added soon!\"",
     "lint": "tslint ./src/**/*.ts*"
   },
   "devDependencies": {
     "husky": "^0.11.4",
     "jspm": "^0.17.0-beta.22",
     "jspm-hmr": "^0.4.1",
     "regenerator": "^0.8.46",
-    "typings": "^0.7.12"
+    "typings": "^1.3.1"
   },
   "jspm": {
     "name": "app",
     "dependencies": {
-      "css": "github:systemjs/plugin-css@^0.1.20",
-      "react": "npm:react@^0.14.7",
+      "css": "github:systemjs/plugin-css@^0.1.23",
       "react-dom": "npm:react-dom@^0.14.7"
     },
     "devDependencies": {
-      "clean-css": "npm:clean-css@^3.4.10",
       "plugin-typescript": "github:frankwallis/plugin-typescript@^4.0.2",
       "systemjs-hot-reloader": "github:capaj/systemjs-hot-reloader@^0.5.6"
     },
@@ -61,12 +57,27 @@
       "os": "github:jspm/nodelibs-os@^0.2.0-alpha",
       "path": "github:jspm/nodelibs-path@^0.2.0-alpha",
       "process": "github:jspm/nodelibs-process@^0.2.0-alpha",
+      "react": "npm:react@^0.14.7",
       "stream": "github:jspm/nodelibs-stream@^0.2.0-alpha",
       "tty": "github:jspm/nodelibs-tty@^0.2.0-alpha",
       "url": "github:jspm/nodelibs-url@^0.2.0-alpha",
       "util": "github:jspm/nodelibs-util@^0.2.0-alpha"
     },
     "overrides": {
+      "npm:debug@2.2.0": {
+        "main": "browser.js",
+        "jspmNodeConversion": false,
+        "format": "cjs",
+        "map": {
+          "./browser.js": {
+            "node": "./node.js"
+          },
+          "fs": "@node/fs",
+          "net": "@node/net",
+          "tty": "@node/tty",
+          "util": "@node/util"
+        }
+      },
       "npm:fbjs@0.6.1": {
         "dependencies": {}
       },
@@ -75,6 +86,10 @@
           "test.js"
         ]
       },
+      "npm:ms@0.7.1": {
+        "jspmNodeConversion": false,
+        "format": "cjs"
+      },
       "npm:react@0.14.7": {
         "dependencies": {
           "fbjs": "^0.6.1"
@@ -99,13 +114,12 @@
           }
         }
       },
-      "npm:typescript@1.8.7": {
+      "npm:typescript@1.8.10": {
         "browser": {},
         "map": {
           "buffer": "@empty",
           "child_process": "@empty",
           "fs": "@empty",
-          "os": "@empty",
           "path": "@empty",
           "process": "@empty",
           "readline": "@empty"

jspm.config.js

@@ -18,5 +18,5 @@ import * as ReactDOM from 'react-dom';
 // components imports
 import {Main} from './components/main';
 
-// todo: refactor name to appComponent
-export var appComponent: any = ReactDOM.render(<Main welcomeMessage="Welcome to React"/>, appContainer);
+const message = 'React / TypeScript / JSPM - Starter-Kit';
+export var appComponent: any = ReactDOM.render(<Main welcomeMessage={message} />, appContainer);

package.json

@@ -1,6 +1,6 @@
 {
   "globalDependencies": {
-    "react": "registry:dt/react#0.14.0+20160621225615",
+    "react": "registry:dt/react#0.14.0+20160630100702",
     "react-dom": "registry:dt/react-dom#0.14.0+20160412154040"
   }
 }