Merge pull request #662 from TerriaJS/r18-tm-p1

Use new React jsx transform and remove jsx-control-statements

Author: tephenavies

buildprocess/webpack.config.js

@@ -59,11 +59,10 @@ module.exports = function (devMode, hot) {
                       useBuiltIns: "usage"
                     }
                   ],
-                  "@babel/preset-react",
+                  ["@babel/preset-react", { runtime: "automatic" }],
                   ["@babel/typescript", { allowNamespaces: true }]
                 ],
                 plugins: [
-                  "babel-plugin-jsx-control-statements",
                   "@babel/plugin-transform-modules-commonjs",
                   ["@babel/plugin-proposal-decorators", { legacy: true }],
                   "@babel/proposal-class-properties",

lib/Views/UserInterface.jsx

@@ -45,14 +45,14 @@ export default function UserInterface(props) {
         ) : null}
       </MenuLeft>
       <ExperimentalMenu>
-        {/* <If condition={isBrowserSupportedAV()}>
+        {/* {isBrowserSupportedAV() && (
           <SplitPoint
             loadComponent={loadAugmentedVirtuality}
             viewState={props.viewState}
             terria={props.viewState.terria}
             experimentalWarning={true}
           />
-        </If> */}
+        )} */}
       </ExperimentalMenu>
     </StandardUserInterface>
   );

package.json

@@ -48,7 +48,6 @@
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
     "babel-loader": "^8.2.3",
-    "babel-plugin-jsx-control-statements": "^4.0.0",
     "css-loader": "^2.1.0",
     "ejs": "^2.5.2",
     "eslint": "^7.20.0",

yarn.lock

@@ -35,7 +35,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.1.tgz#31c1f66435f2a9c329bb5716a6d6186c516c3742"
   integrity sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.2", "@babel/core@^7.23.5":
+"@babel/core@^7.0.0", "@babel/core@^7.23.5":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.3.tgz#568864247ea10fbd4eff04dda1e05f9e2ea985c3"
   integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==
@@ -2912,13 +2912,6 @@ babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
-babel-plugin-jsx-control-statements@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jsx-control-statements/-/babel-plugin-jsx-control-statements-4.1.2.tgz#eb90494109cad3ed1b88dc75416e2c056fca1462"
-  integrity sha512-GUEnED4GLxJnFGKidbdI0GNN5Ekih4wbAr7+ENkpUKWYxeg7UPcgwmYd7qrpxT7UWto4OZtyUJg+sm+QN4ZjkQ==
-  dependencies:
-    "@babel/core" "^7.1.2"
-
 babel-plugin-lodash@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"