From 847e9fc4b61df635b13b6e150fc12d38db8155f6 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 08:34:18 +0100 Subject: [PATCH 1/8] Added speculative test of allowJsImportTypes scenario --- .../2.0.3_babel-allowJsImportTypes/README.md | 3 + .../karma.conf.js | 51 +++++++++++++++++ .../2.0.3_babel-allowJsImportTypes/main.js | 4 ++ .../package.json | 17 ++++++ .../src/entry.js | 5 ++ .../src/imported.ts | 3 + .../test/entry.tests.js | 8 +++ .../tsconfig.json | 17 ++++++ .../webpack.config.js | 55 +++++++++++++++++++ 9 files changed, 163 insertions(+) create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json create mode 100644 test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md b/test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md new file mode 100644 index 000000000..06a794d2f --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md @@ -0,0 +1,3 @@ +This test confirms that you can import typings from an npm module when `allowJs` is true. See details [#586](https://github.com/TypeStrong/ts-loader/issues/586). + +This test is roughly based on https://github.com/bsouthga/ts-loader-types-error-example \ No newline at end of file diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js new file mode 100644 index 000000000..90545c70d --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js @@ -0,0 +1,51 @@ +/* eslint-disable no-var, strict */ +'use strict'; +var webpackConfig = require('./webpack.config.js'); + +module.exports = function(config) { + // Documentation: https://karma-runner.github.io/0.13/config/configuration-file.html + config.set({ + browsers: [ 'PhantomJS' ], + + files: [ + // This ensures we have the es6 shims in place and then loads all the tests + 'main.js' + ], + + port: 9876, + + frameworks: [ 'jasmine' ], + + logLevel: config.LOG_INFO, //config.LOG_DEBUG + + preprocessors: { + 'main.js': [ 'webpack', 'sourcemap' ] + }, + + webpack: { + devtool: 'inline-source-map', + module: webpackConfig.module, + resolve: webpackConfig.resolve, + + // for test harness purposes only, you would not need this in a normal project + resolveLoader: webpackConfig.resolveLoader + }, + + webpackMiddleware: { + quiet: true, + stats: { + colors: true + } + }, + + // reporter options + mochaReporter: { + colors: { + success: 'bgGreen', + info: 'cyan', + warning: 'bgBlue', + error: 'bgRed' + } + } + }); +}; diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js new file mode 100644 index 000000000..735130b0e --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js @@ -0,0 +1,4 @@ +import 'babel-polyfill'; + +const testsContext = require.context('./', true, /\.tests\.js$/); +testsContext.keys().forEach(testsContext); diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json b/test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json new file mode 100644 index 000000000..0fdf579f1 --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json @@ -0,0 +1,17 @@ +{ + "name": "allow-js-import-types", + "version": "1.0.0", + "main": "index.js", + "devDependencies": { + "@types/jasmine": "^2.5.35", + "babel": "^6.0.0", + "babel-core": "^6.0.0", + "babel-loader": "^7.0.0", + "babel-preset-es2015": "^6.0.0", + "jasmine-core": "^2.3.4" + }, + "dependencies": { + "babel-polyfill": "^6.0.0", + "event-rank": "^0.0.10" + } +} diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js new file mode 100644 index 000000000..e224b9ff5 --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js @@ -0,0 +1,5 @@ +import EventRank from './imported'; + +export function getEventRank() { + return EventRank; +} diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts b/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts new file mode 100644 index 000000000..4e047d329 --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts @@ -0,0 +1,3 @@ +import { EventRank } from 'event-rank'; + +export default EventRank; \ No newline at end of file diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js new file mode 100644 index 000000000..0871d5fdc --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js @@ -0,0 +1,8 @@ +var entry = require('../src/entry'); + +describe("entry", function() { + it("getEventRank produces something", function() { + var EventRank = getEventRank(); + expect(EventRank).not.toBeUndefined(); + }); +}); diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json b/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json new file mode 100644 index 000000000..c4461d461 --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "allowJs": true, + "lib": [ + "dom", + "es2015" + ], + "target": "es2015", + "module": "es2015", + "moduleResolution": "node", + "noImplicitAny": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "sourceMap": true, + "skipLibCheck": true + } +} \ No newline at end of file diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js new file mode 100644 index 000000000..76a3718a5 --- /dev/null +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js @@ -0,0 +1,55 @@ +/* eslint-disable no-var, strict, prefer-arrow-callback */ +'use strict'; + +var path = require('path'); +var webpack = require('webpack'); + +var babelOptions = { + "presets": [ + [ + "es2015", + { + "modules": false + } + ] + ] +}; + +module.exports = { + entry: './src/entry.js', + output: { + filename: 'bundle.js' + }, + module: { + rules: [{ + test: /\.ts(x?)$/, + exclude: /node_modules/, + use: [ + { + loader: 'babel-loader', + options: babelOptions + }, + { + loader: 'ts-loader', + options: { entryFileIsJs: true } + } + ] + }, { + test: /\.js$/, + exclude: /node_modules/, + use: [ + { + loader: 'babel-loader', + options: babelOptions + } + ] + }] + }, + resolve: { + // Add `.ts` and `.tsx` as a resolvable extension. + extensions: ['.ts', '.tsx', '.js'] + }, +}; + +// for test harness purposes only, you would not need this in a normal project +module.exports.resolveLoader = { alias: { 'ts-loader': path.join(__dirname, "../../../index.js") } } \ No newline at end of file From 8c9ee4f700b97538324914351571406319b22358 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 08:48:06 +0100 Subject: [PATCH 2/8] correct test to reference entry --- .../2.0.3_babel-allowJsImportTypes/test/entry.tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js b/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js index 0871d5fdc..5ffccb5f4 100644 --- a/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js @@ -2,7 +2,7 @@ var entry = require('../src/entry'); describe("entry", function() { it("getEventRank produces something", function() { - var EventRank = getEventRank(); + var EventRank = entry.getEventRank(); expect(EventRank).not.toBeUndefined(); }); }); From 4b40a73981e0f729a06bced1850341510b7a3776 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 09:06:00 +0100 Subject: [PATCH 3/8] added noEmitOnError to trigger error --- .../execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json b/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json index c4461d461..eb0dae0c8 100644 --- a/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json +++ b/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json @@ -8,6 +8,7 @@ "target": "es2015", "module": "es2015", "moduleResolution": "node", + "noEmitOnError": true, "noImplicitAny": true, "noUnusedLocals": true, "noUnusedParameters": true, From 5dac1dc8d989494b5f920a033f7fcc50e1549023 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 09:22:36 +0100 Subject: [PATCH 4/8] no longer depends on @types/jasmine so can be made to run back with 1.8.2 --- .../README.md | 0 .../karma.conf.js | 0 .../main.js | 0 .../package.json | 1 - .../src/entry.js | 0 .../src/imported.ts | 0 .../test/entry.tests.js | 0 .../tsconfig.json | 0 .../webpack.config.js | 0 9 files changed, 1 deletion(-) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/README.md (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/karma.conf.js (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/main.js (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/package.json (91%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/src/entry.js (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/src/imported.ts (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/test/entry.tests.js (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/tsconfig.json (100%) rename test/execution-tests/{2.0.3_babel-allowJsImportTypes => 1.8.2_babel-allowJsImportTypes}/webpack.config.js (100%) diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md b/test/execution-tests/1.8.2_babel-allowJsImportTypes/README.md similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/README.md rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/README.md diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js b/test/execution-tests/1.8.2_babel-allowJsImportTypes/karma.conf.js similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/karma.conf.js rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/karma.conf.js diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js b/test/execution-tests/1.8.2_babel-allowJsImportTypes/main.js similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/main.js rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/main.js diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json b/test/execution-tests/1.8.2_babel-allowJsImportTypes/package.json similarity index 91% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/package.json index 0fdf579f1..3a82c6a5e 100644 --- a/test/execution-tests/2.0.3_babel-allowJsImportTypes/package.json +++ b/test/execution-tests/1.8.2_babel-allowJsImportTypes/package.json @@ -3,7 +3,6 @@ "version": "1.0.0", "main": "index.js", "devDependencies": { - "@types/jasmine": "^2.5.35", "babel": "^6.0.0", "babel-core": "^6.0.0", "babel-loader": "^7.0.0", diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js b/test/execution-tests/1.8.2_babel-allowJsImportTypes/src/entry.js similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/src/entry.js rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/src/entry.js diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts b/test/execution-tests/1.8.2_babel-allowJsImportTypes/src/imported.ts similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/src/imported.ts rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/src/imported.ts diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js b/test/execution-tests/1.8.2_babel-allowJsImportTypes/test/entry.tests.js similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/test/entry.tests.js rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/test/entry.tests.js diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json b/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/tsconfig.json rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json diff --git a/test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js b/test/execution-tests/1.8.2_babel-allowJsImportTypes/webpack.config.js similarity index 100% rename from test/execution-tests/2.0.3_babel-allowJsImportTypes/webpack.config.js rename to test/execution-tests/1.8.2_babel-allowJsImportTypes/webpack.config.js From 10984f230b4eba40db23d4ddc372aa623866dbb0 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 09:51:34 +0100 Subject: [PATCH 5/8] go for a 1.8.2 friendly tsconfig.json --- .../1.8.2_babel-allowJsImportTypes/tsconfig.json | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json b/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json index eb0dae0c8..930957a60 100644 --- a/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json +++ b/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json @@ -1,18 +1,11 @@ { "compilerOptions": { "allowJs": true, - "lib": [ - "dom", - "es2015" - ], - "target": "es2015", "module": "es2015", "moduleResolution": "node", "noEmitOnError": true, - "noImplicitAny": true, - "noUnusedLocals": true, - "noUnusedParameters": true, + "noImplicitAny": false, "sourceMap": true, - "skipLibCheck": true + "target": "es2015" } } \ No newline at end of file From 598330f0216fa9032eeb88571a931b5271d36a54 Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 11:21:44 +0100 Subject: [PATCH 6/8] Resolved filenames that are definition file from node_modules are treated as isExternalLibraryImport Suggested by @bsouthga - let's see if this fixes our broken test. --- src/servicesHost.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/servicesHost.ts b/src/servicesHost.ts index f094ba5da..8c1d81e55 100644 --- a/src/servicesHost.ts +++ b/src/servicesHost.ts @@ -152,7 +152,8 @@ function resolveModuleName( isExternalLibraryImport: tsResolution.resolvedModule.isExternalLibraryImport }; if (resolutionResult!) { - if (resolutionResult!.resolvedFileName === tsResolutionResult.resolvedFileName) { + if (resolutionResult!.resolvedFileName === tsResolutionResult.resolvedFileName || + /node_modules\/.*\.d\.ts/.test(tsResolutionResult.resolvedFileName)) { resolutionResult!.isExternalLibraryImport = tsResolutionResult.isExternalLibraryImport; } } else { From be0016e3791c9113c56c6399df4b81e67abf2fca Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 12:07:54 +0100 Subject: [PATCH 7/8] match backslashes or forward slashes --- src/servicesHost.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servicesHost.ts b/src/servicesHost.ts index 8c1d81e55..4f65fb2ed 100644 --- a/src/servicesHost.ts +++ b/src/servicesHost.ts @@ -153,7 +153,7 @@ function resolveModuleName( }; if (resolutionResult!) { if (resolutionResult!.resolvedFileName === tsResolutionResult.resolvedFileName || - /node_modules\/.*\.d\.ts/.test(tsResolutionResult.resolvedFileName)) { + /node_modules(\\|\/).*\.d\.ts$/.test(tsResolutionResult.resolvedFileName)) { resolutionResult!.isExternalLibraryImport = tsResolutionResult.isExternalLibraryImport; } } else { From f55f0ae7611c7b10387bc06d04b408c9d75d788c Mon Sep 17 00:00:00 2001 From: John Reilly Date: Wed, 26 Jul 2017 21:11:23 +0100 Subject: [PATCH 8/8] Just run test against 2.1+ --- .../README.md | 0 .../karma.conf.js | 0 .../main.js | 0 .../package.json | 0 .../src/entry.js | 0 .../src/imported.ts | 0 .../test/entry.tests.js | 0 .../tsconfig.json | 0 .../webpack.config.js | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/README.md (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/karma.conf.js (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/main.js (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/package.json (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/src/entry.js (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/src/imported.ts (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/test/entry.tests.js (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/tsconfig.json (100%) rename test/execution-tests/{1.8.2_babel-allowJsImportTypes => 2.1.4_babel-allowJsImportTypes}/webpack.config.js (100%) diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/README.md b/test/execution-tests/2.1.4_babel-allowJsImportTypes/README.md similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/README.md rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/README.md diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/karma.conf.js b/test/execution-tests/2.1.4_babel-allowJsImportTypes/karma.conf.js similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/karma.conf.js rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/karma.conf.js diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/main.js b/test/execution-tests/2.1.4_babel-allowJsImportTypes/main.js similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/main.js rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/main.js diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/package.json b/test/execution-tests/2.1.4_babel-allowJsImportTypes/package.json similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/package.json rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/package.json diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/src/entry.js b/test/execution-tests/2.1.4_babel-allowJsImportTypes/src/entry.js similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/src/entry.js rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/src/entry.js diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/src/imported.ts b/test/execution-tests/2.1.4_babel-allowJsImportTypes/src/imported.ts similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/src/imported.ts rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/src/imported.ts diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/test/entry.tests.js b/test/execution-tests/2.1.4_babel-allowJsImportTypes/test/entry.tests.js similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/test/entry.tests.js rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/test/entry.tests.js diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json b/test/execution-tests/2.1.4_babel-allowJsImportTypes/tsconfig.json similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/tsconfig.json rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/tsconfig.json diff --git a/test/execution-tests/1.8.2_babel-allowJsImportTypes/webpack.config.js b/test/execution-tests/2.1.4_babel-allowJsImportTypes/webpack.config.js similarity index 100% rename from test/execution-tests/1.8.2_babel-allowJsImportTypes/webpack.config.js rename to test/execution-tests/2.1.4_babel-allowJsImportTypes/webpack.config.js