Support tsx

campsite · Jul 22, 2023 · 4387c45 · 4387c45
1 parent ed2d07e
commit 4387c45
Show file tree

Hide file tree

Showing 7 changed files with 2,224 additions and 5,794 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -111,7 +111,7 @@ module.exports = {
     'react/jsx-no-script-url': 2,
     'react/jsx-no-useless-fragment': 2,
     'react/jsx-pascal-case': 2,
-    'react/jsx-filename-extension': 2,
+    'react/jsx-filename-extension': [2, { extensions: ['.jsx', '.tsx'] }],
 
     'react-hooks/exhaustive-deps': 0,
   },

diff --git a/packages/normy-react-query/.babelrc b/packages/normy-react-query/.babelrc
@@ -1,7 +1,8 @@
 {
   "presets": [
     "@babel/preset-typescript",
-    ["@babel/preset-env", { "loose": true, "modules": false }]
+    ["@babel/preset-env", { "loose": true, "modules": false }],
+    "@babel/preset-react"
   ],
   "env": {
     "cjs": {

diff --git a/packages/normy-react-query/package.json b/packages/normy-react-query/package.json
@@ -23,9 +23,9 @@
     "lint": "eslint 'src/**'",
     "test": "jest src",
     "test:cover": "jest --coverage src",
-    "build-types": "tsc src/index.ts --strict --esModuleInterop --lib es2018,dom --declaration --emitDeclarationOnly --declarationDir types",
-    "build:commonjs": "cross-env BABEL_ENV=cjs babel src --extensions '.ts' --out-dir lib --ignore 'src/**/*.spec.js'",
-    "build:es": "babel src --extensions '.ts' --out-dir es --ignore 'src/**/*.spec.js'",
+    "build-types": "tsc src/index.ts --strict --esModuleInterop --lib es2018,dom --jsx react --declaration --emitDeclarationOnly --declarationDir types",
+    "build:commonjs": "cross-env BABEL_ENV=cjs babel src --extensions '.ts,.tsx' --out-dir lib --ignore 'src/**/*.spec.js'",
+    "build:es": "babel src --extensions '.ts,.tsx' --out-dir es --ignore 'src/**/*.spec.js'",
     "build:umd": "webpack --mode development -o dist --output-filename normy-react-query.js",
     "build:umd:min": "webpack --mode production -o dist --output-filename normy-react-query.min.js",
     "build": "npm-run-all clean build-types -p build:commonjs build:es build:umd build:umd:min",
@@ -42,6 +42,7 @@
     "@babel/cli": "7.20.7",
     "@babel/core": "7.20.12",
     "@babel/preset-env": "7.20.2",
+    "@babel/preset-react": "7.22.5",
     "@babel/preset-typescript": "7.18.6",
     "@babel/types": "^7.20.0",
     "@tanstack/react-query": "4.22.0",

diff --git a/packages/normy-react-query/webpack.config.js b/packages/normy-react-query/webpack.config.js
@@ -4,18 +4,24 @@ module.exports = {
     libraryTarget: 'umd',
   },
   resolve: {
-    extensions: ['.ts'],
+    extensions: ['.ts', '.tsx'],
   },
   module: {
     rules: [
       {
-        test: /\.ts$/,
+        test: /\.tsx?$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
       },
     ],
   },
   externals: {
+    react: {
+      commonjs: 'react',
+      commonjs2: 'react',
+      amd: 'react',
+      root: 'React',
+    },
     '@normy/core': {
       commonjs: '@normy/core',
       commonjs2: '@normy/core',