Skip to content

Commit 40a3dc8

Browse files
committed
roll back splitting off webpack tests for now, change tsconfig jsx to preserve in order for eslint plugins to work
1 parent e1f9a48 commit 40a3dc8

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"experimentalDecorators": true,
2727

2828
"esModuleInterop": true,
29-
"jsx": "react",
29+
"jsx": "preserve",
3030
"baseUrl": ".",
3131
"outDir": "src/sentry/static/sentry/dist",
3232
"paths": {

webpack.config.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ const USE_HOT_MODULE_RELOAD =
3333
const NO_DEV_SERVER = env.NO_DEV_SERVER;
3434
const IS_CI = !!env.CI || !!env.TRAVIS;
3535

36-
// We only use ts-loader directly in CI for a specific job
37-
const USE_TS_LOADER = env.TEST_SUITE === 'js-build';
38-
3936
// Deploy previews are built using netlify. We can check if we're in netlifys
4037
// build process by checking the existence of the PULL_REQUEST env var.
4138
//
@@ -239,7 +236,7 @@ let appConfig = {
239236
//
240237
// However, we don't want to lose typechecking in CI, so we have a CI task
241238
// that will run explicitly ts-loader
242-
use: USE_TS_LOADER ? [babelLoaderConfig, tsLoaderConfig] : babelLoaderConfig,
239+
use: !IS_CI ? babelLoaderConfig : [babelLoaderConfig, tsLoaderConfig],
243240
},
244241
{
245242
test: /\.po$/,

0 commit comments

Comments
 (0)