Skip to content

Commit 964c011

Browse files
authored
Chore: Replace ts-loader in e2e and input-datasource (grafana#76872)
* build(npm): remove ts-loader from core and input-datasource * build(input-datasource): update webpack config to use swc-loader * chore(e2e): replace ts-loader with esbuild-loader
1 parent 580a4ca commit 964c011

File tree

5 files changed

+24
-42
lines changed

5 files changed

+24
-42
lines changed

e2e/cypress/plugins/typescriptPreprocessor.js

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
11
const wp = require('@cypress/webpack-preprocessor');
2-
const { resolve } = require('path');
3-
4-
const anyNodeModules = /node_modules/;
5-
const packageRoot = resolve(`${__dirname}/../../`);
6-
const packageModules = `${packageRoot}/node_modules`;
72

83
const webpackOptions = {
94
module: {
105
rules: [
116
{
12-
include: (modulePath) => {
13-
if (!anyNodeModules.test(modulePath)) {
14-
// Is a file within the project
15-
return true;
16-
} else {
17-
// Is a file within this package
18-
return modulePath.startsWith(packageRoot) && !modulePath.startsWith(packageModules);
19-
}
20-
},
217
test: /\.ts$/,
22-
use: [
23-
{
24-
loader: 'ts-loader',
25-
options: {
26-
transpileOnly: true,
27-
},
8+
exclude: /node_modules/,
9+
use: {
10+
loader: 'esbuild-loader',
11+
options: {
12+
target: 'es2020',
13+
format: undefined,
2814
},
29-
],
15+
},
3016
},
3117
],
3218
},

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
"testing-library-selector": "0.3.1",
227227
"tracelib": "1.0.1",
228228
"ts-jest": "29.1.1",
229-
"ts-loader": "9.3.1",
230229
"ts-node": "10.9.1",
231230
"typescript": "4.8.4",
232231
"wait-on": "7.0.1",

plugins-bundled/internal/input-datasource/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"fork-ts-checker-webpack-plugin": "8.0.0",
2323
"jest": "29.3.1",
2424
"jest-environment-jsdom": "29.3.1",
25+
"swc-loader": "0.2.3",
2526
"ts-jest": "29.0.5",
26-
"ts-loader": "9.3.1",
2727
"ts-node": "10.9.1",
2828
"webpack": "5.76.0"
2929
},

plugins-bundled/internal/input-datasource/webpack.config.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,20 @@ const config = async (env: Record<string, string>): Promise<Configuration> => ({
7070
exclude: /(node_modules)/,
7171
test: /\.[tj]sx?$/,
7272
use: {
73-
loader: 'ts-loader',
73+
loader: 'swc-loader',
74+
options: {
75+
jsc: {
76+
baseUrl: '.',
77+
target: 'es2015',
78+
loose: false,
79+
parser: {
80+
syntax: 'typescript',
81+
tsx: true,
82+
decorators: false,
83+
dynamicImport: true,
84+
},
85+
},
86+
},
7487
},
7588
},
7689
{

yarn.lock

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,8 +2881,8 @@ __metadata:
28812881
jest: 29.3.1
28822882
jest-environment-jsdom: 29.3.1
28832883
react: 18.2.0
2884+
swc-loader: 0.2.3
28842885
ts-jest: 29.0.5
2885-
ts-loader: 9.3.1
28862886
ts-node: 10.9.1
28872887
tslib: 2.5.0
28882888
webpack: 5.76.0
@@ -15240,7 +15240,7 @@ __metadata:
1524015240
languageName: node
1524115241
linkType: hard
1524215242

15243-
"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.15.0":
15243+
"enhanced-resolve@npm:^5.10.0, enhanced-resolve@npm:^5.15.0":
1524415244
version: 5.15.0
1524515245
resolution: "enhanced-resolve@npm:5.15.0"
1524615246
dependencies:
@@ -18084,7 +18084,6 @@ __metadata:
1808418084
tinycolor2: 1.6.0
1808518085
tracelib: 1.0.1
1808618086
ts-jest: 29.1.1
18087-
ts-loader: 9.3.1
1808818087
ts-node: 10.9.1
1808918088
tslib: 2.6.0
1809018089
tween-functions: ^1.2.0
@@ -29048,21 +29047,6 @@ __metadata:
2904829047
languageName: node
2904929048
linkType: hard
2905029049

29051-
"ts-loader@npm:9.3.1":
29052-
version: 9.3.1
29053-
resolution: "ts-loader@npm:9.3.1"
29054-
dependencies:
29055-
chalk: ^4.1.0
29056-
enhanced-resolve: ^5.0.0
29057-
micromatch: ^4.0.0
29058-
semver: ^7.3.4
29059-
peerDependencies:
29060-
typescript: "*"
29061-
webpack: ^5.0.0
29062-
checksum: 462a8ac315017cf4961dafd2be29d5abe7c3af63c4515e325269f79b9d0212b35c59184d7fd01fc378749c88454752e1599301d2190eb6844ea5fe332de5f695
29063-
languageName: node
29064-
linkType: hard
29065-
2906629050
"ts-node@npm:10.9.1, ts-node@npm:^10.2.1":
2906729051
version: 10.9.1
2906829052
resolution: "ts-node@npm:10.9.1"

0 commit comments

Comments
 (0)