Skip to content

Commit

Permalink
Merge pull request #678 from johnnyreilly/master
Browse files Browse the repository at this point in the history 
upgraded to building with ts 2.6
  • Loading branch information
@johnnyreilly
johnnyreilly committed Nov 4, 2017
2 parents e4cbeb8 + 0951587 commit 013bac9
Show file tree
Hide file tree
Showing 181 changed files with 10,034 additions and 637 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
View file
Expand Up @@ -12,8 +12,9 @@ install:
- yarn build
- yarn add $TYPESCRIPT
env:
- TYPESCRIPT=typescript@2.5.2
- TYPESCRIPT=typescript@2.6.1
- TYPESCRIPT=typescript@next
- TYPESCRIPT=typescript@2.5.2
- TYPESCRIPT=typescript@2.4.1
- TYPESCRIPT=typescript@2.3.1
- TYPESCRIPT=typescript@2.2.1
Expand Down
3 changes: 2 additions & 1 deletion appveyor.yml
View file
Expand Up @@ -3,8 +3,9 @@ environment:
FORCE_COLOR: 1
nodejs_version: "8"
matrix:
- TYPESCRIPT: typescript@2.5.2
- TYPESCRIPT: typescript@2.6.1
- TYPESCRIPT: typescript@next
- TYPESCRIPT: typescript@2.5.2
- TYPESCRIPT: typescript@2.4.1
- TYPESCRIPT: typescript@2.3.1
- TYPESCRIPT: typescript@2.2.1
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Expand Up @@ -63,9 +63,8 @@
"karma-webpack": "^2.0.1",
"mkdirp": "^0.5.1",
"mocha": "^4.0.0",
"rimraf": "^2.4.2",
"typescript": "^2.4.2",
"typings": "^2.0.0",
"rimraf": "^2.6.2",
"typescript": "^2.6.1",
"webpack": "^3.6.0"
}
}
1 change: 1 addition & 0 deletions src/tsconfig.json
View file
Expand Up @@ -7,6 +7,7 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"suppressImplicitAnyIndexErrors": true,
"strictFunctionTypes": true,
"strictNullChecks": true,
"lib": [
"es5", "es2015.core"
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
View file
Expand Up @@ -45,7 +45,7 @@ function defaultErrorFormatter(error: ErrorInfo, colors: Chalk) {
* Optionally adds a file name
*/
export function formatErrors(
diagnostics: typescript.Diagnostic[] | undefined,
diagnostics: ReadonlyArray<typescript.Diagnostic> | undefined,
loaderOptions: LoaderOptions,
colors: Chalk,
compiler: typeof typescript,
Expand Down
87 changes: 87 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/bundle.js
View file
@@ -0,0 +1,87 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports, __webpack_require__) {

"use strict";

exports.__esModule = true;
var myComponent = __webpack_require__(1);
console.log(myComponent);


/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {

"use strict";

module.exports = 'myComponent';


/***/ })
/******/ ]);
4 changes: 4 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/output.transpiled.txt
View file
@@ -0,0 +1,4 @@
Asset Size Chunks Chunk Names
bundle.js 2.73 kB 0 [emitted] main
[0] ./.test/aliasResolution/app.ts 120 bytes {0} [built]
[1] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]
8 changes: 8 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/output.txt
View file
@@ -0,0 +1,8 @@
Asset Size Chunks Chunk Names
bundle.js 2.73 kB 0 [emitted] main
[0] ./.test/aliasResolution/app.ts 120 bytes {0} [built] [1 error]
[1] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]

ERROR in ./.test/aliasResolution/app.ts
[tsl] ERROR in app.ts(2,31)
 TS2307: Cannot find module 'components/myComponent2'.
87 changes: 87 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/patch0/bundle.js
View file
@@ -0,0 +1,87 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports, __webpack_require__) {

"use strict";

exports.__esModule = true;
var myComponent = __webpack_require__(1);
console.log(myComponent);


/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {

"use strict";

module.exports = 'changed it';


/***/ })
/******/ ]);
4 changes: 4 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/patch0/output.transpiled.txt
View file
@@ -0,0 +1,4 @@
Asset Size Chunks Chunk Names
bundle.js 2.73 kB 0 [emitted] main
[0] ./.test/aliasResolution/app.ts 120 bytes {0}
[1] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]
8 changes: 8 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.6/patch0/output.txt
View file
@@ -0,0 +1,8 @@
Asset Size Chunks Chunk Names
bundle.js 2.73 kB 0 [emitted] main
[0] ./.test/aliasResolution/app.ts 120 bytes {0} [built] [1 error]
[1] ./.test/aliasResolution/common/components/myComponent.ts 45 bytes {0} [built]

ERROR in ./.test/aliasResolution/app.ts
[tsl] ERROR in app.ts(2,31)
 TS2307: Cannot find module 'components/myComponent2'.
74 changes: 74 additions & 0 deletions test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.6/bundle.js
View file
@@ -0,0 +1,74 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports) {

console.log('working');


/***/ })
/******/ ]);
3 changes: 3 additions & 0 deletions test/comparison-tests/allowJs-entryFileIsJs/expectedOutput-2.6/output.txt
View file
@@ -0,0 +1,3 @@
Asset Size Chunks Chunk Names
bundle.js 2.5 kB 0 [emitted] main
[0] ./.test/allowJs-entryFileIsJs/src/index.js 24 bytes {0} [built]

0 comments on commit 013bac9

Please sign in to comment.