@wavemaker-ai/react-runtime 1.0.0-rc.309 → 1.0.0-rc.647469

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "@wavemaker-ai/react-runtime",
-  "version": "1.0.0-rc.309",
+  "version": "1.0.0-rc.647469",
   "description": "React runtime package for Wavemaker",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/wavemaker/react-runtime.git"
   },
-  "engines": {
-    "node": "22.18.0"
-  },
   "keywords": [
     "react",
     "runtime",
@@ -29,10 +26,7 @@
     "test": "vitest",
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "typecheck": "tsc --noEmit",
-    "build:preview": "node scripts/build-preview.js",
-    "build:preview-rollup": "npx rollup -c config/rollup.preview.config.mjs",
-    "build:preview-esbuild": "node config/esbuild.preview.config.mjs"
+    "typecheck": "tsc --noEmit"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,json,css,scss,md}": [
@@ -59,12 +53,10 @@
     "@mui/x-date-pickers": "8.5.3",
     "@reduxjs/toolkit": "2.9.1",
     "@tanstack/react-table": "8.21.3",
-    "@wavemaker-ai/react-codegen": "1.0.0-rc.309",
     "@wavemaker/nvd3": "1.8.16",
     "axios": "1.15.1",
     "d3": "7.8.5",
     "dompurify": "3.2.3",
-    "events": "3.3.0",
     "execa": "9.6.0",
     "husky": "9.1.7",
     "jodit-react": "5.2.19",
@@ -78,9 +70,7 @@
     "react-color": "2.19.3",
     "react-dom": "19.2.3",
     "react-hook-form": "7.73.1",
-    "react-redux": "9.2.0",
-    "react-router-dom": "7.5.0",
-    "sucrase": "3.35.1"
+    "react-redux": "9.2.0"
   },
   "devDependencies": {
     "@babel/cli": "7.26.4",
@@ -89,13 +79,6 @@
     "@babel/preset-react": "7.26.3",
     "@babel/preset-typescript": "7.26.0",
     "@eslint/eslintrc": "3",
-    "@rollup/plugin-babel": "7.0.0",
-    "@rollup/plugin-commonjs": "28.0.3",
-    "@rollup/plugin-json": "6.1.0",
-    "@rollup/plugin-node-resolve": "16.0.1",
-    "@rollup/plugin-replace": "6.0.2",
-    "@rollup/plugin-terser": "0.4.4",
-    "@rollup/plugin-typescript": "12.1.2",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.2",
@@ -110,10 +93,9 @@
     "@types/react-dom": "19.2.3",
     "@vitejs/plugin-react": "5.1.4",
     "@vitest/coverage-v8": "3.2.4",
-    "@wavemaker-ai/variables": "1.0.0-rc.309",
+    "@wavemaker-ai/variables": "1.0.0-rc.647469",
     "axe-core": "4.11.1",
     "babel-plugin-module-resolver": "5.0.2",
-    "esbuild": "0.27.5",
     "eslint": "9",
     "eslint-config-next": "15.1.4",
     "eslint-plugin-testing-library": "7.16.0",
@@ -122,7 +104,6 @@
     "jsdom": "28.1.0",
     "msw": "2.12.10",
     "prettier": "3.4.2",
-    "rollup": "4.40.0",
     "typescript": "5",
     "vitest": "3.2.4",
     "yargs": "18.0.0"

package/store/middleware/navigationMiddleware.js

@@ -27,7 +27,7 @@ var navigationMiddleware = exports.navigationMiddleware = function navigationMid
                 loginPage = ((_state$auth$securityC = state.auth.securityConfig) === null || _state$auth$securityC === void 0 || (_state$auth$securityC = _state$auth$securityC.loginConfig) === null || _state$auth$securityC === void 0 ? void 0 : _state$auth$securityC.pageName) || "Login";
                 if (router) {
                   store.dispatch((0, _authSlice.setPageLoading)(false));
-                  router.push("/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(loginPage));
+                  router.push("/".concat(_constants.ROUTING_BASEPATH, "/").concat(loginPage));
                 }
               }
               return _context.abrupt("return", result);

package/store/slices/appConfigSlice.js

@@ -49,19 +49,17 @@ var getServiceDefinitions = exports.getServiceDefinitions = (0, _toolkit.createA
 }());
 var getPrefabDefinitions = exports.getPrefabDefinitions = (0, _toolkit.createAsyncThunk)("appConfig/getPrefabDefinitions", /*#__PURE__*/function () {
   var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref3, _ref4) {
-    var prefabName, baseUrl, pages, dispatch, rejectWithValue, _response$data, useRootServicedefs, url, response, data;
+    var prefabName, baseUrl, pages, dispatch, rejectWithValue, _response$data, url, response, data;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           prefabName = _ref3.prefabName, baseUrl = _ref3.baseUrl, pages = _ref3.pages;
           dispatch = _ref4.dispatch, rejectWithValue = _ref4.rejectWithValue;
           _context2.prev = 2;
-          // `""` and `__self__`: studio prefab preview — root `servicedefs` (metadata uses CONTEXT_APP).
-          useRootServicedefs = !prefabName || prefabName === "__self__";
-          url = useRootServicedefs ? "".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/servicedefs").concat(baseUrl ? "" : ".json") : "".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/prefabs/").concat(prefabName, "/servicedefs").concat(baseUrl ? "" : ".json");
-          _context2.next = 7;
+          url = "".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/prefabs/").concat(prefabName, "/servicedefs").concat(baseUrl ? "" : ".json");
+          _context2.next = 6;
           return _axios["default"].get(url);
-        case 7:
+        case 6:
           response = _context2.sent;
           data = {
             serviceDefs: (response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.serviceDefs) || {},
@@ -73,15 +71,15 @@ var getPrefabDefinitions = exports.getPrefabDefinitions = (0, _toolkit.createAsy
             data: data
           }));
           return _context2.abrupt("return", data);
-        case 13:
-          _context2.prev = 13;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](2);
           return _context2.abrupt("return", rejectWithValue("Failed to fetch prefab definitions"));
-        case 16:
+        case 15:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[2, 13]]);
+    }, _callee2, null, [[2, 12]]);
   }));
   return function (_x3, _x4) {
     return _ref5.apply(this, arguments);

package/store/slices/authSlice.js

@@ -103,21 +103,16 @@ var loadSecurityInfo = exports.loadSecurityInfo = (0, _toolkit.createAsyncThunk)
           return dispatch((0, _appConfigSlice.getServiceDefinitions)(baseURL)).unwrap();
         case 18:
           dispatch(setIsLoggedIn(true));
+          dispatch(setLandingPage(details.userInfo.landingPage));
 
           // Clear access cache when user logs in (permissions might have changed)
           (0, _useAccess.clearAccessCache)();
           landingPage = details.userInfo.landingPage;
-          loginPage = (_secConfig$loginConfi = secConfig.loginConfig) === null || _secConfig$loginConfi === void 0 ? void 0 : _secConfig$loginConfi.pageName; // Store the landing page as a full routable path so navigateToLandingPage
-          // can use it directly without accidentally producing a relative URL.
-          if (landingPage) {
-            dispatch(setLandingPage("/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(landingPage)));
-          }
-
-          // Extract the last segment of the pathname (the page name)
+          loginPage = (_secConfig$loginConfi = secConfig.loginConfig) === null || _secConfig$loginConfi === void 0 ? void 0 : _secConfig$loginConfi.pageName; // Extract the last segment of the pathname (the page name)
           currentPageName = pathname.split("/").filter(Boolean).pop();
           isOnLoginPage = currentPageName === loginPage;
           if (router && landingPage && isOnLoginPage) {
-            router.push("/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(landingPage));
+            router.push("/".concat(_constants.ROUTING_BASEPATH, "/").concat(landingPage));
           }
           _context.next = 30;
           break;
@@ -140,26 +135,31 @@ var loadSecurityInfo = exports.loadSecurityInfo = (0, _toolkit.createAsyncThunk)
           }
           return _context.abrupt("return", Promise.resolve({}));
         case 40:
+          _context.next = 42;
+          return dispatch(redirectToLogin({
+            securityConfig: secConfig
+          })).unwrap();
+        case 42:
           return _context.abrupt("return", Promise.resolve({}));
-        case 41:
-          _context.next = 48;
-          break;
         case 43:
-          _context.prev = 43;
+          _context.next = 50;
+          break;
+        case 45:
+          _context.prev = 45;
           _context.t0 = _context["catch"](4);
-          _context.next = 47;
+          _context.next = 49;
           return dispatch(redirectToLogin({})).unwrap();
-        case 47:
+        case 49:
           throw _context.t0;
-        case 48:
-          _context.prev = 48;
+        case 50:
+          _context.prev = 50;
           dispatch(setPageLoading(false));
-          return _context.finish(48);
-        case 51:
+          return _context.finish(50);
+        case 53:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 43, 48, 51]]);
+    }, _callee, null, [[4, 45, 50, 53]]);
   }));
   return function (_x, _x2) {
     return _ref2.apply(this, arguments);
@@ -182,8 +182,7 @@ var login = exports.login = (0, _toolkit.createAsyncThunk)("auth/login", /*#__PU
           return _axios["default"].post("".concat(options.baseURL, "/j_spring_security_check"), payload, {
             withCredentials: true,
             headers: {
-              "Content-Type": "application/x-www-form-urlencoded",
-              "X-Requested-With": "XMLHttpRequest"
+              "Content-Type": "application/x-www-form-urlencoded"
             }
           });
         case 7:
@@ -224,11 +223,11 @@ var login = exports.login = (0, _toolkit.createAsyncThunk)("auth/login", /*#__PU
 }());
 var logout = exports.logout = (0, _toolkit.createAsyncThunk)("auth/logout", /*#__PURE__*/function () {
   var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(options, _ref5) {
-    var dispatch, getState, responseData, response, redirectURI, router, isPreview, _state$auth, state, loginPage;
+    var dispatch, responseData, response, redirectURI;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          dispatch = _ref5.dispatch, getState = _ref5.getState;
+          dispatch = _ref5.dispatch;
           responseData = null;
           _context3.prev = 2;
           _context3.next = 5;
@@ -262,25 +261,14 @@ var logout = exports.logout = (0, _toolkit.createAsyncThunk)("auth/logout", /*#_
 
           // Clear access cache when user logs out
           (0, _useAccess.clearAccessCache)();
-
-          // In preview mode the router is registered; navigate to the login page so
-          // the SPA reflects the logged-out state. In production the server-side
-          // redirect (window.location.href above) or Next.js routing handles this.
-          router = (0, _navigationMiddleware.getRouterInstance)();
-          isPreview = (0, _constants.getActiveRoutingBasePath)() === _constants.PREVIEW_ROUTING_BASEPATH;
-          if (router && isPreview) {
-            state = getState();
-            loginPage = ((_state$auth = state.auth) === null || _state$auth === void 0 || (_state$auth = _state$auth.securityConfig) === null || _state$auth === void 0 || (_state$auth = _state$auth.loginConfig) === null || _state$auth === void 0 ? void 0 : _state$auth.pageName) || "Login";
-            router.replace("/".concat(_constants.PREVIEW_ROUTING_BASEPATH, "/").concat(loginPage));
-          }
           return _context3.finish(15);
-        case 25:
+        case 22:
           return _context3.abrupt("return", Promise.resolve(responseData));
-        case 26:
+        case 23:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[2, 12, 15, 25]]);
+    }, _callee3, null, [[2, 12, 15, 22]]);
   }));
   return function (_x5, _x6) {
     return _ref6.apply(this, arguments);
@@ -403,27 +391,25 @@ var checkAccess = exports.checkAccess = (0, _toolkit.createAsyncThunk)("auth/che
 }());
 var navigateToLandingPage = exports.navigateToLandingPage = (0, _toolkit.createAsyncThunk)("auth/navigate/landingpage", /*#__PURE__*/function () {
   var _ref13 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(_ref11, _ref12) {
-    var baseUrl, pageName, getState, dispatch, state, _state$auth2, auth, redirectTo, landingPageToNavigate, _state$info, _auth$loggedInUser, homePage, userLandingPage, router;
+    var baseUrl, pageName, getState, dispatch, state, _state$auth, auth, redirectTo, landingPageToNavigate, _state$info, _auth$loggedInUser, homePage, router;
     return _regenerator["default"].wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           baseUrl = _ref11.baseUrl, pageName = _ref11.pageName;
           getState = _ref12.getState, dispatch = _ref12.dispatch;
           state = getState();
-          _state$auth2 = state.auth, auth = _state$auth2 === void 0 ? {} : _state$auth2;
+          _state$auth = state.auth, auth = _state$auth === void 0 ? {} : _state$auth;
           redirectTo = (0, _app.getCurrentRouteQueryParam)("redirectTo"); // Priority: redirectTo param > stored landingPage > user's default landingPage > Main
           if (redirectTo) {
             // Use the redirectTo parameter from URL
-            landingPageToNavigate = "/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(redirectTo);
+            landingPageToNavigate = "/".concat(_constants.ROUTING_BASEPATH, "/").concat(redirectTo);
           } else if (auth.landingPage) {
             // Use stored landing page
             landingPageToNavigate = auth.landingPage;
           } else {
-            // Use user's default landing page or Main. The landingPage from the server
-            // is a plain page name (e.g. "Main"), so always build the full routable path.
+            // Use user's default landing page or Main
             homePage = ((_state$info = state.info) === null || _state$info === void 0 || (_state$info = _state$info.appConfig) === null || _state$info === void 0 || (_state$info = _state$info.appProperties) === null || _state$info === void 0 ? void 0 : _state$info.homePage) || "Main";
-            userLandingPage = (_auth$loggedInUser = auth.loggedInUser) === null || _auth$loggedInUser === void 0 ? void 0 : _auth$loggedInUser.landingPage;
-            landingPageToNavigate = userLandingPage ? "/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(userLandingPage) : "/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(homePage);
+            landingPageToNavigate = ((_auth$loggedInUser = auth.loggedInUser) === null || _auth$loggedInUser === void 0 ? void 0 : _auth$loggedInUser.landingPage) || "/".concat(_constants.ROUTING_BASEPATH, "/").concat(homePage);
           }
           router = (0, _navigationMiddleware.getRouterInstance)();
           if (router) {
@@ -463,12 +449,12 @@ var redirectToLogin = exports.redirectToLogin = (0, _toolkit.createAsyncThunk)("
           } else {
             loginPage = (securityConfig === null || securityConfig === void 0 || (_securityConfig$login2 = securityConfig.loginConfig) === null || _securityConfig$login2 === void 0 ? void 0 : _securityConfig$login2.pageName) || "Login"; // Store landing page for post-login redirect
             if (redirectTo && !redirectTo.startsWith("/" + loginPage)) {
-              setLandingPage("/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(redirectTo));
+              setLandingPage("/".concat(_constants.ROUTING_BASEPATH, "/").concat(redirectTo));
             }
             router = (0, _navigationMiddleware.getRouterInstance)();
             if (router && !isPublicPage) {
               // Build login URL with redirectTo query parameter
-              loginPath = "/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(loginPage);
+              loginPath = "/".concat(_constants.ROUTING_BASEPATH, "/").concat(loginPage);
               loginUrl = redirectTo && redirectTo.toLowerCase() !== homePage.toLowerCase() ? "".concat(loginPath, "?redirectTo=").concat(redirectTo) : loginPath;
               router.push(loginUrl);
             }