fix(skeleton-typescript): force global/ambient declarations

temporary solution, until all packages are updated

Author: niieani

skeleton-typescript-webpack/package.json

@@ -14,8 +14,8 @@
     "pree2e": "npm run webdriver:update -- --standalone",
     "e2e": "./node_modules/.bin/protractor ./config/protractor.conf.js",
     "e2e:live": "npm run e2e -- --elementExplorer",
-    "clean": "npm cache clean && rimraf node_modules typings coverage dist",
-    "clean:dist": "rimraf dist",
+    "clean": "npm cache clean && ./node_modules/.bin/rimraf node_modules typings coverage dist",
+    "clean:dist": "./node_modules/.bin/rimraf dist",
     "preclean:install": "npm run clean",
     "clean:install": "npm set progress=false && npm install",
     "preclean:start": "npm run clean",
@@ -132,14 +132,14 @@
     "bootstrap": "^3.3.6",
     "font-awesome": "^4.6.3",
     "isomorphic-fetch": "^2.2.1",
-    "jquery": "^2.2.4",
+    "jquery": "^3.0.0",
     "regenerator-runtime": "^0.9.5",
     "ts-helpers": "^1.1.1"
   },
   "devDependencies": {
     "aurelia-tools": "^0.2.1",
-    "aurelia-webpack-plugin": "^1.0.0-beta.1.0.5",
-    "awesome-typescript-loader": "^0.19.0",
+    "aurelia-webpack-plugin": "^1.0.0-beta.2.0.0",
+    "awesome-typescript-loader": "^1.0.0",
     "babel-core": "^6.9.1",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.9.0",
@@ -158,32 +158,32 @@
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
     "html-loader": "^0.4.3",
-    "html-webpack-plugin": "^2.19.0",
+    "html-webpack-plugin": "^2.20.0",
     "http-server": "^0.9.0",
     "jasmine-core": "^2.4.1",
     "json-loader": "^0.5.4",
     "jsonfile": "^2.3.1",
     "karma": "^0.13.22",
     "karma-chrome-launcher": "^1.0.1",
     "karma-jasmine": "^1.0.2",
-    "karma-mocha-reporter": "^2.0.3",
+    "karma-mocha-reporter": "^2.0.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "offline-plugin": "^3.3.0",
+    "offline-plugin": "^3.3.1",
     "protractor": "^3.3.0",
     "raw-loader": "^0.5.1",
     "recursive-readdir-sync": "^1.0.6",
     "source-map-loader": "^0.1.5",
     "style-loader": "^0.13.1",
     "ts-babel-node": "^1.0.0",
-    "tslint": "^3.10.2",
+    "tslint": "^3.11.0",
     "tslint-loader": "^2.1.4",
-    "typescript": "^1.9.0-dev.20160531-1.0",
+    "typescript": ">=1.9.0-dev || ^2.0.0",
     "typings": "^1.0.4",
     "url-loader": "^0.5.7",
     "wallaby-webpack": "0.0.22",
-    "webpack": "^2.1.0-beta.8",
-    "webpack-dev-server": "^2.1.0-beta.0",
+    "webpack": ">=2.1.0-beta.11 || ^2.1.0",
+    "webpack-dev-server": ">=2.1.0-beta.0 || ^2.1.0",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0"
   }

skeleton-typescript-webpack/tsconfig.json

@@ -2,7 +2,8 @@
   "compilerOptions": {
     "target": "es2015",
     "module": "commonjs",
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "moduleResolution": "classic"
   },
   "exclude": [
     "node_modules"

skeleton-typescript-webpack/tsconfig.webpack.json

@@ -4,6 +4,7 @@
     "module": "es2015",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "moduleResolution": "classic",
     "sourceMap": true,
     "noEmitHelpers": true
   },

skeleton-typescript-webpack/typings.json

@@ -5,30 +5,31 @@
     "webpack": "registry:npm/webpack#1.12.9+20160418172948"
   },
   "globalDependencies": {
-    "aurelia-binding": "npm:aurelia-binding/dist/aurelia-binding.d.ts",
-    "aurelia-bootstrapper-webpack": "npm:aurelia-bootstrapper-webpack/dist/aurelia-bootstrapper-webpack.d.ts",
-    "aurelia-dependency-injection": "npm:aurelia-dependency-injection/dist/aurelia-dependency-injection.d.ts",
-    "aurelia-event-aggregator": "npm:aurelia-event-aggregator/dist/aurelia-event-aggregator.d.ts",
-    "aurelia-fetch-client": "npm:aurelia-fetch-client/dist/aurelia-fetch-client.d.ts",
-    "aurelia-framework": "npm:aurelia-framework/dist/aurelia-framework.d.ts",
-    "aurelia-history": "npm:aurelia-history/dist/aurelia-history.d.ts",
-    "aurelia-history-browser": "npm:aurelia-history-browser/dist/aurelia-history-browser.d.ts",
-    "aurelia-loader": "npm:aurelia-loader/dist/aurelia-loader.d.ts",
-    "aurelia-loader-webpack": "npm:aurelia-loader-webpack/dist/aurelia-loader-webpack.d.ts",
-    "aurelia-logging": "npm:aurelia-logging/dist/aurelia-logging.d.ts",
-    "aurelia-logging-console": "npm:aurelia-logging-console/dist/aurelia-logging-console.d.ts",
-    "aurelia-metadata": "npm:aurelia-metadata/dist/aurelia-metadata.d.ts",
-    "aurelia-pal": "npm:aurelia-pal/dist/aurelia-pal.d.ts",
-    "aurelia-pal-browser": "npm:aurelia-pal-browser/dist/aurelia-pal-browser.d.ts",
-    "aurelia-path": "npm:aurelia-path/dist/aurelia-path.d.ts",
-    "aurelia-polyfills": "npm:aurelia-polyfills/dist/aurelia-polyfills.d.ts",
-    "aurelia-route-recognizer": "npm:aurelia-route-recognizer/dist/aurelia-route-recognizer.d.ts",
-    "aurelia-router": "npm:aurelia-router/dist/aurelia-router.d.ts",
-    "aurelia-task-queue": "npm:aurelia-task-queue/dist/aurelia-task-queue.d.ts",
-    "aurelia-templating": "npm:aurelia-templating/dist/aurelia-templating.d.ts",
-    "aurelia-templating-binding": "npm:aurelia-templating-binding/dist/aurelia-templating-binding.d.ts",
-    "aurelia-templating-resources": "npm:aurelia-templating-resources/dist/aurelia-templating-resources.d.ts",
-    "aurelia-templating-router": "npm:aurelia-templating-router/dist/aurelia-templating-router.d.ts"
+    "aurelia-binding": "github:aurelia/binding/dist/aurelia-binding.d.ts#69d54dbebafe87738f89b8ac4109921544d202cb",
+    "aurelia-bootstrapper-webpack": "github:aurelia/bootstrapper-webpack/dist/aurelia-bootstrapper-webpack.d.ts#cf122f8d2a61161bcc6b785c9dfe47dbc6b3a3ff",    
+    "aurelia-bootstrapper": "github:aurelia/bootstrapper/dist/aurelia-bootstrapper.d.ts#111ee4eb1e5df7af39305d190d635df7d93cb7e5",
+    "aurelia-dependency-injection": "github:aurelia/dependency-injection/dist/aurelia-dependency-injection.d.ts#dcb53d40d128f5ff89c6bafa587128583529bd68",
+    "aurelia-event-aggregator": "github:aurelia/event-aggregator/dist/aurelia-event-aggregator.d.ts#7a38c51dc9082175461e2d0b21a4c0a9242a8925",
+    "aurelia-fetch-client": "github:aurelia/fetch-client/dist/aurelia-fetch-client.d.ts#a97fa7b9484cd78d986b11e537394400c99d02fe",
+    "aurelia-framework": "github:aurelia/framework/dist/aurelia-framework.d.ts#e008c4a98147ae39556892a69e5c165947e293a7",
+    "aurelia-history": "github:aurelia/history/dist/aurelia-history.d.ts#21e1ecd279b5b6d7525103cf734318103aee5382",
+    "aurelia-history-browser": "github:aurelia/history-browser/dist/aurelia-history-browser.d.ts#19e095308a414ab561d3c5b327fcbc756e60f457",
+    "aurelia-loader": "github:aurelia/loader/dist/aurelia-loader.d.ts#5bc0bf9424946235bc6d63ce77f4a6b97b0b4742",
+    "aurelia-loader-webpack": "github:aurelia/loader-webpack/dist/aurelia-loader-webpack.d.ts#3a4e7ef6ca0e3836d26b78e7d14034ba40732ec1",
+    "aurelia-logging": "github:aurelia/logging/dist/aurelia-logging.d.ts#62417b8db6b82ef9c4dfe09eeca5cef6714e3b40",
+    "aurelia-logging-console": "github:aurelia/logging-console/dist/aurelia-logging-console.d.ts#a82125fb35a1efc6372c40b7cd5813cfbda1eb11",
+    "aurelia-metadata": "github:aurelia/metadata/dist/aurelia-metadata.d.ts#96c4c332fe4669e11b7570d3e8996cced9cf9042",
+    "aurelia-pal": "github:aurelia/pal/dist/aurelia-pal.d.ts#adc7e905abf4f76d1c71a19f740cb6bb45d5842e",
+    "aurelia-pal-browser": "github:aurelia/pal-browser/dist/aurelia-pal-browser.d.ts#ce3451eeeb2feb2c62ec30ec3f6a0122b4209282",
+    "aurelia-path": "github:aurelia/path/dist/aurelia-path.d.ts#762d6dd77200672080e6a24e6db9ab37b0dc6137",
+    "aurelia-polyfills": "github:aurelia/polyfills/dist/aurelia-polyfills.d.ts#e97d36f958436057ff277c00ce58a0edf42adfed",
+    "aurelia-route-recognizer": "github:aurelia/route-recognizer/dist/aurelia-route-recognizer.d.ts#2c89fa3ffd739262cc8f901514f314a25f21c9c1",
+    "aurelia-router": "github:aurelia/router/dist/aurelia-router.d.ts#39f05b6c85925829baa8be1256fc9ee9430e5854",
+    "aurelia-task-queue": "github:aurelia/task-queue/dist/aurelia-task-queue.d.ts#18ac85b517430a3ad8a390cc6bb114abad499bb1",
+    "aurelia-templating": "github:aurelia/templating/dist/aurelia-templating.d.ts#aad25d550f316ac2d7cac29c330059897c7d15bd",
+    "aurelia-templating-binding": "github:aurelia/templating-binding/dist/aurelia-templating-binding.d.ts#f90d1082b0aa3be71c23e26c1e152b22593a15b5",
+    "aurelia-templating-resources": "github:aurelia/templating-resources/dist/aurelia-templating-resources.d.ts#98f81efd2d7270742bfaa1f3c37d8a71a3936172",
+    "aurelia-templating-router": "github:aurelia/templating-router/dist/aurelia-templating-router.d.ts#68460e0398f896c5883be81588bdd5f3855f05c3"
   },
   "globalDevDependencies": {
     "angular-protractor": "github:DefinitelyTyped/DefinitelyTyped/angular-protractor/angular-protractor.d.ts#24e12a7af994afa2226af70fbfae0adc78736a9e",

skeleton-typescript/build/paths.js

@@ -14,8 +14,7 @@ module.exports = {
   e2eSpecsSrc: 'test/e2e/src/**/*.ts',
   e2eSpecsDist: 'test/e2e/dist/',
   dtsSrc: [
-    './typings/globals/**/*.d.ts',
-    './custom_typings/**/*.d.ts',
-    './jspm_packages/**/*.d.ts'
+    './typings/**/*.d.ts',
+    './custom_typings/**/*.d.ts'
   ]
 }

skeleton-typescript/build/tasks/build.js

@@ -6,7 +6,7 @@ var sourcemaps = require('gulp-sourcemaps');
 var paths = require('../paths');
 var assign = Object.assign || require('object.assign');
 var notify = require('gulp-notify');
-var typescript = require('gulp-tsb');
+var typescript = require('gulp-typescript');
 
 // transpiles changed es6 files to SystemJS format
 // the plumber() call prevents 'pipe breaking' caused
@@ -15,12 +15,14 @@ var typescript = require('gulp-tsb');
 var typescriptCompiler = typescriptCompiler || null;
 gulp.task('build-system', function() {
   if(!typescriptCompiler) {
-    typescriptCompiler = typescript.create(require('../../tsconfig.json').compilerOptions);
+    typescriptCompiler = typescript.createProject('tsconfig.json', {
+      "typescript": require('typescript')
+    });
   }
   return gulp.src(paths.dtsSrc.concat(paths.source))
     .pipe(plumber())
     .pipe(sourcemaps.init({loadMaps: true}))
-    .pipe(typescriptCompiler())
+    .pipe(typescript(typescriptCompiler))
     .pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: '/src'}))
     .pipe(gulp.dest(paths.output));
 });

skeleton-typescript/build/tasks/e2e.js

@@ -4,7 +4,7 @@ var plumber = require('gulp-plumber');
 var webdriverUpdate = require('gulp-protractor').webdriver_update;
 var webdriverStandalone = require('gulp-protractor').webdriver_standalone;
 var protractor = require('gulp-protractor').protractor;
-var typescript = require('gulp-tsb');
+var typescript = require('gulp-typescript');
 var assign = Object.assign || require('object.assign');
 var del = require('del');
 
@@ -23,10 +23,13 @@ gulp.task('clean-e2e', function() {
 var typescriptCompiler = typescriptCompiler || null;
 gulp.task('build-e2e', ['clean-e2e'], function() {
   if(!typescriptCompiler) {
-    typescriptCompiler = typescript.create(assign(require('../../tsconfig.json').compilerOptions, {module: 'commonjs'}));
+    typescriptCompiler = typescript.createProject('tsconfig.json', {
+      "typescript": require('typescript'),
+      module: 'commonjs'
+    });
   }
   return gulp.src(paths.dtsSrc.concat(paths.e2eSpecsSrc))
-    .pipe(typescriptCompiler())
+    .pipe(typescript(typescriptCompiler))
     .pipe(gulp.dest(paths.e2eSpecsDist));
 });