Skip to content

Commit

Permalink
Prepare for 2.3.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyreilly committed Sep 6, 2017
1 parent caaeda9 commit adf0b19
Show file tree
Hide file tree
Showing 179 changed files with 10,127 additions and 57 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ env:
- TYPESCRIPT=typescript@2.0.9
- TYPESCRIPT=typescript@1.8.2
- TYPESCRIPT=typescript@1.7.5
- TYPESCRIPT=typescript@1.6.2
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## v2.3.5 - NOT RELEASED YET
## v2.3.5

- [Add an additional check for js files before reusing isExternalLibaryImport](https://github.com/TypeStrong/ts-loader/pull/622) (#620) - thanks @WillMartin
- [Make TypeScript `basePath` configurable](https://github.com/TypeStrong/ts-loader/pull/621) (#618) - thanks @Loilo!
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ ts-loader supports the latest and greatest version of TypeScript right back to v

ts-loader supports webpack 2. It may well still work with webpack 1 but it does not officially support webpack 1 any longer. Our continuous integration test suites run against webpack 2; **not** webpack 1.

A full test suite runs each night (and on each pull request). It runs both on [Linux](https://travis-ci.org/TypeStrong/ts-loader) and [Windows](https://ci.appveyor.com/project/JohnReilly/ts-loader), testing ts-loader against each major release of TypeScript from the latest right back to 1.6. The test suite also runs against TypeScript@next (because we want to use it as much as you do).
A full test suite runs each night (and on each pull request). It runs both on [Linux](https://travis-ci.org/TypeStrong/ts-loader) and [Windows](https://ci.appveyor.com/project/JohnReilly/ts-loader), testing ts-loader against major releases of TypeScript. The test suite also runs against TypeScript@next (because we want to use it as much as you do).

If you become aware of issues not caught by the test suite then please let us know. Better yet, write a test and submit it in a PR!

Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ environment:
- TYPESCRIPT: typescript@2.0.9
- TYPESCRIPT: typescript@1.8.2
- TYPESCRIPT: typescript@1.7.5
- TYPESCRIPT: typescript@1.6.2
install:
- ps: Install-Product node $env:nodejs_version
- npm install
Expand Down
92 changes: 46 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ts-loader",
"version": "2.3.4",
"version": "2.3.5",
"description": "TypeScript loader for webpack",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ export interface ResolvedModule {

export interface TSCompatibleCompiler {
// typescript@next 1.7+
readConfigFile(fileName: string, readFile: (path: string) => string): {
readConfigFile(fileName: string, readFile: (path: string, encoding?: string | undefined) => string | undefined): {
config?: any;
error?: typescript.Diagnostic;
};
Expand Down
5 changes: 3 additions & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,9 @@ export function collectAllDependants(
const result = {};
result[fileName] = true;
collected[fileName] = true;
if (reverseDependencyGraph[fileName]) {
Object.keys(reverseDependencyGraph[fileName]).forEach(dependantFileName => {
const dependants = reverseDependencyGraph[fileName];
if (dependants !== undefined) {
Object.keys(dependants).forEach(dependantFileName => {
if (!collected[dependantFileName]) {
collectAllDependants(reverseDependencyGraph, dependantFileName, collected)
.forEach(fName => result[fName] = true);
Expand Down
90 changes: 90 additions & 0 deletions test/comparison-tests/aliasResolution/expectedOutput-2.5/bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
/******/ (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;
/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };
/******/
/******/ // 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 = 1);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports, __webpack_require__) {

"use strict";

module.exports = 'myComponent';


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

"use strict";

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


/***/ })
/******/ ]);
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Asset Size Chunks Chunk Names
bundle.js 2.89 kB 0 [emitted] main
chunk {0} bundle.js (main) 166 bytes [entry] [rendered]
[0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]
[1] ./.test/aliasResolution/app.ts 120 bytes {0} [built]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Asset Size Chunks Chunk Names
bundle.js 2.89 kB 0 [emitted] main
chunk {0} bundle.js (main) 166 bytes [entry] [rendered]
[0] ./.test/aliasResolution/common/components/myComponent.ts 46 bytes {0} [built]
[1] ./.test/aliasResolution/app.ts 120 bytes {0} [built] [1 error]

ERROR in ./.test/aliasResolution/app.ts
(2,31): error TS2307: Cannot find module 'components/myComponent2'.
Loading

0 comments on commit adf0b19

Please sign in to comment.