feat(build): add typescript support

marko-js · Oct 18, 2024 · d601b8b · d601b8b
1 parent e0f0f47
commit d601b8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "@babel/core": "^7.17.5",
     "@babel/preset-env": "^7.16.11",
+    "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.17.2",
     "@marko/babel-utils": "^5.19.1",
     "@marko/compiler": "^5.19.1",

diff --git a/packages/build/src/index.js b/packages/build/src/index.js
@@ -91,7 +91,13 @@ const configBuilder = (exports.configBuilder = ({
     compact: false,
     babelrc: false,
     configFile: false,
-    browserslistConfigFile: false
+    browserslistConfigFile: false,
+    overrides: [
+      {
+        test: /\.[cm]?ts$/,
+        presets: [require.resolve("@babel/preset-typescript")]
+      }
+    ]
   });
 
   const babelLoader = targets => ({
@@ -156,7 +162,7 @@ const configBuilder = (exports.configBuilder = ({
 
     return [
       {
-        test: /\.[cm]?js$/,
+        test: /\.[cm]?[jt]s$/,
         exclude: !production || isServer ? /node_modules/ : undefined,
         use: [babelLoader(targets)]
       },
@@ -212,7 +218,7 @@ const configBuilder = (exports.configBuilder = ({
       {
         test: file =>
           file &&
-          !/\.([cm]?js|json|css|less|s[ac]ss|styl|wasm|marko)$/.test(file),
+          !/\.([cm]?[jt]s|json|css|less|s[ac]ss|styl|wasm|marko)$/.test(file),
         use: [
           {
             loader: require.resolve("file-loader"),
@@ -256,7 +262,7 @@ const configBuilder = (exports.configBuilder = ({
     context: CONTEXT,
     resolve: {
       alias: sharedAliases(options),
-      extensions: [".wasm", ".mjs", ".js", ".json", ".marko"]
+      extensions: [".wasm", ".mjs", ".js", ".json", ".ts", ".mts", ".marko"]
     },
     cache: { type: "filesystem" },
     module: { rules: sharedRules(options) }
@@ -421,9 +427,9 @@ function loadBrowsersLists(entry, production) {
   const customBrowsersList = browserslist.findConfig(entry);
 
   if (customBrowsersList) {
-    const customBrowserEnvs = Object.entries(
-      customBrowsersList
-    ).map(([env, targets]) => ({ env, targets }));
+    const customBrowserEnvs = Object.entries(customBrowsersList).map(
+      ([env, targets]) => ({ env, targets })
+    );
     const activeBrowserEnvs = customBrowserEnvs.filter(
       ({ env, targets }) =>
         targets.length && (production ? env !== "dev" : env === "dev")