refactor directory structure

Author: SamVerschueren

.gitignore

@@ -6,4 +6,4 @@ typings
 **/*.js.map
 **/*.d.ts
 !gulpfile.js
-!bundles/**/*.js
+!angular2-polyfill/bundles/**/*.js

.npmignore renamed to angular2-polyfill/.npmignore

@@ -1,12 +1,9 @@
 # Directories
 node_modules
 typings
-.vscode
 
 # Dot files
 .npmignore
-.gitignore
-.editorconfig
 
 # d.ts files
 **/*.d.ts

bundles/angular2-polyfill.js renamed to angular2-polyfill/bundles/angular2-polyfill.js

@@ -0,0 +1,17 @@
+{
+  "name": "angular2-polyfill",
+  "version": "0.0.17",
+  "description": "Angular2 polyfill for Angular1",
+  "license": "MIT",
+  "repository": "SamVerschueren/angular2-polyfill",
+  "author": {
+    "name": "Sam Verschueren",
+    "email": "[email protected]",
+    "url": "github.com/SamVerschueren"
+  },
+  "main": false,
+  "dependencies": {
+    "camelcase": "^2.1.1",
+    "dot-prop": "^2.4.0"
+  }
+}

core.ts renamed to angular2-polyfill/core.ts

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "outDir": "./",
+    "sourceMap": false,
+    "declaration": true,
+    "experimentalDecorators": true
+  },
+  "exclude": [
+    "typings/browser",
+    "typings/browser.d.ts"
+  ]
+}

http.ts renamed to angular2-polyfill/http.ts

@@ -1,9 +1,9 @@
 'use strict';
 const path = require('path');
 const gulp = require('gulp');
-const del = require('del');
 const merge = require('merge2');
 const Builder = require('systemjs-builder');
+const ts = require('gulp-typescript');
 
 const ANGULAR2_POLYFILL_BUNDLE_CONFIG = [
 	'angular2-polyfill/core',
@@ -30,16 +30,15 @@ function bundle(buildConfig, moduleName, outputFile, outputConfig) {
 	return builder.bundle(moduleName, outputFile, outputConfig);
 }
 
-gulp.task('bundle', ['cp'], () => {
-	return bundle(bundleConfig, NG2_POLYFILL_BUNDLE_CONTENT, './bundles/angular2-polyfill.js', {sourceMaps: true})
-		.then(() => del('angular2-polyfill'));
+gulp.task('bundle', () => {
+	return bundle(bundleConfig, NG2_POLYFILL_BUNDLE_CONTENT, './angular2-polyfill/bundles/angular2-polyfill.js', {sourceMaps: true});
 });
 
-gulp.task('cp', () => {
-	const streams = [];
-	streams.push(gulp.src('*.js').pipe(gulp.dest('angular2-polyfill')));
-	streams.push(gulp.src('**/*.js', {cwd: 'platform'}).pipe(gulp.dest('angular2-polyfill/platform')));
-	streams.push(gulp.src('**/*.js', {cwd: 'src'}).pipe(gulp.dest('angular2-polyfill/src')));
-
-	return merge(streams);
+gulp.task('typedefs', () => {
+	const project = ts.createProject('tsconfig.json', {outFile: 'angular2-polyfill.js'});
+	const tsResult = project.src()
+		.pipe(ts(project));
+	return tsResult.dts.pipe(gulp.dest('./angular2-polyfill/bundles'))
 });
+
+gulp.task('build', ['bundle', 'typedefs']);

angular2-polyfill/package.json

@@ -4,31 +4,33 @@
   "description": "Angular2 polyfill for Angular1",
   "license": "MIT",
   "repository": "SamVerschueren/angular2-polyfill",
+  "private": true,
   "author": {
     "name": "Sam Verschueren",
     "email": "[email protected]",
     "url": "github.com/SamVerschueren"
   },
-  "main": false,
   "scripts": {
     "postinstall": "npm run typings install",
-    "prepublish": "npm run compile && gulp bundle",
-    "compile": "tsc -p ./",
-    "watch": "tsc -watch -p ./",
-    "typings": "typings",
-    "link": "jspm link npm:angular2-polyfill@dev -y"
+    "prepublish": "npm run pub",
+    "build": "npm run compile && npm run tsd-gen && gulp build",
+    "compile": "tsc -p ./angular2-polyfill",
+    "watch": "tsc -watch -p ./angular2-polyfill",
+    "pub": "cd angular2-polyfill && npm publish",
+    "typings": "cd angular2-polyfill && typings",
+    "link": "cd angular2-polyfill && jspm link npm:angular2-polyfill@dev -y",
+    "tsd-gen": "tsc -p angular2-polyfill --outFile angular2-polyfill/bundles/angular2-polyfill.js --module system -d --moduleResolution classic --rootDir \"./\""
   },
   "dependencies": {
     "camelcase": "^2.1.1",
     "decamelize": "^1.2.0",
     "dot-prop": "^2.4.0"
   },
   "devDependencies": {
-    "del": "^2.2.0",
     "gulp": "^3.9.1",
-    "merge2": "^1.0.1",
-    "systemjs-builder": "^0.15.13",
-    "typescript": "^1.7.5",
-    "typings": "^0.6.8"
+    "gulp-json-editor": "^2.2.1",
+    "systemjs-builder": "^0.15.12",
+    "typescript": "^1.8.7",
+    "typings": "^0.7.9"
   }
 }

platform/browser.ts renamed to angular2-polyfill/platform/browser.ts

@@ -2,14 +2,14 @@
   "compilerOptions": {
     "target": "es5",
     "module": "commonjs",
-    "outDir": "./",
+    "outDir": "./angular2-polyfill",
     "sourceMap": false,
     "declaration": true,
     "experimentalDecorators": true
   },
   "exclude": [
-    "node_modules",
-		"typings/browser",
-		"typings/browser.d.ts"
+		"node_modules",
+    "angular2-polyfill/typings/browser",
+    "angular2-polyfill/typings/browser.d.ts"
   ]
 }