diff --git a/src/after-compile.ts b/src/after-compile.ts index 8918d4fd5..3b4da3402 100644 --- a/src/after-compile.ts +++ b/src/after-compile.ts @@ -183,7 +183,7 @@ function provideErrorsToWebpack( } = instance; const filePathRegex = - compilerOptions.checkJs === true + compilerOptions.allowJs === true ? constants.dtsTsTsxJsJsxRegex : constants.dtsTsTsxRegex; diff --git a/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/bundle.js b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/bundle.js new file mode 100644 index 000000000..ebe9e5a85 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/bundle.js @@ -0,0 +1,125 @@ +/******/ (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, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // 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 = "./src/index.js"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "./src/error1.js": +/*!***********************!*\ + !*** ./src/error1.js ***! + \***********************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +eval("\nObject.defineProperty(exports, \"__esModule\", { value: true });\nvar Class1 = /** @class */ (function () {\n function Class1() {\n }\n Class1.prototype.foo = function () {\n this.bar;\n };\n return Class1;\n}());\nexports.Class1 = Class1;\n\n\n//# sourceURL=webpack:///./src/error1.js?"); + +/***/ }), + +/***/ "./src/error2.js": +/*!***********************!*\ + !*** ./src/error2.js ***! + \***********************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +eval("\nObject.defineProperty(exports, \"__esModule\", { value: true });\n// @ts-check\nvar Class2 = /** @class */ (function () {\n function Class2() {\n }\n Class2.prototype.foo = function () {\n this.bar;\n };\n return Class2;\n}());\nexports.Class2 = Class2;\n\n\n//# sourceURL=webpack:///./src/error2.js?"); + +/***/ }), + +/***/ "./src/index.js": +/*!**********************!*\ + !*** ./src/index.js ***! + \**********************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +eval("\nObject.defineProperty(exports, \"__esModule\", { value: true });\nvar error1_1 = __webpack_require__(/*! ./error1 */ \"./src/error1.js\");\nvar error2_1 = __webpack_require__(/*! ./error2 */ \"./src/error2.js\");\nnew error1_1.Class1().foo();\nnew error2_1.Class2().foo();\n\n\n//# sourceURL=webpack:///./src/index.js?"); + +/***/ }) + +/******/ }); \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.transpiled.txt b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.transpiled.txt new file mode 100644 index 000000000..2cf6fb153 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.transpiled.txt @@ -0,0 +1,6 @@ + Asset Size Chunks Chunk Names +bundle.js 5.15 KiB main [emitted] main +Entrypoint main = bundle.js +[./src/error1.js] 265 bytes {main} [built] +[./src/error2.js] 278 bytes {main} [built] +[./src/index.js] 207 bytes {main} [built] \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.txt b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.txt new file mode 100644 index 000000000..d23aa7e61 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/expectedOutput-3.6/output.txt @@ -0,0 +1,11 @@ + Asset Size Chunks Chunk Names +bundle.js 5.15 KiB main [emitted] main +Entrypoint main = bundle.js +[./src/error1.js] 265 bytes {main} [built] +[./src/error2.js] 278 bytes {main} [built] [1 error] +[./src/index.js] 207 bytes {main} [built] + +ERROR in src\error2.js +./src/error2.js +[tsl] ERROR in src\error2.js(4,10) + TS2339: Property 'bar' does not exist on type 'Class2'. \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/src/error1.js b/test/comparison-tests/allowJs-ts-check/src/error1.js new file mode 100644 index 000000000..b2ae966e5 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/src/error1.js @@ -0,0 +1,5 @@ +export class Class1 { + foo() { + this.bar + } +} \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/src/error2.js b/test/comparison-tests/allowJs-ts-check/src/error2.js new file mode 100644 index 000000000..cd9a4af33 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/src/error2.js @@ -0,0 +1,6 @@ +// @ts-check +export class Class2 { + foo() { + this.bar + } +} \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/src/index.js b/test/comparison-tests/allowJs-ts-check/src/index.js new file mode 100644 index 000000000..246907be8 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/src/index.js @@ -0,0 +1,5 @@ +import { Class1 } from './error1'; +import { Class2 } from './error2'; + +new Class1().foo(); +new Class2().foo(); \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/tsconfig.json b/test/comparison-tests/allowJs-ts-check/tsconfig.json new file mode 100644 index 000000000..ce605f229 --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es5", + "module": "commonjs", + "emitBOM": true, + "outDir": "node", + "allowJs": true + }, + "include": [ + "src" + ] +} \ No newline at end of file diff --git a/test/comparison-tests/allowJs-ts-check/webpack.config.js b/test/comparison-tests/allowJs-ts-check/webpack.config.js new file mode 100644 index 000000000..ec5f3012e --- /dev/null +++ b/test/comparison-tests/allowJs-ts-check/webpack.config.js @@ -0,0 +1,20 @@ +module.exports = { + mode: 'development', + entry: './src/index.js', + output: { + filename: 'bundle.js' + }, + resolve: { + extensions: ['.ts', '.js'] + }, + module: { + rules: [ + { + test: /\.(js)$/, + loader: 'ts-loader' + } + ] + } +} + +