Use babel-loader instead of ts-loader

This commit is contained in:
dominik-zeglen 2019-08-23 14:07:56 +02:00
parent 8a71976c4b
commit f5142cd34a
4 changed files with 37 additions and 15 deletions

View file

@ -1,6 +1,13 @@
{ {
"presets": [ "presets": [
"@babel/preset-env", [
"@babel/preset-env",
{
"corejs": "3.2.1",
"modules": false,
"useBuiltIns": "usage"
}
],
"@babel/preset-react", "@babel/preset-react",
"@babel/preset-typescript" "@babel/preset-typescript"
], ],

30
package-lock.json generated
View file

@ -7209,9 +7209,10 @@
} }
}, },
"core-js": { "core-js": {
"version": "1.2.7", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==",
"dev": true
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.2.0", "version": "3.2.0",
@ -8976,6 +8977,13 @@
"promise": "^7.1.1", "promise": "^7.1.1",
"setimmediate": "^1.0.5", "setimmediate": "^1.0.5",
"ua-parser-js": "^0.7.18" "ua-parser-js": "^0.7.18"
},
"dependencies": {
"core-js": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
}
} }
}, },
"figgy-pudding": { "figgy-pudding": {
@ -19111,6 +19119,14 @@
"dev": true, "dev": true,
"requires": { "requires": {
"core-js": "^1.0.0" "core-js": "^1.0.0"
},
"dependencies": {
"core-js": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
"dev": true
}
} }
}, },
"pify": { "pify": {
@ -19252,6 +19268,14 @@
"dev": true, "dev": true,
"requires": { "requires": {
"core-js": "^1.0.0" "core-js": "^1.0.0"
},
"dependencies": {
"core-js": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
"dev": true
}
} }
}, },
"dedent": { "dedent": {

View file

@ -111,6 +111,7 @@
"babel-plugin-react-intl": "^4.1.12", "babel-plugin-react-intl": "^4.1.12",
"babel-plugin-react-intl-auto": "^2.2.0", "babel-plugin-react-intl-auto": "^2.2.0",
"codecov": "^3.5.0", "codecov": "^3.5.0",
"core-js": "^3.2.1",
"enzyme": "^3.10.0", "enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0", "enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "^3.3.5", "enzyme-to-json": "^3.3.5",
@ -126,7 +127,6 @@
"rimraf": "^2.7.0", "rimraf": "^2.7.0",
"testcafe": "^1.3.3", "testcafe": "^1.3.3",
"ts-jest": "^23.10.5", "ts-jest": "^23.10.5",
"ts-loader": "^5.4.5",
"tsconfig-paths-webpack-plugin": "^3.2.0", "tsconfig-paths-webpack-plugin": "^3.2.0",
"tslint": "^5.18.0", "tslint": "^5.18.0",
"tslint-config-prettier": "^1.18.0", "tslint-config-prettier": "^1.18.0",

View file

@ -67,19 +67,10 @@ module.exports = (env, argv) => {
module: { module: {
rules: [ rules: [
{ {
test: /\.jsx?$/, test: /\.(jsx?|tsx?)$/,
exclude: /node_modules/, exclude: /node_modules/,
loader: "babel-loader" loader: "babel-loader"
}, },
{
test: /\.tsx?$/,
exclude: /node_modules/,
loader: "ts-loader",
options: {
experimentalWatchApi: true,
transpileOnly: true
}
},
{ {
test: /\.(eot|otf|png|svg|jpg|ttf|woff|woff2)(\?v=[0-9.]+)?$/, test: /\.(eot|otf|png|svg|jpg|ttf|woff|woff2)(\?v=[0-9.]+)?$/,
loader: fileLoaderPath, loader: fileLoaderPath,