From 6cf71147a0e65b2097cd92a993375724ea2d9a29 Mon Sep 17 00:00:00 2001 From: Tim Haase Date: Wed, 27 Jan 2016 00:00:41 +0100 Subject: [PATCH] Update to typescript 1.8.0-dev Add new compiler option concerning synthetic default imports Fix library imports to rely on new compiler option Update typings and dependencies --- package.json | 10 ++++----- src/app/app.ts | 6 ++--- src/libs/canjs/canjs.js | 4 ---- src/libs/cordova/cordova.js | 6 ----- src/libs/cordova/cordova.ts | 3 +++ src/libs/jquery/jquery.js | 7 +----- tsconfig.json | 1 + tsd.json | 44 ++++++++++++++++++------------------- webpack.config.js | 3 --- 9 files changed, 35 insertions(+), 49 deletions(-) delete mode 100644 src/libs/cordova/cordova.js create mode 100644 src/libs/cordova/cordova.ts diff --git a/package.json b/package.json index c2a80a7..b2c1a80 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ }, "dependencies": {}, "devDependencies": { - "babel-core": "^6.3.13", - "babel-loader": "^6.2.0", + "babel-core": "^6.4.5", + "babel-loader": "^6.2.1", "babel-preset-es2015": "^6.3.13", "base64-loader": "^1.0.0", "grunt": "^0.4.5", @@ -25,8 +25,8 @@ "lodash": "^3.10.1", "raw-loader": "^0.5.1", "ts-loader": "^0.7.2", - "typescript": "^1.7.3", - "webpack": "^1.12.9", - "webpack-dev-server": "^1.14.0" + "typescript": "^1.8.0-dev || ^1.8.0", + "webpack": "^1.12.12", + "webpack-dev-server": "^1.14.1" } } diff --git a/src/app/app.ts b/src/app/app.ts index 096cc34..a2a6ad0 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -1,7 +1,7 @@ import {Test} from './main/main'; -import * as can from 'canjs'; -import * as cordova from 'cordova'; -import * as $ from 'jquery'; +import can from 'canjs'; +import cordova from 'cordova'; +import $ from 'jquery'; import config from 'config'; module PocketCombineApp { diff --git a/src/libs/canjs/canjs.js b/src/libs/canjs/canjs.js index 4c34baf..3d84b23 100644 --- a/src/libs/canjs/canjs.js +++ b/src/libs/canjs/canjs.js @@ -1,7 +1,3 @@ define(['can'], function (can) { - // Set the __esModule flag. This lets babel return the exports object - // directly instead of writing it into the 'default' property of the - // returned object. - can.__esModule = true; return can; }); diff --git a/src/libs/cordova/cordova.js b/src/libs/cordova/cordova.js deleted file mode 100644 index 675b798..0000000 --- a/src/libs/cordova/cordova.js +++ /dev/null @@ -1,6 +0,0 @@ -var cordova = window.cordova; -// Set the __esModule flag. This lets babel return the exports object -// directly instead of writing it into the 'default' property of the -// returned object. -cordova.__esModule = true; -module.exports = cordova; diff --git a/src/libs/cordova/cordova.ts b/src/libs/cordova/cordova.ts new file mode 100644 index 0000000..4ba8173 --- /dev/null +++ b/src/libs/cordova/cordova.ts @@ -0,0 +1,3 @@ +let cordova: Cordova = window.cordova; + +export default cordova; diff --git a/src/libs/jquery/jquery.js b/src/libs/jquery/jquery.js index 33628ea..4bf5ca9 100644 --- a/src/libs/jquery/jquery.js +++ b/src/libs/jquery/jquery.js @@ -1,6 +1 @@ -var $ = require('./jquery-2.1.4'); -// Set the __esModule flag. This lets babel return the exports object -// directly instead of writing it into the 'default' property of the -// returned object. -$.__esModule = true; -module.exports = $; +module.exports = require('./jquery-2.1.4'); diff --git a/tsconfig.json b/tsconfig.json index 0419933..834d9e2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "target": "es6", "sourceMap": false, "module": "commonjs", + "allowSyntheticDefaultImports": true, "noImplicitAny": true }, "files": [ diff --git a/tsd.json b/tsd.json index b4469c6..a9b98c6 100644 --- a/tsd.json +++ b/tsd.json @@ -6,70 +6,70 @@ "bundle": "src/typings/tsd/tsd.d.ts", "installed": { "cordova/cordova.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/BatteryStatus.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/DeviceMotion.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Device.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/DeviceOrientation.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Dialogs.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/FileSystem.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/FileTransfer.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Globalization.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Media.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/InAppBrowser.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/MediaCapture.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/NetworkInformation.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Push.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Splashscreen.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/StatusBar.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Vibration.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/WebSQL.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Keyboard.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Camera.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "cordova/plugins/Contacts.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" }, "jquery/jquery.d.ts": { - "commit": "e5a27ea95e47b95333784f1f0d590127b4e39a89" + "commit": "f29bf726a60674dbf24bab06a26403a3871c3f21" } } } diff --git a/webpack.config.js b/webpack.config.js index a5cc113..73b2f4b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,9 +18,6 @@ module.exports = { filename: 'app.js', }, resolve: { - // alias: { - // jquery: 'jquery-es6' - // }, root: [path.resolve('./src/app')] .concat(getSubDirectories('./src/libs')) .concat(getSubDirectories('./src/modules')),