diff --git a/modules/apps/adaptive-media/adaptive-media-web/package.json b/modules/apps/adaptive-media/adaptive-media-web/package.json index 435ecfbf50aaa0..3d659f342617c1 100644 --- a/modules/apps/adaptive-media/adaptive-media-web/package.json +++ b/modules/apps/adaptive-media/adaptive-media-web/package.json @@ -5,8 +5,8 @@ "@clayui/form": "3.14.4", "@clayui/icon": "3.1.0", "@clayui/progress-bar": "3.2.0", + "@liferay/frontend-js-react-web": "*", "formik": "2.1.4", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/adaptive_media/js/AdaptiveMediaProgress.js b/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/adaptive_media/js/AdaptiveMediaProgress.js index 5c295f5a1a1ecc..edb0a7467d9671 100644 --- a/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/adaptive_media/js/AdaptiveMediaProgress.js +++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/adaptive_media/js/AdaptiveMediaProgress.js @@ -15,7 +15,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayProgressBar from '@clayui/progress-bar'; -import {useIsMounted, useTimeout} from 'frontend-js-react-web'; +import {useIsMounted, useTimeout} from '@liferay/frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useState} from 'react'; diff --git a/modules/apps/app-builder/app-builder-web/package.json b/modules/apps/app-builder/app-builder-web/package.json index b216adb2bb3561..778b5dec954590 100644 --- a/modules/apps/app-builder/app-builder-web/package.json +++ b/modules/apps/app-builder/app-builder-web/package.json @@ -16,9 +16,9 @@ "@clayui/pagination-bar": "3.25.0", "@clayui/sticker": "3.3.0", "@clayui/table": "3.1.0", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", "dynamic-data-mapping-form-renderer": "*", - "frontend-js-react-web": "*", "frontend-js-web": "*", "moment": "^2.24.0", "path-to-regexp": "3.0.0", diff --git a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/hooks/useLoader.es.js b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/hooks/useLoader.es.js index 208d3de7f6b546..652687c60651fa 100644 --- a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/hooks/useLoader.es.js +++ b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/hooks/useLoader.es.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {useCallback, useRef} from 'react'; const EmptyModule = {default: () => null}; diff --git a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js index c41084b6e0cb07..39186617c92f26 100644 --- a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js +++ b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js @@ -12,12 +12,12 @@ * details. */ +import {usePrevious} from '@liferay/frontend-js-react-web'; import Loading from 'data-engine-js-components-web/js/components/loading/Loading.es'; import useQuery from 'data-engine-js-components-web/js/hooks/useQuery.es'; import {getItem} from 'data-engine-js-components-web/js/utils/client.es'; import {errorToast} from 'data-engine-js-components-web/js/utils/toast.es'; import {isEqualObjects} from 'data-engine-js-components-web/js/utils/utils.es'; -import {usePrevious} from 'frontend-js-react-web'; import React, {useContext, useEffect, useState} from 'react'; import {AppContext} from '../../AppContext.es'; diff --git a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/table-view/ColumnOverlay.es.js b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/table-view/ColumnOverlay.es.js index ae50b978721fb1..7e2115404a5803 100644 --- a/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/table-view/ColumnOverlay.es.js +++ b/modules/apps/app-builder/app-builder-web/src/main/resources/META-INF/resources/js/pages/table-view/ColumnOverlay.es.js @@ -13,8 +13,8 @@ */ import {ClayButtonWithIcon} from '@clayui/button'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useEventListener} from 'frontend-js-react-web'; import React, {useContext, useLayoutEffect, useState} from 'react'; import {useKeyDown} from '../../hooks/index.es'; diff --git a/modules/apps/asset/asset-taglib/package.json b/modules/apps/asset/asset-taglib/package.json index 120485ffe9895f..e4879a3dab6b3a 100644 --- a/modules/apps/asset/asset-taglib/package.json +++ b/modules/apps/asset/asset-taglib/package.json @@ -5,8 +5,8 @@ "@clayui/form": "3.14.4", "@clayui/icon": "3.1.0", "@clayui/multi-select": "3.25.0", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "prop-types": "15.7.2", "react": "16.12.0" }, diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/AssetVocabularyCategoriesSelector.es.js b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/AssetVocabularyCategoriesSelector.es.js index c4a6c41d5b82a3..56e712b4599546 100644 --- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/AssetVocabularyCategoriesSelector.es.js +++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/AssetVocabularyCategoriesSelector.es.js @@ -17,8 +17,8 @@ import {useResource} from '@clayui/data-provider'; import ClayForm, {ClayInput} from '@clayui/form'; import ClayIcon from '@clayui/icon'; import ClayMultiSelect from '@clayui/multi-select'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {usePrevious} from 'frontend-js-react-web'; import {ItemSelectorDialog} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_selector/AssetTagsSelector.es.js b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_selector/AssetTagsSelector.es.js index bccd9e6a56a161..142a6afba87ee4 100644 --- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_selector/AssetTagsSelector.es.js +++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_selector/AssetTagsSelector.es.js @@ -16,7 +16,7 @@ import ClayButton from '@clayui/button'; import {useResource} from '@clayui/data-provider'; import ClayForm, {ClayInput} from '@clayui/form'; import ClayMultiSelect from '@clayui/multi-select'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import {openSelectionModal} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useEffect} from 'react'; diff --git a/modules/apps/commerce/commerce-frontend-js/package.json b/modules/apps/commerce/commerce-frontend-js/package.json index 93941a13a63c06..e00a35d9a9d0c5 100644 --- a/modules/apps/commerce/commerce-frontend-js/package.json +++ b/modules/apps/commerce/commerce-frontend-js/package.json @@ -21,8 +21,8 @@ "@clayui/sticker": "3.3.0", "@clayui/table": "3.1.0", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2" }, diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/autocomplete/Autocomplete.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/autocomplete/Autocomplete.js index dda5f5475d9e4b..fd0de5cdaf0f6e 100644 --- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/autocomplete/Autocomplete.js +++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/autocomplete/Autocomplete.js @@ -15,7 +15,7 @@ import ClayAutocomplete from '@clayui/autocomplete'; import ClayDropDown from '@clayui/drop-down'; import {FocusScope} from '@clayui/shared'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useRef, useState} from 'react'; import {createPortal} from 'react-dom'; diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/global_search/GlobalSearch.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/global_search/GlobalSearch.js index 8ec34df5de7bdb..4a1a9c5c7768fc 100644 --- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/global_search/GlobalSearch.js +++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/global_search/GlobalSearch.js @@ -17,7 +17,7 @@ import {ClayInput} from '@clayui/form'; import {ClayIconSpriteContext} from '@clayui/icon'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClaySticker from '@clayui/sticker'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/utilities/launcher.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/utilities/launcher.js index 55064914b74534..e4182261690cd3 100644 --- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/utilities/launcher.js +++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/utilities/launcher.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; export default function launcher( Component, diff --git a/modules/apps/commerce/commerce-frontend-js/webpack.config.dev.js b/modules/apps/commerce/commerce-frontend-js/webpack.config.dev.js index 1d436e2490ea47..a0cf2dd4ff80fe 100644 --- a/modules/apps/commerce/commerce-frontend-js/webpack.config.dev.js +++ b/modules/apps/commerce/commerce-frontend-js/webpack.config.dev.js @@ -92,7 +92,7 @@ module.exports = { ], resolve: { alias: { - 'frontend-js-react-web': path.resolve( + '@liferay/frontend-js-react-web': path.resolve( __dirname, '../../../node_modules/frontend-js-react-web/src/main/resources/META-INF/resources/js/index.es.js' ), diff --git a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/SidebarPanel.js b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/SidebarPanel.js index 52e64c2b4f33ad..7c66525654a11e 100644 --- a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/SidebarPanel.js +++ b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/SidebarPanel.js @@ -14,7 +14,7 @@ import ClayAlert from '@clayui/alert'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import React, {useEffect, useImperativeHandle, useReducer, useRef} from 'react'; diff --git a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/AuditBarChart.js b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/AuditBarChart.js index 60ce669fcf395c..f47b491f4be195 100644 --- a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/AuditBarChart.js +++ b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/AuditBarChart.js @@ -15,7 +15,7 @@ import ClayEmptyState from '@clayui/empty-state'; import {ClayCheckbox} from '@clayui/form'; import ClayLayout from '@clayui/layout'; -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useMemo, useState} from 'react'; import { diff --git a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/Sidebar.js b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/Sidebar.js index f6cce153313500..22be87ef064dad 100644 --- a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/Sidebar.js +++ b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/components/Sidebar.js @@ -14,8 +14,8 @@ import {ClayButtonWithIcon} from '@clayui/button'; import ClayLayout from '@clayui/layout'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useTimeout} from 'frontend-js-react-web'; import React, {useContext, useEffect, useState} from 'react'; const SidebarContext = React.createContext(); diff --git a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/transformers/ActionsComponentPropsTransformer.js b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/transformers/ActionsComponentPropsTransformer.js index 87c6ce6149a8b3..5a536015ad2a15 100644 --- a/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/transformers/ActionsComponentPropsTransformer.js +++ b/modules/apps/content-dashboard/content-dashboard-web/src/main/resources/META-INF/resources/js/transformers/ActionsComponentPropsTransformer.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import SidebarPanel from '../SidebarPanel'; import SidebarPanelInfoView from '../components/SidebarPanelInfoView'; diff --git a/modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/hooks/useResource.es.js b/modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/hooks/useResource.es.js index 591e6b3a978481..3dea72aba8398c 100644 --- a/modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/hooks/useResource.es.js +++ b/modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/hooks/useResource.es.js @@ -12,7 +12,7 @@ * details. */ -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import {useEffect, useState} from 'react'; import {request} from '../utils/client.es'; diff --git a/modules/apps/data-engine/data-engine-taglib/package.json b/modules/apps/data-engine/data-engine-taglib/package.json index 1a1d1c632d7a4f..23676525b645f6 100644 --- a/modules/apps/data-engine/data-engine-taglib/package.json +++ b/modules/apps/data-engine/data-engine-taglib/package.json @@ -16,9 +16,9 @@ "@clayui/pagination-bar": "3.25.0", "@clayui/sticker": "3.3.0", "@clayui/table": "3.1.0", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", "dynamic-data-mapping-form-renderer": "*", - "frontend-js-react-web": "*", "frontend-js-web": "*", "lodash.omit": "^4.5.0", "metal-jsx": "2.16.8", diff --git a/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/components/sidebar/MultiPanelSidebar.es.js b/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/components/sidebar/MultiPanelSidebar.es.js index 76283384c69653..6d904d83ff251b 100644 --- a/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/components/sidebar/MultiPanelSidebar.es.js +++ b/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/components/sidebar/MultiPanelSidebar.es.js @@ -18,8 +18,8 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useIsMounted, useStateSafe} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted, useStateSafe} from 'frontend-js-react-web'; import React, {useRef, useState} from 'react'; import useLoad from '../../hooks/useLoad.es'; diff --git a/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/hooks/useLoad.es.js b/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/hooks/useLoad.es.js index b3a510b224dfe3..a2e6b8dcc01747 100644 --- a/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/hooks/useLoad.es.js +++ b/modules/apps/data-engine/data-engine-taglib/src/main/resources/META-INF/resources/data_layout_builder/js/hooks/useLoad.es.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import React from 'react'; const {useCallback, useRef} = React; diff --git a/modules/apps/document-library/document-library-preview-document/src/main/resources/META-INF/resources/preview/js/DocumentPreviewer.es.js b/modules/apps/document-library/document-library-preview-document/src/main/resources/META-INF/resources/preview/js/DocumentPreviewer.es.js index 1a2f4cce489cf3..45d4dd438776e5 100644 --- a/modules/apps/document-library/document-library-preview-document/src/main/resources/META-INF/resources/preview/js/DocumentPreviewer.es.js +++ b/modules/apps/document-library/document-library-preview-document/src/main/resources/META-INF/resources/preview/js/DocumentPreviewer.es.js @@ -15,7 +15,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {debounce} from 'frontend-js-web'; import imagePromise from 'image-promise'; import PropTypes from 'prop-types'; diff --git a/modules/apps/document-library/document-library-preview-image/package.json b/modules/apps/document-library/document-library-preview-image/package.json index 58471e16241d2a..258e2de84b7b5f 100644 --- a/modules/apps/document-library/document-library-preview-image/package.json +++ b/modules/apps/document-library/document-library-preview-image/package.json @@ -2,7 +2,7 @@ "dependencies": { "@clayui/button": "3.6.0", "@clayui/icon": "3.1.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/document-library/document-library-preview-image/src/main/resources/META-INF/resources/preview/js/ImagePreviewer.es.js b/modules/apps/document-library/document-library-preview-image/src/main/resources/META-INF/resources/preview/js/ImagePreviewer.es.js index 99e4e8325a9c00..11e758a6973e16 100644 --- a/modules/apps/document-library/document-library-preview-image/src/main/resources/META-INF/resources/preview/js/ImagePreviewer.es.js +++ b/modules/apps/document-library/document-library-preview-image/src/main/resources/META-INF/resources/preview/js/ImagePreviewer.es.js @@ -14,7 +14,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; -import {useEventListener, useIsMounted} from 'frontend-js-react-web'; +import {useEventListener, useIsMounted} from '@liferay/frontend-js-react-web'; import {debounce} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useLayoutEffect, useRef, useState} from 'react'; diff --git a/modules/apps/document-library/document-library-video/package.json b/modules/apps/document-library/document-library-video/package.json index d829d6b3b2bfc0..dbd5875e59f6b1 100644 --- a/modules/apps/document-library/document-library-video/package.json +++ b/modules/apps/document-library/document-library-video/package.json @@ -5,8 +5,8 @@ "@clayui/icon": "3.1.0", "@clayui/loading-indicator": "3.2.0", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/document-library/document-library-video/src/main/resources/META-INF/resources/js/utils/hooks.js b/modules/apps/document-library/document-library-video/src/main/resources/META-INF/resources/js/utils/hooks.js index e7c3fa6bfad89d..a8491e32eabe8d 100644 --- a/modules/apps/document-library/document-library-video/src/main/resources/META-INF/resources/js/utils/hooks.js +++ b/modules/apps/document-library/document-library-video/src/main/resources/META-INF/resources/js/utils/hooks.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {addParams, cancelDebounce, debounce, fetch} from 'frontend-js-web'; import {useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/document-library/document-library-web/package.json b/modules/apps/document-library/document-library-web/package.json index 0d6318eed2a962..569fabc7e9ac31 100644 --- a/modules/apps/document-library/document-library-web/package.json +++ b/modules/apps/document-library/document-library-web/package.json @@ -7,9 +7,9 @@ "@clayui/icon": "3.1.0", "@clayui/loading-indicator": "3.2.0", "@clayui/modal": "3.8.5", + "@liferay/frontend-js-react-web": "*", "asset-taglib": "*", "clipboard": "2.0.4", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0", diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/bulk/BulkStatus.es.js b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/bulk/BulkStatus.es.js index 17062db393f873..be744d25368e28 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/bulk/BulkStatus.es.js +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/bulk/BulkStatus.es.js @@ -13,7 +13,7 @@ */ import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useTimeout} from 'frontend-js-react-web'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import {fetch, openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useReducer} from 'react'; diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/categories/EditCategoriesModal.es.js b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/categories/EditCategoriesModal.es.js index 1cf5c36b7dae3b..da8b9e5b5147ba 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/categories/EditCategoriesModal.es.js +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/categories/EditCategoriesModal.es.js @@ -17,8 +17,8 @@ import ClayButton from '@clayui/button'; import {ClayRadio, ClayRadioGroup} from '@clayui/form'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayModal from '@clayui/modal'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {AssetCategoriesSelector} from 'asset-taglib'; -import {useIsMounted} from 'frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useContext, useEffect, useState} from 'react'; diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/tags/EditTagsModal.es.js b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/tags/EditTagsModal.es.js index be8fa65d3a0b18..676a795bfde165 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/tags/EditTagsModal.es.js +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/categorization/tags/EditTagsModal.es.js @@ -17,8 +17,8 @@ import ClayButton from '@clayui/button'; import {ClayRadio, ClayRadioGroup} from '@clayui/form'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayModal from '@clayui/modal'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {AssetTagsSelector} from 'asset-taglib'; -import {useIsMounted} from 'frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useContext, useEffect, useState} from 'react'; diff --git a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/data-engine/panels/InfoPanel.es.js b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/data-engine/panels/InfoPanel.es.js index 26ff7dd26df772..de92760a51c3c6 100644 --- a/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/data-engine/panels/InfoPanel.es.js +++ b/modules/apps/document-library/document-library-web/src/main/resources/META-INF/resources/document_library/js/data-engine/panels/InfoPanel.es.js @@ -13,7 +13,7 @@ */ import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, runScriptsInElement} from 'frontend-js-web'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Numeric/Numeric.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Numeric/Numeric.es.js index ffad540479f999..02ceadf4c14b6f 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Numeric/Numeric.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Numeric/Numeric.es.js @@ -13,7 +13,7 @@ */ import {ClayInput} from '@clayui/form'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useRef, useState} from 'react'; import createNumberMask from 'text-mask-addons/dist/createNumberMask'; import vanillaTextMask from 'vanilla-text-mask'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Options/Options.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Options/Options.es.js index 7cccf947c0ce10..ffa2bf1b0df7d6 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Options/Options.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Options/Options.es.js @@ -13,10 +13,10 @@ */ import ClayIcon from '@clayui/icon'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; import {RulesSupport} from 'dynamic-data-mapping-form-builder'; import {usePage} from 'dynamic-data-mapping-form-renderer'; -import {usePrevious} from 'frontend-js-react-web'; import {openModal} from 'frontend-js-web'; import React, {useEffect, useRef, useState} from 'react'; import {DndProvider} from 'react-dnd'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Text/Text.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Text/Text.es.js index a3b9b54d6ed3ed..bae760aaea3670 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Text/Text.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Text/Text.es.js @@ -15,8 +15,8 @@ import ClayAutocomplete from '@clayui/autocomplete'; import ClayDropDown from '@clayui/drop-down'; import {ClayInput} from '@clayui/form'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import {normalizeFieldName} from 'dynamic-data-mapping-form-renderer'; -import {usePrevious} from 'frontend-js-react-web'; import React, {useEffect, useMemo, useRef, useState} from 'react'; import {FieldBase} from '../FieldBase/ReactFieldBase.es'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Validation/Validation.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Validation/Validation.es.js index f85018d2b63cb8..a1095fd45839bb 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Validation/Validation.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Validation/Validation.es.js @@ -13,7 +13,7 @@ */ import ClayForm from '@clayui/form'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useState} from 'react'; import Checkbox from '../Checkbox/Checkbox.es'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/EditablePageHeader.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/EditablePageHeader.es.js index ad9b5d65b28685..cd57b2eaafba9a 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/EditablePageHeader.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/EditablePageHeader.es.js @@ -12,7 +12,7 @@ * details. */ -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useState} from 'react'; import {EVENT_TYPES} from '../../actions/eventTypes.es'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/SuccessVariant.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/SuccessVariant.es.js index 41e1f3eca5aad3..1ac90c3de0da3c 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/SuccessVariant.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/components/PageRenderer/SuccessVariant.es.js @@ -15,7 +15,7 @@ import {ClayButtonWithIcon} from '@clayui/button'; import {ClayDropDownWithItems} from '@clayui/drop-down'; import ClayLayout from '@clayui/layout'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useState} from 'react'; import {EVENT_TYPES} from '../../actions/eventTypes.es'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/hooks/useForm.es.js b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/hooks/useForm.es.js index a9bf00c8923280..b362116b01312f 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/hooks/useForm.es.js +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/hooks/useForm.es.js @@ -12,7 +12,7 @@ * details. */ -import {useThunk} from 'frontend-js-react-web'; +import {useThunk} from '@liferay/frontend-js-react-web'; import React, {useContext, useEffect, useReducer} from 'react'; import {EVENT_TYPES} from '../actions/eventTypes.es'; diff --git a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-report-web/package.json b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-report-web/package.json index 2102725bbe4bbd..0b3d7b8ac1d7d0 100644 --- a/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-report-web/package.json +++ b/modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-report-web/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@clayui/layout": "3.3.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "moment": "^2.22.2", "react": "16.12.0", diff --git a/modules/apps/flags/flags-taglib/src/main/resources/META-INF/resources/flags/js/components/Flags.es.js b/modules/apps/flags/flags-taglib/src/main/resources/META-INF/resources/flags/js/components/Flags.es.js index 482772e935001f..d728645f6e38e7 100644 --- a/modules/apps/flags/flags-taglib/src/main/resources/META-INF/resources/flags/js/components/Flags.es.js +++ b/modules/apps/flags/flags-taglib/src/main/resources/META-INF/resources/flags/js/components/Flags.es.js @@ -15,7 +15,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import {useModal} from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, objectToFormData} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useContext, useState} from 'react'; diff --git a/modules/apps/fragment/fragment-renderer-react-impl/src/main/java/com/liferay/fragment/renderer/react/internal/model/listener/FragmentEntryLinkModelListener.java b/modules/apps/fragment/fragment-renderer-react-impl/src/main/java/com/liferay/fragment/renderer/react/internal/model/listener/FragmentEntryLinkModelListener.java index c5c6380fbf5bf2..0bee870800c41b 100644 --- a/modules/apps/fragment/fragment-renderer-react-impl/src/main/java/com/liferay/fragment/renderer/react/internal/model/listener/FragmentEntryLinkModelListener.java +++ b/modules/apps/fragment/fragment-renderer-react-impl/src/main/java/com/liferay/fragment/renderer/react/internal/model/listener/FragmentEntryLinkModelListener.java @@ -161,7 +161,7 @@ private boolean _isReactFragmentEntry(long fragmentEntryId) { } private static final List _dependencies = Collections.singletonList( - "frontend-js-react-web$react"); + "@liferay!frontend-js-react-web$react"); @Reference private FragmentEntryLinkLocalService _fragmentEntryLinkLocalService; diff --git a/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentEditor.js b/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentEditor.js index eeded7d6eb401f..802ab36d2639a6 100644 --- a/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentEditor.js +++ b/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentEditor.js @@ -14,7 +14,7 @@ import ClayIcon from '@clayui/icon'; import ClayTabs from '@clayui/tabs'; -import {useIsMounted, usePrevious} from 'frontend-js-react-web'; +import {useIsMounted, usePrevious} from '@liferay/frontend-js-react-web'; import {cancelDebounce, debounce, fetch, openToast} from 'frontend-js-web'; import React, {useCallback, useEffect, useState} from 'react'; diff --git a/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentPreview.js b/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentPreview.js index d2239cf38533c3..a7bc68cc0a6411 100644 --- a/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentPreview.js +++ b/modules/apps/fragment/fragment-web/src/main/resources/META-INF/resources/js/fragment-editor/FragmentPreview.js @@ -13,12 +13,12 @@ */ import {ClayButtonWithIcon} from '@clayui/button'; -import classNames from 'classnames'; import { useEventListener, useIsMounted, usePrevious, -} from 'frontend-js-react-web'; +} from '@liferay/frontend-js-react-web'; +import classNames from 'classnames'; import {cancelDebounce, debounce, fetch} from 'frontend-js-web'; import React, {useCallback, useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/editor/ClassicEditor.js b/modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/editor/ClassicEditor.js index c32ce182a10960..cf0bd5ea4e5f10 100644 --- a/modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/editor/ClassicEditor.js +++ b/modules/apps/frontend-editor/frontend-editor-ckeditor-web/src/main/resources/META-INF/resources/editor/ClassicEditor.js @@ -12,7 +12,7 @@ * details. */ -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import {debounce} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/frontend-js/frontend-js-components-web/package.json b/modules/apps/frontend-js/frontend-js-components-web/package.json index c4737dd655896a..bfacb56e47de2a 100644 --- a/modules/apps/frontend-js/frontend-js-components-web/package.json +++ b/modules/apps/frontend-js/frontend-js-components-web/package.json @@ -3,8 +3,8 @@ "@clayui/card": "3.25.0", "@clayui/icon": "3.1.0", "@clayui/sticker": "3.3.0", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "prop-types": "15.7.2", "react": "16.12.0" }, diff --git a/modules/apps/frontend-js/frontend-js-components-web/src/main/resources/META-INF/resources/treeview/Treeview.js b/modules/apps/frontend-js/frontend-js-components-web/src/main/resources/META-INF/resources/treeview/Treeview.js index 79289be33bd1c0..3384de9c509167 100644 --- a/modules/apps/frontend-js/frontend-js-components-web/src/main/resources/META-INF/resources/treeview/Treeview.js +++ b/modules/apps/frontend-js/frontend-js-components-web/src/main/resources/META-INF/resources/treeview/Treeview.js @@ -12,7 +12,7 @@ * details. */ -import {useTimeout} from 'frontend-js-react-web'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useReducer, useRef, useState} from 'react'; diff --git a/modules/apps/frontend-js/frontend-js-module-launcher/src/main/resources/META-INF/resources/webpack_federation.js b/modules/apps/frontend-js/frontend-js-module-launcher/src/main/resources/META-INF/resources/webpack_federation.js index 0d1cad96e587bf..08e99ce3ac6e7d 100644 --- a/modules/apps/frontend-js/frontend-js-module-launcher/src/main/resources/META-INF/resources/webpack_federation.js +++ b/modules/apps/frontend-js/frontend-js-module-launcher/src/main/resources/META-INF/resources/webpack_federation.js @@ -83,6 +83,24 @@ } } + /** + * Compute container URL for a given containerId + */ + function getContainerURL(containerId) { + + // Strip the scope to derive the context path (this can be done because + // our SF rules enforce a certain structure on context and package + // names, but it is not valid for the general case). + + if (containerId[0] === '@') { + const i = containerId.indexOf('/'); + + containerId = containerId.substr(i + 1); + } + + return '/o/' + containerId + '/__generated__/container.js'; + } + /** * Fetch a container */ @@ -93,14 +111,14 @@ ); } - const url = '/o/' + containerId + '/__generated__/container.js'; + const url = getContainerURL(containerId); explain(callId, 'Fetching container from URL', url); containerRequests[containerId] = createContainerRequest( url, (containerRequest) => { - explain(callId, 'Fetched container'); + explain(callId, 'Fetched container', containerId); const container = getContainer(containerId); @@ -202,6 +220,10 @@ * Get a defined container object */ function getContainer(containerId) { + if (containerId[0] === '@') { + containerId = containerId.substr(1).replace('/', '!'); + } + return window[CONTAINERS_SYMBOL][containerId]; } @@ -334,7 +356,13 @@ * Split a module name in its `containerId` and `path` parts */ function splitModuleName(moduleName) { - const i = moduleName.indexOf('/'); + let i = moduleName.indexOf('/'); + + // Skip first / for scoped packages + + if (moduleName[0] === '@') { + i = moduleName.indexOf('/', i + 1); + } let containerId, path; diff --git a/modules/apps/frontend-js/frontend-js-react-web/package.json b/modules/apps/frontend-js/frontend-js-react-web/package.json index ce52e740bb2add..437c5cf442fec8 100644 --- a/modules/apps/frontend-js/frontend-js-react-web/package.json +++ b/modules/apps/frontend-js/frontend-js-react-web/package.json @@ -14,7 +14,7 @@ "react-dnd-test-utils": "11.1.1" }, "main": "js/index.es.js", - "name": "frontend-js-react-web", + "name": "@liferay/frontend-js-react-web", "scripts": { "build": "liferay-npm-scripts build", "checkFormat": "liferay-npm-scripts check", diff --git a/modules/apps/frontend-js/frontend-js-recharts/liferay-npm-bundler.config.js b/modules/apps/frontend-js/frontend-js-recharts/npmscripts.config.js similarity index 64% rename from modules/apps/frontend-js/frontend-js-recharts/liferay-npm-bundler.config.js rename to modules/apps/frontend-js/frontend-js-recharts/npmscripts.config.js index cdbeb04e46a59f..d58a02493df0b3 100644 --- a/modules/apps/frontend-js/frontend-js-recharts/liferay-npm-bundler.config.js +++ b/modules/apps/frontend-js/frontend-js-recharts/npmscripts.config.js @@ -13,20 +13,9 @@ */ module.exports = { - 'create-jar': false, - exports: { - recharts: 'recharts', - recharts_lib_index: 'recharts/lib/index.js', + federation: { + bridges: ['recharts'], + runLegacyBuild: false, }, - imports: { - 'frontend-js-node-shims': { - events: '^1.0.0', - }, - 'frontend-js-react-web': { - react: '^16.0.0', - 'react-dom': '^16.0.0', - }, - }, - output: 'build/node/packageRunBuild/resources', - workdir: 'build/node/bundler', + preset: '@liferay/npm-scripts/src/presets/standard', }; diff --git a/modules/apps/frontend-js/frontend-js-recharts/package.json b/modules/apps/frontend-js/frontend-js-recharts/package.json index 367b56caf1e063..9232ab44d270f4 100644 --- a/modules/apps/frontend-js/frontend-js-recharts/package.json +++ b/modules/apps/frontend-js/frontend-js-recharts/package.json @@ -2,12 +2,9 @@ "dependencies": { "recharts": "1.8.5" }, - "devDependencies": { - "@liferay/npm-bundler": "3.1.0-pre.0" - }, "name": "frontend-js-recharts", "scripts": { - "build": "liferay-npm-bundler", + "build": "liferay-npm-scripts build", "checkFormat": "liferay-npm-scripts check", "format": "liferay-npm-scripts fix" }, diff --git a/modules/apps/frontend-js/frontend-js-recharts/source-formatter-suppressions.xml b/modules/apps/frontend-js/frontend-js-recharts/source-formatter-suppressions.xml deleted file mode 100644 index 287e315e3ef094..00000000000000 --- a/modules/apps/frontend-js/frontend-js-recharts/source-formatter-suppressions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/modules/apps/frontend-js/frontend-js-tooltip-support-web/package.json b/modules/apps/frontend-js/frontend-js-tooltip-support-web/package.json index 311d965f744e3d..eb370a099be0b5 100644 --- a/modules/apps/frontend-js/frontend-js-tooltip-support-web/package.json +++ b/modules/apps/frontend-js/frontend-js-tooltip-support-web/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@clayui/tooltip": "3.4.5", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "metal-position": "2.1.2", "react": "16.12.0" }, diff --git a/modules/apps/frontend-js/frontend-js-tooltip-support-web/src/main/resources/META-INF/resources/index.js b/modules/apps/frontend-js/frontend-js-tooltip-support-web/src/main/resources/META-INF/resources/index.js index 11f1bdab16ae42..f5d270ae33ad9d 100644 --- a/modules/apps/frontend-js/frontend-js-tooltip-support-web/src/main/resources/META-INF/resources/index.js +++ b/modules/apps/frontend-js/frontend-js-tooltip-support-web/src/main/resources/META-INF/resources/index.js @@ -13,7 +13,7 @@ */ import ClayTooltip from '@clayui/tooltip'; -import {render, useTimeout} from 'frontend-js-react-web'; +import {render, useTimeout} from '@liferay/frontend-js-react-web'; import {ALIGN_POSITIONS as POSITIONS, align, delegate} from 'frontend-js-web'; import React, { useEffect, diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/Modal.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/Modal.js index 196ee4fc3bbc86..15c4f5418391b6 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/Modal.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/Modal.js @@ -15,8 +15,8 @@ import ClayButton from '@clayui/button'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayModal, {useModal} from '@clayui/modal'; +import {render} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {render} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/commands/OpenSimpleInputModal.es.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/commands/OpenSimpleInputModal.es.js index 81d8097b81e9b1..9f897516a10741 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/commands/OpenSimpleInputModal.es.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/commands/OpenSimpleInputModal.es.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import {unmountComponentAtNode} from 'react-dom'; diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/components/SimpleInputModal.es.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/components/SimpleInputModal.es.js index 8dbcb9856a865a..1c592503d5c4e1 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/components/SimpleInputModal.es.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/modal/components/SimpleInputModal.es.js @@ -17,7 +17,7 @@ import ClayButton from '@clayui/button'; import {ClayCheckbox} from '@clayui/form'; import ClayIcon from '@clayui/icon'; import ClayModal, {useModal} from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import React, {useState} from 'react'; import fetch from '../../util/fetch.es'; diff --git a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/toast/commands/OpenToast.es.js b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/toast/commands/OpenToast.es.js index 01bb0851d56083..75bf6bfb701e65 100644 --- a/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/toast/commands/OpenToast.es.js +++ b/modules/apps/frontend-js/frontend-js-web/src/main/resources/META-INF/resources/liferay/toast/commands/OpenToast.es.js @@ -13,7 +13,7 @@ */ import ClayAlert from '@clayui/alert'; -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import {unmountComponentAtNode} from 'react-dom'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/.npmbundlerrc b/modules/apps/frontend-taglib/frontend-taglib-clay/.npmbundlerrc index 4350a57bad9e57..acc8c71a6c0d33 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/.npmbundlerrc +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/.npmbundlerrc @@ -11,7 +11,7 @@ "metal-state": ">=2.16.5", "metal-web-component": ">=2.16.5" }, - "frontend-js-react-web": { + "@liferay/frontend-js-react-web": { "/": ">=4.0.11", "react": ">=16.6.3", "react-dom": ">=16.6.3" @@ -113,4 +113,4 @@ "output": "build/node/packageRunBuild/resources", "preset": "liferay-npm-bundler-preset-standard", "sources": ["src/main/resources/META-INF/resources"] -} \ No newline at end of file +} diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/package.json b/modules/apps/frontend-taglib/frontend-taglib-clay/package.json index 324eb3384b6dbe..fae628484bb6d8 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/package.json +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/package.json @@ -41,6 +41,7 @@ "@clayui/toolbar": "3.0.6", "@clayui/tooltip": "3.4.5", "@clayui/upper-toolbar": "3.1.14", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", "clay-alert": "2.22.2", "clay-autocomplete": "2.22.2", @@ -74,7 +75,6 @@ "clay-table": "2.22.3", "clay-tooltip": "2.22.2", "date-fns": "^1.30.1", - "frontend-js-react-web": "*", "frontend-js-web": "*", "metal-component": "2.16.8", "metal-soy": "2.16.9", diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/DataSetDisplay.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/DataSetDisplay.js index b8a164fcf25cb5..0e5121b3e27744 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/DataSetDisplay.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/DataSetDisplay.js @@ -13,7 +13,7 @@ */ import {ClayPaginationBarWithBasicItems} from '@clayui/pagination-bar'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, { diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/data_renderers/ActionsDropdownRenderer.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/data_renderers/ActionsDropdownRenderer.js index de9614c39d8b3f..97c63f9061d59a 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/data_renderers/ActionsDropdownRenderer.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/data_renderers/ActionsDropdownRenderer.js @@ -17,7 +17,7 @@ import ClayDropDown from '@clayui/drop-down'; import ClayIcon from '@clayui/icon'; import ClayLink from '@clayui/link'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useContext, useState} from 'react'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/entry.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/entry.js index 27b207c0327a2f..baa12bcc4b1c8a 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/entry.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/entry.js @@ -12,7 +12,7 @@ * details. */ -import {render, useThunk} from 'frontend-js-react-web'; +import {render, useThunk} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useReducer} from 'react'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/management_bar/components/filters/AutocompleteFilter.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/management_bar/components/filters/AutocompleteFilter.js index 2e9010ca05de2a..cd019149570e33 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/management_bar/components/filters/AutocompleteFilter.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/management_bar/components/filters/AutocompleteFilter.js @@ -18,7 +18,7 @@ import ClayDropDown from '@clayui/drop-down'; import {ClayCheckbox, ClayRadio, ClayToggle} from '@clayui/form'; import ClayLabel from '@clayui/label'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/modal/entry.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/modal/entry.js index 3207c0920e519b..9f445855452fb5 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/modal/entry.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/modal/entry.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import Modal from './Modal'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/quantity_selector/entry.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/quantity_selector/entry.js index 667fc7c4ebf462..5ef369846d88e2 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/quantity_selector/entry.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/quantity_selector/entry.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import QuantitySelector from './QuantitySelector'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/side_panel/entry.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/side_panel/entry.js index 51dbb48dd32344..07e5a75f9c6748 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/side_panel/entry.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/side_panel/entry.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import SidePanel from './SidePanel'; diff --git a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/views/table/TableInlineAddingRow.js b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/views/table/TableInlineAddingRow.js index e97cb5a27d4e75..cbf16dd506e305 100644 --- a/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/views/table/TableInlineAddingRow.js +++ b/modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/data_set_display/views/table/TableInlineAddingRow.js @@ -15,7 +15,7 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayTable from '@clayui/table'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import React, {useContext, useState} from 'react'; import DataSetDisplayContext from '../../DataSetDisplayContext'; diff --git a/modules/apps/frontend-taglib/frontend-taglib/package.json b/modules/apps/frontend-taglib/frontend-taglib/package.json index 7c5a7d3f2ef1aa..3ed86766b25583 100644 --- a/modules/apps/frontend-taglib/frontend-taglib/package.json +++ b/modules/apps/frontend-taglib/frontend-taglib/package.json @@ -9,13 +9,13 @@ "@clayui/list": "3.25.0", "@clayui/modal": "3.8.5", "@clayui/tabs": "3.3.5", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0", "react-dom": "16.12.0" }, - "name": "frontend-taglib", + "name": "@liferay/frontend-taglib", "scripts": { "build": "liferay-npm-scripts build", "checkFormat": "liferay-npm-scripts check", diff --git a/modules/apps/frontend-taglib/frontend-taglib/src/main/resources/META-INF/resources/diff_version_comparator/index.js b/modules/apps/frontend-taglib/frontend-taglib/src/main/resources/META-INF/resources/diff_version_comparator/index.js index 5539293fa8a2a7..53911cb08f4731 100644 --- a/modules/apps/frontend-taglib/frontend-taglib/src/main/resources/META-INF/resources/diff_version_comparator/index.js +++ b/modules/apps/frontend-taglib/frontend-taglib/src/main/resources/META-INF/resources/diff_version_comparator/index.js @@ -14,7 +14,7 @@ import ClayCard from '@clayui/card'; import {ClayInput} from '@clayui/form'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; diff --git a/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/item_selector_preview/js/ItemSelectorPreview.es.js b/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/item_selector_preview/js/ItemSelectorPreview.es.js index 69da05209bfb17..c8b0c8dc69aea4 100644 --- a/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/item_selector_preview/js/ItemSelectorPreview.es.js +++ b/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/item_selector_preview/js/ItemSelectorPreview.es.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useState} from 'react'; import ReactDOM from 'react-dom'; diff --git a/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/repository_entry_browser/js/ItemSelectorRepositoryEntryBrowser.es.js b/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/repository_entry_browser/js/ItemSelectorRepositoryEntryBrowser.es.js index 24beec4119513a..971632c28ad51a 100644 --- a/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/repository_entry_browser/js/ItemSelectorRepositoryEntryBrowser.es.js +++ b/modules/apps/item-selector/item-selector-taglib/src/main/resources/META-INF/resources/repository_entry_browser/js/ItemSelectorRepositoryEntryBrowser.es.js @@ -12,8 +12,8 @@ * details. */ +import {render} from '@liferay/frontend-js-react-web'; import {ClayAlert} from 'clay-alert'; -import {render} from 'frontend-js-react-web'; import {EventHandler, PortletBase, delegate} from 'frontend-js-web'; import {Config} from 'metal-state'; import ReactDOM from 'react-dom'; diff --git a/modules/apps/item-selector/item-selector-url-web/src/main/resources/META-INF/resources/js/ItemSelectorUrl.es.js b/modules/apps/item-selector/item-selector-url-web/src/main/resources/META-INF/resources/js/ItemSelectorUrl.es.js index d2b817ee46003e..c71f5f90728bfb 100644 --- a/modules/apps/item-selector/item-selector-url-web/src/main/resources/META-INF/resources/js/ItemSelectorUrl.es.js +++ b/modules/apps/item-selector/item-selector-url-web/src/main/resources/META-INF/resources/js/ItemSelectorUrl.es.js @@ -15,8 +15,8 @@ import ClayButton from '@clayui/button'; import ClayForm, {ClayInput} from '@clayui/form'; import ClayLoadingIndicator from '@clayui/loading-indicator'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useRef, useState} from 'react'; diff --git a/modules/apps/journal/journal-web/src/main/resources/META-INF/resources/js/data_engine/panels/BasicInfoPanel.es.js b/modules/apps/journal/journal-web/src/main/resources/META-INF/resources/js/data_engine/panels/BasicInfoPanel.es.js index 9ac9596787ec25..a023c26f25eee5 100644 --- a/modules/apps/journal/journal-web/src/main/resources/META-INF/resources/js/data_engine/panels/BasicInfoPanel.es.js +++ b/modules/apps/journal/journal-web/src/main/resources/META-INF/resources/js/data_engine/panels/BasicInfoPanel.es.js @@ -13,7 +13,7 @@ */ import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, runScriptsInElement} from 'frontend-js-web'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/dynamic_include/InformationMessages.js b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/dynamic_include/InformationMessages.js index a9e3903eedca6b..f46acf9873b5fa 100644 --- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/dynamic_include/InformationMessages.js +++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/dynamic_include/InformationMessages.js @@ -15,7 +15,7 @@ import {ClayButtonWithIcon} from '@clayui/button'; import ClayLink from '@clayui/link'; import ClayPopover from '@clayui/popover'; -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import React, {useRef, useState} from 'react'; export default function ({ diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/friendly_url_history/FriendlyURLHistoryModal.js b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/friendly_url_history/FriendlyURLHistoryModal.js index 12dcae33f4bc97..bb58925157be98 100644 --- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/friendly_url_history/FriendlyURLHistoryModal.js +++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/friendly_url_history/FriendlyURLHistoryModal.js @@ -15,7 +15,7 @@ import ClayList from '@clayui/list'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayModal from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, objectToFormData, openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/miller_columns/MillerColumns.js b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/miller_columns/MillerColumns.js index 5187261dac2abf..11ecd5d5712448 100644 --- a/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/miller_columns/MillerColumns.js +++ b/modules/apps/layout/layout-admin-web/src/main/resources/META-INF/resources/js/miller_columns/MillerColumns.js @@ -12,7 +12,7 @@ * details. */ -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useMemo, useRef, useState} from 'react'; import {DndProvider} from 'react-dnd'; import {HTML5Backend} from 'react-dnd-html5-backend'; diff --git a/modules/apps/layout/layout-content-page-editor-web/package.json b/modules/apps/layout/layout-content-page-editor-web/package.json index b994b6b792a525..a9ee658a8b5430 100644 --- a/modules/apps/layout/layout-content-page-editor-web/package.json +++ b/modules/apps/layout/layout-content-page-editor-web/package.json @@ -17,8 +17,8 @@ "@clayui/sticker": "3.3.0", "@clayui/tabs": "3.3.5", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0", diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/DisabledArea.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/DisabledArea.js index b1eb7e2595d6bf..d6c0a34d6b3874 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/DisabledArea.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/DisabledArea.js @@ -13,7 +13,7 @@ */ import ClayPopover from '@clayui/popover'; -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import {ALIGN_POSITIONS, align, suggestAlignBestRegion} from 'frontend-js-web'; import React, { useCallback, diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/GlobalContext.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/GlobalContext.js index 46f1651262e2a4..e219647ecc7083 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/GlobalContext.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/GlobalContext.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useMemo, useState} from 'react'; import {createPortal} from 'react-dom'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Layout.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Layout.js index 00943da132f77d..75e1d5b015d019 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Layout.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Layout.js @@ -13,8 +13,8 @@ */ import ClayAlert from '@clayui/alert'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useRef} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/ManageAllowedFragmentButton.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/ManageAllowedFragmentButton.js index 474b31f7722b4b..60db10c4578490 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/ManageAllowedFragmentButton.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/ManageAllowedFragmentButton.js @@ -14,7 +14,7 @@ import ClayButton from '@clayui/button'; import {useModal} from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/NetworkStatusBar.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/NetworkStatusBar.js index e309bf315f40e9..e55693ba9bfce9 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/NetworkStatusBar.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/NetworkStatusBar.js @@ -14,7 +14,7 @@ import ClayIcon from '@clayui/icon'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import {openToast} from 'frontend-js-web'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/SaveFragmentCompositionModal.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/SaveFragmentCompositionModal.js index 579d9d398bb762..3436728d984fe2 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/SaveFragmentCompositionModal.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/SaveFragmentCompositionModal.js @@ -19,7 +19,7 @@ import ClayIcon from '@clayui/icon'; import ClayLayout from '@clayui/layout'; import ClayModal, {useModal} from '@clayui/modal'; import ClaySticker from '@clayui/sticker'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Sidebar.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Sidebar.js index 8a42ce277b55b7..2ced80c4be8a45 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Sidebar.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Sidebar.js @@ -16,8 +16,8 @@ import {ClayButtonWithIcon, default as ClayButton} from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useIsMounted, useStateSafe} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted, useStateSafe} from 'frontend-js-react-web'; import React from 'react'; import {createPortal} from 'react-dom'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Toolbar.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Toolbar.js index a843cc38137d08..3fad35e59847cf 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Toolbar.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/Toolbar.js @@ -15,7 +15,7 @@ import {ClayButtonWithIcon, default as ClayButton} from '@clayui/button'; import ClayLayout from '@clayui/layout'; import {useModal} from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import React, {useState} from 'react'; import ReactDOM from 'react-dom'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-configuration-fields/ItemSelectorField.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-configuration-fields/ItemSelectorField.js index 58dedcf91d80bf..d117296dd4a5a8 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-configuration-fields/ItemSelectorField.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-configuration-fields/ItemSelectorField.js @@ -13,7 +13,7 @@ */ import ClayForm from '@clayui/form'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-content/FragmentContent.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-content/FragmentContent.js index 68c450e49b5f7e..d1f15aa730337b 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-content/FragmentContent.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/fragment-content/FragmentContent.js @@ -12,8 +12,8 @@ * details. */ +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useCallback, useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/layout-data-items/ColumnWithControls.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/layout-data-items/ColumnWithControls.js index 3f84c47d50a8cf..b4badcb1beb1c9 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/layout-data-items/ColumnWithControls.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/layout-data-items/ColumnWithControls.js @@ -12,8 +12,8 @@ * details. */ +import {useEventListener} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useEventListener} from 'frontend-js-react-web'; import React, {useMemo, useRef, useState} from 'react'; import {getLayoutDataItemPropTypes} from '../../../prop-types/index'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/undo/UndoHistory.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/undo/UndoHistory.js index 059fd562916949..30e6d42a7a7e86 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/undo/UndoHistory.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/undo/UndoHistory.js @@ -15,7 +15,7 @@ import {ClayButtonWithIcon} from '@clayui/button'; import ClayDropDown, {Align} from '@clayui/drop-down'; import ClayDropDownDivider from '@clayui/drop-down/lib/Divider'; -import {useEventListener, useIsMounted} from 'frontend-js-react-web'; +import {useEventListener, useIsMounted} from '@liferay/frontend-js-react-web'; import React, {useState} from 'react'; import ReactDOM from 'react-dom'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/store/index.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/store/index.js index 50ab06a2419c81..03f710136c5828 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/store/index.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/store/index.js @@ -12,7 +12,7 @@ * details. */ -import {useThunk} from 'frontend-js-react-web'; +import {useThunk} from '@liferay/frontend-js-react-web'; import React, { useCallback, useContext, diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/utils/useBackgroundImageValue.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/utils/useBackgroundImageValue.js index 67f1a6bad0e845..f2c0f0b0234aa2 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/utils/useBackgroundImageValue.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/utils/useBackgroundImageValue.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {useEffect, useState} from 'react'; import ImageService from '../services/ImageService'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/ImageSelectorSize.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/ImageSelectorSize.js index d94764f48ef668..d14fcf847a3d67 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/ImageSelectorSize.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/ImageSelectorSize.js @@ -13,7 +13,7 @@ */ import ClayForm, {ClaySelectWithOption} from '@clayui/form'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/InlineConfirm.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/InlineConfirm.js index 70f8031543f2b3..8e5cbb2ee1d356 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/InlineConfirm.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/common/components/InlineConfirm.js @@ -13,7 +13,7 @@ */ import ClayButton from '@clayui/button'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/core/hooks/useLoad.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/core/hooks/useLoad.js index b3a510b224dfe3..a2e6b8dcc01747 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/core/hooks/useLoad.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/core/hooks/useLoad.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import React from 'react'; const {useCallback, useRef} = React; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/comments/components/FragmentComment.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/comments/components/FragmentComment.js index 7a63a99b5f56bb..806bb08a69346e 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/comments/components/FragmentComment.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/comments/components/FragmentComment.js @@ -15,8 +15,8 @@ import ClayButton from '@clayui/button'; import ClayDropDown from '@clayui/drop-down'; import ClayIcon from '@clayui/icon'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import {openToast} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceModal.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceModal.js index 67ba9074bed606..631997ec0d7603 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceModal.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceModal.js @@ -19,8 +19,8 @@ import ClayIcon from '@clayui/icon'; import ClayLabel from '@clayui/label'; import ClayLayout from '@clayui/layout'; import ClayModal from '@clayui/modal'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useState} from 'react'; diff --git a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceSelector.js b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceSelector.js index 05b5778793a4cb..65ec3ecacc467b 100644 --- a/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceSelector.js +++ b/modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/plugins/experience/components/ExperienceSelector.js @@ -17,7 +17,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLayout from '@clayui/layout'; import {useModal} from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {openToast} from 'frontend-js-web'; import React, {useEffect, useRef, useState} from 'react'; import {createPortal} from 'react-dom'; diff --git a/modules/apps/layout/layout-seo-web/package.json b/modules/apps/layout/layout-seo-web/package.json index aefdaa9f515707..a61fc94303cff9 100644 --- a/modules/apps/layout/layout-seo-web/package.json +++ b/modules/apps/layout/layout-seo-web/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/layout/layout-seo-web/src/main/resources/META-INF/resources/js/seo/PreviewSeo.es.js b/modules/apps/layout/layout-seo-web/src/main/resources/META-INF/resources/js/seo/PreviewSeo.es.js index b3d0542034a2e8..d70bdf34af12c3 100644 --- a/modules/apps/layout/layout-seo-web/src/main/resources/META-INF/resources/js/seo/PreviewSeo.es.js +++ b/modules/apps/layout/layout-seo-web/src/main/resources/META-INF/resources/js/seo/PreviewSeo.es.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {isObject} from 'frontend-js-web'; import {PropTypes} from 'prop-types'; import React, {useCallback, useEffect, useState} from 'react'; diff --git a/modules/apps/portal-search/portal-search-admin-web/package.json b/modules/apps/portal-search/portal-search-admin-web/package.json index 40fa4f2762d297..b9b3f1564bf60e 100644 --- a/modules/apps/portal-search/portal-search-admin-web/package.json +++ b/modules/apps/portal-search/portal-search-admin-web/package.json @@ -3,7 +3,7 @@ "@clayui/button": "3.6.0", "@clayui/icon": "3.1.0", "@clayui/layout": "3.3.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/portal-search/portal-search-admin-web/src/main/resources/META-INF/resources/js/FieldMappings.es.js b/modules/apps/portal-search/portal-search-admin-web/src/main/resources/META-INF/resources/js/FieldMappings.es.js index 3f8e92d124fc9f..deef11677ad3ee 100644 --- a/modules/apps/portal-search/portal-search-admin-web/src/main/resources/META-INF/resources/js/FieldMappings.es.js +++ b/modules/apps/portal-search/portal-search-admin-web/src/main/resources/META-INF/resources/js/FieldMappings.es.js @@ -15,7 +15,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLayout from '@clayui/layout'; -import {useTimeout} from 'frontend-js-react-web'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useRef, useState} from 'react'; diff --git a/modules/apps/portal-template/portal-template-react-renderer-impl/package.json b/modules/apps/portal-template/portal-template-react-renderer-impl/package.json index 9d3b7a529e1629..432df1e72465fb 100644 --- a/modules/apps/portal-template/portal-template-react-renderer-impl/package.json +++ b/modules/apps/portal-template/portal-template-react-renderer-impl/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "frontend-js-react-web": "*" + "@liferay/frontend-js-react-web": "*" }, "name": "portal-template-react-renderer-impl", "scripts": { diff --git a/modules/apps/portal-template/portal-template-react-renderer-impl/src/main/resources/META-INF/resources/render.es.js b/modules/apps/portal-template/portal-template-react-renderer-impl/src/main/resources/META-INF/resources/render.es.js index 29357f571c260e..a9b00e04e5b5a5 100644 --- a/modules/apps/portal-template/portal-template-react-renderer-impl/src/main/resources/META-INF/resources/render.es.js +++ b/modules/apps/portal-template/portal-template-react-renderer-impl/src/main/resources/META-INF/resources/render.es.js @@ -12,7 +12,7 @@ * details. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; export default function (renderFunction, renderData, placeholderId) { const element = document.getElementById(placeholderId); diff --git a/modules/apps/product-navigation/product-navigation-applications-menu-web/package.json b/modules/apps/product-navigation/product-navigation-applications-menu-web/package.json index bb87eee6dc6568..d1967e6209c6e2 100644 --- a/modules/apps/product-navigation/product-navigation-applications-menu-web/package.json +++ b/modules/apps/product-navigation/product-navigation-applications-menu-web/package.json @@ -6,7 +6,7 @@ "@clayui/label": "3.4.1", "@clayui/layout": "3.3.0", "@clayui/sticker": "3.3.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/resources/META-INF/resources/js/ApplicationsMenu.js b/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/resources/META-INF/resources/js/ApplicationsMenu.js index 070bb26a635b6f..6e6d87b8dee4ed 100644 --- a/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/resources/META-INF/resources/js/ApplicationsMenu.js +++ b/modules/apps/product-navigation/product-navigation-applications-menu-web/src/main/resources/META-INF/resources/js/ApplicationsMenu.js @@ -19,8 +19,8 @@ import ClayLayout from '@clayui/layout'; import ClayModal, {useModal} from '@clayui/modal'; import ClaySticker from '@clayui/sticker'; import ClayTabs from '@clayui/tabs'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useEventListener} from 'frontend-js-react-web'; import {fetch, navigate, openSelectionModal} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useMemo, useRef, useState} from 'react'; diff --git a/modules/apps/questions/questions-web/package.json b/modules/apps/questions/questions-web/package.json index bdb8d719e72c78..4b175b4df90767 100644 --- a/modules/apps/questions/questions-web/package.json +++ b/modules/apps/questions/questions-web/package.json @@ -14,11 +14,11 @@ "@clayui/popover": "3.5.5", "@clayui/sticker": "3.3.0", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "asset-taglib": "*", "bbcode-to-react": "^0.2.9", "classnames": "2.2.6", "frontend-editor-ckeditor-web": "*", - "frontend-js-react-web": "*", "frontend-js-web": "*", "graphql": "^15.0.0", "highlight.js": "10.4.1", diff --git a/modules/apps/questions/questions-web/src/main/resources/META-INF/resources/js/components/QuestionsEditor.js b/modules/apps/questions/questions-web/src/main/resources/META-INF/resources/js/components/QuestionsEditor.js index 921da1c433f698..6a80b62b440098 100644 --- a/modules/apps/questions/questions-web/src/main/resources/META-INF/resources/js/components/QuestionsEditor.js +++ b/modules/apps/questions/questions-web/src/main/resources/META-INF/resources/js/components/QuestionsEditor.js @@ -12,8 +12,8 @@ * details. */ +import {useEventListener} from '@liferay/frontend-js-react-web'; import {Editor} from 'frontend-editor-ckeditor-web'; -import {useEventListener} from 'frontend-js-react-web'; import {isPhone, isTablet} from 'frontend-js-web'; import React, {useContext, useEffect, useMemo, useRef, useState} from 'react'; diff --git a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/AnimatedCounter.js b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/AnimatedCounter.js index 25552ee37bd179..67d7066d3f1f9d 100644 --- a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/AnimatedCounter.js +++ b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/AnimatedCounter.js @@ -12,8 +12,8 @@ * details. */ +import {useIsMounted, usePrevious} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted, usePrevious} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsLike.js b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsLike.js index d9725109bae98b..fa34f2c1b9f7bc 100644 --- a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsLike.js +++ b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsLike.js @@ -15,8 +15,8 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useState} from 'react'; diff --git a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsStars.js b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsStars.js index cd1bf82ea802c1..71693a12bafc96 100644 --- a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsStars.js +++ b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsStars.js @@ -12,7 +12,7 @@ * details. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import {useCallback, useState} from 'react'; diff --git a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsThumbs.js b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsThumbs.js index f454e2fb026f51..16e7df35404f8b 100644 --- a/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsThumbs.js +++ b/modules/apps/ratings/ratings-taglib/src/main/resources/META-INF/resources/js/components/RatingsThumbs.js @@ -15,8 +15,8 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useCallback, useReducer, useState} from 'react'; diff --git a/modules/apps/roles/roles-admin-web/package.json b/modules/apps/roles/roles-admin-web/package.json index 9b3327be26427c..3b8bca9ec0355a 100644 --- a/modules/apps/roles/roles-admin-web/package.json +++ b/modules/apps/roles/roles-admin-web/package.json @@ -3,7 +3,7 @@ "@clayui/button": "3.6.0", "@clayui/icon": "3.1.0", "@clayui/label": "3.4.1", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/sharing/sharing-web/package.json b/modules/apps/sharing/sharing-web/package.json index 86469fd5cce9b5..cf4d2c808f39bf 100644 --- a/modules/apps/sharing/sharing-web/package.json +++ b/modules/apps/sharing/sharing-web/package.json @@ -11,7 +11,7 @@ "@clayui/modal": "3.8.5", "@clayui/multi-select": "3.25.0", "@clayui/sticker": "3.3.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/apps/sharing/sharing-web/src/main/resources/META-INF/resources/manage_collaborators/js/ManageCollaborators.es.js b/modules/apps/sharing/sharing-web/src/main/resources/META-INF/resources/manage_collaborators/js/ManageCollaborators.es.js index b5bc7b27ebb6dc..745267ebc1fbd2 100644 --- a/modules/apps/sharing/sharing-web/src/main/resources/META-INF/resources/manage_collaborators/js/ManageCollaborators.es.js +++ b/modules/apps/sharing/sharing-web/src/main/resources/META-INF/resources/manage_collaborators/js/ManageCollaborators.es.js @@ -19,8 +19,8 @@ import ClayIcon from '@clayui/icon'; import ClayLayout from '@clayui/layout'; import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClaySticker from '@clayui/sticker'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useTimeout} from 'frontend-js-react-web'; import {fetch, objectToFormData} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useEffect, useState} from 'react'; diff --git a/modules/apps/site-navigation/site-navigation-admin-web/src/main/resources/META-INF/resources/site_navigation_menu_editor/components/SidebarPanelContent.js b/modules/apps/site-navigation/site-navigation-admin-web/src/main/resources/META-INF/resources/site_navigation_menu_editor/components/SidebarPanelContent.js index 347130fedf0269..ddb905a0ae9817 100644 --- a/modules/apps/site-navigation/site-navigation-admin-web/src/main/resources/META-INF/resources/site_navigation_menu_editor/components/SidebarPanelContent.js +++ b/modules/apps/site-navigation/site-navigation-admin-web/src/main/resources/META-INF/resources/site_navigation_menu_editor/components/SidebarPanelContent.js @@ -16,7 +16,7 @@ import ClayButton from '@clayui/button'; import ClayIcon from '@clayui/icon'; import ClayLayout from '@clayui/layout'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, objectToFormData, runScriptsInElement} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useEffect, useRef, useState} from 'react'; diff --git a/modules/apps/style-book/style-book-web/src/main/resources/META-INF/resources/js/style-book-editor/LayoutsTree.js b/modules/apps/style-book/style-book-web/src/main/resources/META-INF/resources/js/style-book-editor/LayoutsTree.js index 8908a0b79df6c8..1cdd318225a1cb 100644 --- a/modules/apps/style-book/style-book-web/src/main/resources/META-INF/resources/js/style-book-editor/LayoutsTree.js +++ b/modules/apps/style-book/style-book-web/src/main/resources/META-INF/resources/js/style-book-editor/LayoutsTree.js @@ -13,7 +13,7 @@ */ import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch, runScriptsInElement} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useState} from 'react'; diff --git a/modules/dxp/apps/analytics/analytics-reports-web/package.json b/modules/dxp/apps/analytics/analytics-reports-web/package.json index c8767d4cf641af..6210f58fa28c9f 100644 --- a/modules/dxp/apps/analytics/analytics-reports-web/package.json +++ b/modules/dxp/apps/analytics/analytics-reports-web/package.json @@ -9,8 +9,8 @@ "@clayui/loading-indicator": "3.2.0", "@clayui/sticker": "3.3.0", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0", diff --git a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/AnalyticsReportsApp.js b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/AnalyticsReportsApp.js index bda54c4ef7d953..6b5907029197c7 100644 --- a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/AnalyticsReportsApp.js +++ b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/AnalyticsReportsApp.js @@ -11,7 +11,7 @@ import ClayAlert from '@clayui/alert'; import ClayLoadingIndicator from '@clayui/loading-indicator'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {fetch} from 'frontend-js-web'; import React, {useCallback, useEffect, useReducer} from 'react'; diff --git a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/Chart.js b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/Chart.js index cba9a1b21de8ce..400d97c469924d 100644 --- a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/Chart.js +++ b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/Chart.js @@ -10,8 +10,8 @@ */ import ClayLoadingIndicator from '@clayui/loading-indicator'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import className from 'classnames'; -import {useIsMounted} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useMemo} from 'react'; import { diff --git a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TotalCount.js b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TotalCount.js index ff6bbd9f1906b7..fe6436d4514777 100644 --- a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TotalCount.js +++ b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TotalCount.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {useStateSafe} from 'frontend-js-react-web'; +import {useStateSafe} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect} from 'react'; diff --git a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TrafficSources.js b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TrafficSources.js index c7b1153c8314ce..83bc2e3b58f32c 100644 --- a/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TrafficSources.js +++ b/modules/dxp/apps/analytics/analytics-reports-web/src/main/resources/META-INF/resources/js/components/TrafficSources.js @@ -10,8 +10,8 @@ */ import ClayButton from '@clayui/button'; +import {useStateSafe} from '@liferay/frontend-js-react-web'; import className from 'classnames'; -import {useStateSafe} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useMemo, useState} from 'react'; import {Cell, Pie, PieChart, Tooltip} from 'recharts'; diff --git a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/package.json b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/package.json index b35652fec649fd..3d271d096a90a0 100644 --- a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/package.json +++ b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/package.json @@ -9,8 +9,8 @@ "@clayui/modal": "3.8.5", "@clayui/popover": "3.5.5", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "moment": "2.24.0", "path-to-regexp": "3.0.0" diff --git a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/EditEntry.es.js b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/EditEntry.es.js index c4e157aad0dc0d..bf0eff2edc2279 100644 --- a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/EditEntry.es.js +++ b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/EditEntry.es.js @@ -11,6 +11,7 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useTimeout} from '@liferay/frontend-js-react-web'; import {AppContext} from 'app-builder-web/js/AppContext.es'; import {ControlMenuBase} from 'app-builder-web/js/components/control-menu/ControlMenu.es'; import useDataDefinition from 'app-builder-web/js/hooks/useDataDefinition.es'; @@ -21,7 +22,6 @@ import { errorToast, successToast, } from 'data-engine-js-components-web/js/utils/toast.es'; -import {useTimeout} from 'frontend-js-react-web'; import {createResourceURL, fetch} from 'frontend-js-web'; import React, { useCallback, diff --git a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ListEntries.es.js b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ListEntries.es.js index a058cbd788a0f2..d25c1263e7c8dc 100644 --- a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ListEntries.es.js +++ b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ListEntries.es.js @@ -11,6 +11,7 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button'; import ClayLabel from '@clayui/label'; +import {usePrevious, useTimeout} from '@liferay/frontend-js-react-web'; import {AppContext} from 'app-builder-web/js/AppContext.es'; import NoPermissionState from 'app-builder-web/js/components/empty-state/NoPermissionState.es'; import useDataListView from 'app-builder-web/js/hooks/useDataListView.es'; @@ -35,7 +36,6 @@ import { concatValues, isEqualObjects, } from 'data-engine-js-components-web/js/utils/utils.es'; -import {usePrevious, useTimeout} from 'frontend-js-react-web'; import React, {useCallback, useContext, useEffect, useState} from 'react'; import useAppWorkflow from '../../hooks/useAppWorkflow.es'; diff --git a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js index 001796af7bf8bf..24de1a76a6beb5 100644 --- a/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js +++ b/modules/dxp/apps/app-builder-workflow/app-builder-workflow-web/src/main/resources/META-INF/resources/js/pages/entry/ViewEntry.es.js @@ -11,6 +11,7 @@ import {ClayButtonWithIcon} from '@clayui/button'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {usePrevious, useTimeout} from '@liferay/frontend-js-react-web'; import {AppContext} from 'app-builder-web/js/AppContext.es'; import ControlMenu from 'app-builder-web/js/components/control-menu/ControlMenu.es'; import useDataDefinition from 'app-builder-web/js/hooks/useDataDefinition.es'; @@ -25,7 +26,6 @@ import { } from 'data-engine-js-components-web/js/utils/client.es'; import {errorToast} from 'data-engine-js-components-web/js/utils/toast.es'; import {isEqualObjects} from 'data-engine-js-components-web/js/utils/utils.es'; -import {usePrevious, useTimeout} from 'frontend-js-react-web'; import React, {useContext, useEffect, useState} from 'react'; import WorkflowInfoBar from '../../components/workflow-info-bar/WorkflowInfoBar.es'; diff --git a/modules/dxp/apps/commerce/commerce-bom-admin-web/package.json b/modules/dxp/apps/commerce/commerce-bom-admin-web/package.json index 0714a6242d0ba8..b6e6069b1caf2b 100644 --- a/modules/dxp/apps/commerce/commerce-bom-admin-web/package.json +++ b/modules/dxp/apps/commerce/commerce-bom-admin-web/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "react": "16.12.0" }, "description": "", diff --git a/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.dev.es.js b/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.dev.es.js index dc0b7552a12db5..8f8de9c0f27666 100644 --- a/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.dev.es.js +++ b/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.dev.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import apiEndpointDefinitions from '../../../../../../dev/apiEndpointDefinitions'; diff --git a/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.es.js b/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.es.js index 4cea033e079c5a..54abcbd83b4bc5 100644 --- a/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.es.js +++ b/modules/dxp/apps/commerce/commerce-bom-admin-web/src/main/resources/META-INF/resources/js/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import App from './App.es'; diff --git a/modules/dxp/apps/commerce/commerce-bom-web/package.json b/modules/dxp/apps/commerce/commerce-bom-web/package.json index 783700acb10f75..dfa9733f0c6851 100644 --- a/modules/dxp/apps/commerce/commerce-bom-web/package.json +++ b/modules/dxp/apps/commerce/commerce-bom-web/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "history": "^4.9.0", "react": "16.12.0" }, diff --git a/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.dev.es.js b/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.dev.es.js index fe81132e99ce3f..62cc0f87eb4671 100644 --- a/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.dev.es.js +++ b/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.dev.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import apiEndpointDefinitions from '../../../../../../dev/apiEndpointDefinitions'; diff --git a/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.es.js b/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.es.js index 61221cc1a832d1..2652c2dae5b03f 100644 --- a/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.es.js +++ b/modules/dxp/apps/commerce/commerce-bom-web/src/main/resources/META-INF/resources/js/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import App from './App.es'; diff --git a/modules/dxp/apps/commerce/commerce-dashboard-web/package.json b/modules/dxp/apps/commerce/commerce-dashboard-web/package.json index bb2d1f857281ab..f74070858fc4ed 100644 --- a/modules/dxp/apps/commerce/commerce-dashboard-web/package.json +++ b/modules/dxp/apps/commerce/commerce-dashboard-web/package.json @@ -2,7 +2,7 @@ "dependencies": { "@clayui/charts": "3.2.0", "@clayui/css": "3.25.0", - "frontend-js-react-web": "*", + "@liferay/frontend-js-react-web": "*", "frontend-js-web": "*", "react": "16.12.0", "resize-observer-polyfill": "^1.5.1" diff --git a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/forecast/index.es.js b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/forecast/index.es.js index ed73ec2ec1b177..7f0245b33173eb 100644 --- a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/forecast/index.es.js +++ b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/forecast/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import ForecastChart from './ForecastChart.es'; diff --git a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/history/index.es.js b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/history/index.es.js index a97c94331e008a..9f3f0549c3b384 100644 --- a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/history/index.es.js +++ b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/history/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import HistoryChart from './HistoryChart.es'; diff --git a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/overview/index.es.js b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/overview/index.es.js index d35f4d71884b49..86b8982569a329 100644 --- a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/overview/index.es.js +++ b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/overview/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import OverviewChart from './OverviewChart.es'; diff --git a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/status/index.es.js b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/status/index.es.js index 46e94663bf2a99..ce081dd8427d38 100644 --- a/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/status/index.es.js +++ b/modules/dxp/apps/commerce/commerce-dashboard-web/src/main/resources/META-INF/resources/js/status/index.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import StatusChart from './StatusChart.es'; diff --git a/modules/dxp/apps/commerce/commerce-organization-web/package.json b/modules/dxp/apps/commerce/commerce-organization-web/package.json index b6da245b49264e..6a7bcc6cd93b4c 100644 --- a/modules/dxp/apps/commerce/commerce-organization-web/package.json +++ b/modules/dxp/apps/commerce/commerce-organization-web/package.json @@ -1,8 +1,8 @@ { "dependencies": { + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", "d3": "5.0.0", - "frontend-js-react-web": "*", "prop-types": "15.7.2", "react": "16.12.0", "react-dom": "16.12.0" diff --git a/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.dev.js b/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.dev.js index 67b61140c01303..4c3010475d92d1 100644 --- a/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.dev.js +++ b/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.dev.js @@ -12,7 +12,7 @@ import '../css/main.scss'; import 'clay-css/lib/css/atlas.css'; -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import React from 'react'; import Container from './Container'; diff --git a/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.js b/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.js index 255151f265fcf8..c7c1e0605480ef 100644 --- a/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.js +++ b/modules/dxp/apps/commerce/commerce-organization-web/src/main/resources/META-INF/resources/js/index.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {render} from 'frontend-js-react-web'; +import {render} from '@liferay/frontend-js-react-web'; import OrgChartContainer from './components/OrgChartContainer'; diff --git a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/package.json b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/package.json index 14838f5c4bbf1d..b7a68bb24cb520 100644 --- a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/package.json +++ b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/package.json @@ -14,8 +14,8 @@ "@clayui/pagination-bar": "3.25.0", "@clayui/tabs": "3.3.5", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "lodash.isfunction": "3.0.9", "lodash.times": "^4.3.2", "prop-types": "15.7.2", diff --git a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/resources/META-INF/resources/js/components/add_result/AddResultModal.es.js b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/resources/META-INF/resources/js/components/add_result/AddResultModal.es.js index 040aa3bebe5f6e..e8680a556e33f2 100644 --- a/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/resources/META-INF/resources/js/components/add_result/AddResultModal.es.js +++ b/modules/dxp/apps/portal-search-tuning/portal-search-tuning-rankings-web/src/main/resources/META-INF/resources/js/components/add_result/AddResultModal.es.js @@ -18,8 +18,8 @@ import ClayLoadingIndicator from '@clayui/loading-indicator'; import ClayModal from '@clayui/modal'; import {ClayPaginationBarWithBasicItems} from '@clayui/pagination-bar'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import getCN from 'classnames'; -import {usePrevious} from 'frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useContext, useEffect, useState} from 'react'; diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/package.json b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/package.json index 839b7acf18355b..6dc77b4caa52aa 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/package.json +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/package.json @@ -17,11 +17,11 @@ "@clayui/table": "3.1.0", "@clayui/tabs": "3.3.5", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "axios": "0.21.1", "classnames": "2.2.6", "custom-event-polyfill": "1.0.6", "dom4": "^2.1.5", - "frontend-js-react-web": "*", "moment": "2.24.0", "numeral": "2.0.6", "path-to-regexp": "3.0.0", diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageBody.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageBody.es.js index c16cb293e5d6cc..754bde3c45439a 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageBody.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageBody.es.js @@ -10,7 +10,7 @@ */ import ClayLayout from '@clayui/layout'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useContext, useMemo} from 'react'; import ContentView from '../../shared/components/content-view/ContentView.es'; diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageHeader.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageHeader.es.js index 767e72b6df646e..c25bc8ddcf6c3d 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageHeader.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/InstanceListPageHeader.es.js @@ -11,7 +11,7 @@ import ClayLayout from '@clayui/layout'; import ClayManagementToolbar from '@clayui/management-toolbar'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useCallback, useContext, useEffect, useMemo} from 'react'; import filterConstants from '../../shared/components/filter/util/filterConstants.es'; diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/modal/shared/select-tasks-step/SelectTasksStepHeader.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/modal/shared/select-tasks-step/SelectTasksStepHeader.es.js index 25699383275e87..0f82751ed01f6a 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/modal/shared/select-tasks-step/SelectTasksStepHeader.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/components/instance-list-page/modal/shared/select-tasks-step/SelectTasksStepHeader.es.js @@ -10,7 +10,7 @@ */ import ClayManagementToolbar from '@clayui/management-toolbar'; -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useContext, useEffect} from 'react'; import ResultsBar from '../../../../../shared/components/results-bar/ResultsBar.es'; diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/components/header/HeaderTitle.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/components/header/HeaderTitle.es.js index c950a79721260d..c782c529fb88bf 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/components/header/HeaderTitle.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/components/header/HeaderTitle.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {usePrevious} from 'frontend-js-react-web'; +import {usePrevious} from '@liferay/frontend-js-react-web'; import React, {useEffect, useState} from 'react'; import Portal from '../portal/Portal.es'; diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useInterval.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useInterval.es.js index 61bf2255386b35..119034305c0e5c 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useInterval.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useInterval.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import {useCallback} from 'react'; const useInterval = (cancelOnDestroy) => { diff --git a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useStorage.es.js b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useStorage.es.js index bc18bc62b4fcb1..f3c701144ba492 100644 --- a/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useStorage.es.js +++ b/modules/dxp/apps/portal-workflow/portal-workflow-metrics-web/src/main/resources/META-INF/resources/js/shared/hooks/useStorage.es.js @@ -9,7 +9,7 @@ * distribution rights of the Software. */ -import {useEventListener} from 'frontend-js-react-web'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import {useCallback, useState} from 'react'; import {jsonStorage} from '../util/storage.es'; diff --git a/modules/dxp/apps/segments/segments-experiment-web/package.json b/modules/dxp/apps/segments/segments-experiment-web/package.json index 1b576f72fef4ed..18884f01b9a0f1 100644 --- a/modules/dxp/apps/segments/segments-experiment-web/package.json +++ b/modules/dxp/apps/segments/segments-experiment-web/package.json @@ -10,8 +10,8 @@ "@clayui/modal": "3.8.5", "@clayui/tabs": "3.3.5", "@clayui/tooltip": "3.4.5", + "@liferay/frontend-js-react-web": "*", "classnames": "2.2.6", - "frontend-js-react-web": "*", "frontend-js-web": "*", "prop-types": "15.7.2", "react": "16.12.0" diff --git a/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/ClickGoalPicker/ClickGoalPicker.es.js b/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/ClickGoalPicker/ClickGoalPicker.es.js index e598fdf86c604c..b827899a043bfe 100644 --- a/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/ClickGoalPicker/ClickGoalPicker.es.js +++ b/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/ClickGoalPicker/ClickGoalPicker.es.js @@ -13,8 +13,8 @@ import ClayButton, {ClayButtonWithIcon} from '@clayui/button'; import ClayForm, {ClayInput} from '@clayui/form'; import ClayIcon from '@clayui/icon'; import {ClayTooltipProvider} from '@clayui/tooltip'; +import {useEventListener} from '@liferay/frontend-js-react-web'; import classNames from 'classnames'; -import {useEventListener} from 'frontend-js-react-web'; import {throttle} from 'frontend-js-web'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/SegmentsExperimentsModal.es.js b/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/SegmentsExperimentsModal.es.js index b97f858ab175d3..44c04df3d65361 100644 --- a/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/SegmentsExperimentsModal.es.js +++ b/modules/dxp/apps/segments/segments-experiment-web/src/main/resources/META-INF/resources/js/components/SegmentsExperimentsModal.es.js @@ -14,7 +14,7 @@ import ClayButton from '@clayui/button'; import {ClaySelect} from '@clayui/form'; import ClayIcon from '@clayui/icon'; import ClayModal from '@clayui/modal'; -import {useIsMounted} from 'frontend-js-react-web'; +import {useIsMounted} from '@liferay/frontend-js-react-web'; import PropTypes from 'prop-types'; import React, {useState} from 'react'; diff --git a/modules/package.json b/modules/package.json index 7289610da57b11..34fb26b44b7cb1 100644 --- a/modules/package.json +++ b/modules/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@liferay/npm-scripts": "37.0.0", + "@liferay/npm-scripts": "37.1.2", "acorn": "7.1.0", "alloy-ui": "^3.1.0-deprecated.40", "babel-plugin-incremental-dom": "3.4.0", diff --git a/modules/yarn.lock b/modules/yarn.lock index 3bd1117aaaa238..bdbb046877ea1a 100644 --- a/modules/yarn.lock +++ b/modules/yarn.lock @@ -1600,19 +1600,19 @@ source-map "^0.7.3" webpack "^5.4.0" -"@liferay/npm-bundler-preset-liferay-dev@4.6.5": - version "4.6.5" - resolved "https://registry.yarnpkg.com/@liferay/npm-bundler-preset-liferay-dev/-/npm-bundler-preset-liferay-dev-4.6.5.tgz#8c6fe6de14269e7eed5525f3ab5cf3252f6bd7f3" - integrity sha512-6R3oUzpP/+ufXWSGXwOTZMmANiCgVKRfmNXv+QXvMEH221TbYmlQkfekx1PVOAk4fDiiL4OpGFhCQ/tpLC7+WA== - dependencies: - babel-preset-liferay-standard "2.19.4" - liferay-npm-bundler-loader-css-loader "2.19.4" - liferay-npm-bundler-plugin-exclude-imports "2.19.4" - liferay-npm-bundler-plugin-inject-imports-dependencies "2.19.4" - liferay-npm-bundler-plugin-inject-peer-dependencies "2.19.4" - liferay-npm-bundler-plugin-namespace-packages "2.19.4" - liferay-npm-bundler-plugin-replace-browser-modules "2.19.4" - liferay-npm-bundler-plugin-resolve-linked-dependencies "2.19.4" +"@liferay/npm-bundler-preset-liferay-dev@4.7.0": + version "4.7.0" + resolved "https://registry.yarnpkg.com/@liferay/npm-bundler-preset-liferay-dev/-/npm-bundler-preset-liferay-dev-4.7.0.tgz#454c8f6397b0dddd40c2cf707530aad4b157d782" + integrity sha512-sC5Jz2tM4EFy5o8KUZ0CRObWfW+LnNWMKvmzgBoJAvZ7zo0QcWXTfAIo328hkNh4JKo2Cbpv0iq9PSeV7U6QPQ== + dependencies: + babel-preset-liferay-standard "2.23.0" + liferay-npm-bundler-loader-css-loader "2.23.0" + liferay-npm-bundler-plugin-exclude-imports "2.23.0" + liferay-npm-bundler-plugin-inject-imports-dependencies "2.23.0" + liferay-npm-bundler-plugin-inject-peer-dependencies "2.23.0" + liferay-npm-bundler-plugin-namespace-packages "2.23.0" + liferay-npm-bundler-plugin-replace-browser-modules "2.23.0" + liferay-npm-bundler-plugin-resolve-linked-dependencies "2.23.0" "@liferay/npm-bundler@3.1.0-pre.0": version "3.1.0-pre.0" @@ -1635,10 +1635,10 @@ xml-js "^1.6.8" yargs "^14.0.0" -"@liferay/npm-scripts@37.0.0": - version "37.0.0" - resolved "https://registry.yarnpkg.com/@liferay/npm-scripts/-/npm-scripts-37.0.0.tgz#e564e4a17bd87aa45e2b185441049d6e674d22e1" - integrity sha512-8xPjo7fFWjQrPujb9XhQ1qJpgKTB1sI3MxUWzHpbBbL9P5EH7WpYZf+r/ZdA96d/P8AhmtNMTNjdaW9ox1R6LQ== +"@liferay/npm-scripts@37.1.2": + version "37.1.2" + resolved "https://registry.yarnpkg.com/@liferay/npm-scripts/-/npm-scripts-37.1.2.tgz#60e815043cd7b88c5c71d30f8fe5c7ea8933e286" + integrity sha512-SNJ/6QvB405C4CLU3QNchlKu4dhFY/eA0m5CtaDwEFXXNzkOP619wch2It7hQhcNV2tJPv107n0kn/MymKfSDg== dependencies: "@babel/cli" "^7.2.3" "@babel/core" "^7.8.3" @@ -1653,7 +1653,7 @@ "@liferay/eslint-config" "21.3.0" "@liferay/jest-junit-reporter" "1.2.0" "@liferay/js-toolkit-core" "3.0.1-pre.1" - "@liferay/npm-bundler-preset-liferay-dev" "4.6.5" + "@liferay/npm-bundler-preset-liferay-dev" "4.7.0" "@testing-library/dom" "^5.6.1" "@testing-library/jest-dom" "^4.2.4" "@testing-library/react" "^8.0.9" @@ -1681,8 +1681,8 @@ jest-fetch-mock "^3.0.3" liferay-frontend-common-css "^1.0.4" liferay-lang-key-dev-loader "^1.0.3" - liferay-npm-bridge-generator "2.19.4" - liferay-npm-bundler "2.19.4" + liferay-npm-bridge-generator "2.23.0" + liferay-npm-bundler "2.23.0" liferay-theme-tasks "10.2.0" metal-tools-soy "4.3.2" mini-css-extract-plugin "0.11.2" @@ -2979,20 +2979,20 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-add-module-metadata@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-metadata/-/babel-plugin-add-module-metadata-2.19.4.tgz#2359d427fa2230ffe91bc425ac313fdfbc35076b" - integrity sha512-OaDRjCDZymLIxv7DDh6NDJyTTWmpi6y0fVIWrTnohhDC1VlQZmpuxStYoIQhyLy/cy/9Cn6pYcsHV8Nta46/nw== +babel-plugin-add-module-metadata@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-add-module-metadata/-/babel-plugin-add-module-metadata-2.23.0.tgz#ecea45dee74730b8a03baf0e3dc282bcc3d2679e" + integrity sha512-pjTxQ6HZSfZHpX4D3p9s+MqQichjC7CsuBfalboxJR4ZUIj6pU5bFDV8CpwGYzCG6wNAxIx6q1KCZPSw+MY3MQ== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" read-json-sync "^2.0.1" -babel-plugin-alias-modules@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-alias-modules/-/babel-plugin-alias-modules-2.19.4.tgz#6992114f094e8ef25488111b39353256a08018a3" - integrity sha512-Y/HDq6gnmDP7lpjatPjjuHLbL3gQBviB/8EDMyDzGubZ9NANLAVx3IIq+MYnmA3ZtDUfpyF7TNt6co0ItbZ/Zw== +babel-plugin-alias-modules@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-alias-modules/-/babel-plugin-alias-modules-2.23.0.tgz#f04c39c1da080b77f580baafb32d99bad784dd03" + integrity sha512-H+aFZWsgxuNChIlo/oeeRO3W0Bg6k1z3G5qWzjQoYtr3GsS8fFpFWMsur9r3YXbPJerVGqR2BouH44WKM60W5A== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" @@ -3037,33 +3037,33 @@ babel-plugin-minify-dead-code-elimination@0.5.1: babel-helper-remove-or-void "^0.4.3" lodash "^4.17.11" -babel-plugin-name-amd-modules@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-name-amd-modules/-/babel-plugin-name-amd-modules-2.19.4.tgz#b1d74f4261ab057dd715932a26028cb6791a408e" - integrity sha512-UvzDMP+C7vP3JopHUcL3AR3aMD1VFc5kp4iZnrA56KlQyfekjUNybEPnsN/Id1vthvPJjpVXo9DqUbO8lmpttw== +babel-plugin-name-amd-modules@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-name-amd-modules/-/babel-plugin-name-amd-modules-2.23.0.tgz#c8a7260c584984bee6a7f09ed45f61ec79cc86fc" + integrity sha512-Kth2WC4a8xcXNHT6Duy4LJXm7MKVcgzn+P3Ch/a9rfEI1ZTGmPqGGLn/43SSAJT3kby5j9NIbdT+X5sJKiy7TA== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -babel-plugin-namespace-amd-define@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-namespace-amd-define/-/babel-plugin-namespace-amd-define-2.19.4.tgz#557abe510d7a85783fb2fe1df2c4a16f2fe37b68" - integrity sha512-uK0uEIpVcO0uvqiH+hudIMrXK1cNxcrz/XAB5VQ24+X7YRpsycovrZz8gr9AnyN/qZEnTk7pigbLlFoy8mX96Q== +babel-plugin-namespace-amd-define@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-namespace-amd-define/-/babel-plugin-namespace-amd-define-2.23.0.tgz#834fc3790a97f2530e023c4d680ce4fdd1fc22ab" + integrity sha512-YpQZ8LYfEyEdphhgRFkF1N8L3gPWdL5UJzQlAJUKKOOZWs6sTW1ZrqMS8FX08ItuKRlWzoC9w9i36Yx9eDAQYg== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -babel-plugin-namespace-modules@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-namespace-modules/-/babel-plugin-namespace-modules-2.19.4.tgz#7c4eeddbd82408100d2cd0790dbc7437d8294e73" - integrity sha512-hn/LH4w/jl5hy9itDoqVQ/aLHX+9IpAv6s1jsP8p4aMpsacnpCgB+nqT5/FpIh34/tBFtLDXHOpI7Wnlfb1ieg== +babel-plugin-namespace-modules@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-namespace-modules/-/babel-plugin-namespace-modules-2.23.0.tgz#fd1b13dbc9d9edf2c78ae89d7ad5468ea687fd25" + integrity sha512-VLk+PXLPAc2KwrsQIO8TOAplPi0ugOIxbvhiptmsXQ6zCe+Ab79dnpCw1cAsNRmGgLduq0A3TvGw6ebu5cenFA== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -babel-plugin-normalize-requires@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-normalize-requires/-/babel-plugin-normalize-requires-2.19.4.tgz#852520e780267b4e20d54214e4512579405a3d62" - integrity sha512-4vhuAhYi+eIXkXaTBGYOop+n/bqYiQLbRdGLHBetppTqZhI2QVaE0NhqGDsN5bU2BgXJ2eOTIEMyaPaOZcqIfQ== +babel-plugin-normalize-requires@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-normalize-requires/-/babel-plugin-normalize-requires-2.23.0.tgz#a36d7f954c28806df5ea76b2bc7e0415d1ba1a7f" + integrity sha512-MQLDKZzvH/5/xgX0URliJ6Ly6FWcad2WU58D9S9hRgDD5Daz/zxEyM1kmG6ui1GHG9TVo2AGaCNTFFk6bPQcaQ== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" babel-plugin-syntax-jsx@^6.8.0: version "6.18.0" @@ -3080,13 +3080,13 @@ babel-plugin-transform-react-remove-prop-types@0.4.24: resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA== -babel-plugin-wrap-modules-amd@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-plugin-wrap-modules-amd/-/babel-plugin-wrap-modules-amd-2.19.4.tgz#8fd33d71f0c754a801ded2e8509a9c7a26f82aaf" - integrity sha512-E70+9ptcDVYs8oEb4YVXgLc1o2px7IBvrxaZCxJ4ydGBUqBtCfKx2mAjCGU/925HVp3im7KFJscNpzHCcHLzqA== +babel-plugin-wrap-modules-amd@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-plugin-wrap-modules-amd/-/babel-plugin-wrap-modules-amd-2.23.0.tgz#a16e37fa3e3e26f8946066de811af874945cf213" + integrity sha512-iEnb8XuTvSgBjpyohzLTrlafvA+rlWIYUCu111QV9BLMlZ911pzjVjxQt/ASgINmyHNaTmsL2WBUiITCWLpvww== dependencies: babel-template "^6.26.0" - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" read-json-sync "^2.0.1" babel-preset-jest@^25.1.0: @@ -3098,20 +3098,20 @@ babel-preset-jest@^25.1.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^25.1.0" -babel-preset-liferay-standard@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/babel-preset-liferay-standard/-/babel-preset-liferay-standard-2.19.4.tgz#506f8a65cc62d9c2329c5b6747aca0cdf486175c" - integrity sha512-Lkp0ASsldSAf6wSiK7+UHnyKIoutML4IWn1w76WvQtLv6/y0HO3riN5BwzwpPgQ0zDxposhiDMmwbFHzKEVdeg== +babel-preset-liferay-standard@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/babel-preset-liferay-standard/-/babel-preset-liferay-standard-2.23.0.tgz#5457667a8ece0e6002a32787559ca3ff0d3542e0" + integrity sha512-dYdSJlc1dnEzwtWqvB1O2Uu/CBINWABHYsqpQUabnk/adcgwdAk93Gc3Cb2gA0Fi528SL4e54NIzodw2Bitabw== dependencies: - babel-plugin-add-module-metadata "2.19.4" - babel-plugin-alias-modules "2.19.4" + babel-plugin-add-module-metadata "2.23.0" + babel-plugin-alias-modules "2.23.0" babel-plugin-minify-dead-code-elimination "0.5.1" - babel-plugin-name-amd-modules "2.19.4" - babel-plugin-namespace-amd-define "2.19.4" - babel-plugin-namespace-modules "2.19.4" - babel-plugin-normalize-requires "2.19.4" + babel-plugin-name-amd-modules "2.23.0" + babel-plugin-namespace-amd-define "2.23.0" + babel-plugin-namespace-modules "2.23.0" + babel-plugin-normalize-requires "2.23.0" babel-plugin-transform-node-env-inline "0.4.3" - babel-plugin-wrap-modules-amd "2.19.4" + babel-plugin-wrap-modules-amd "2.23.0" babel-register@^6.26.0: version "6.26.0" @@ -9490,104 +9490,104 @@ liferay-lang-key-dev-loader@^1.0.3: loader-utils "^1.1.0" properties "^1.2.1" -liferay-npm-bridge-generator@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bridge-generator/-/liferay-npm-bridge-generator-2.19.4.tgz#b36c69b6d0d9a10cc828243545fbb33814c916d6" - integrity sha512-eJRNMHAqvxW8GoQJOFjf4Y3eCgHcdt3wgs8Jx+XBcIPMoWiME5YVBb7eIXDFSCjcoNd+eWiHTXsE8W8oFBDJuQ== +liferay-npm-bridge-generator@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bridge-generator/-/liferay-npm-bridge-generator-2.23.0.tgz#936ee9e6aa631baa0a7cbb576d95ec9637ba2c6c" + integrity sha512-PDaIKNr1zX7zDLgQsZnS2H1I+RwqOeSXB9DAxpvFCG1GXYUYo5W7OyoL9FEydrNt/jSY2Lu8JivVkrh56eE+8A== dependencies: fs-extra "^8.1.0" globby "^10.0.1" read-json-sync "^2.0.1" yargs "^14.0.0" -liferay-npm-build-tools-common@2.19.4, liferay-npm-build-tools-common@^2.17.1: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-build-tools-common/-/liferay-npm-build-tools-common-2.19.4.tgz#7c017ba3b540d9f3dfd63a4add7995c0160b6285" - integrity sha512-ovOfgJaG34CcAmTQTUx/d0F6RbHsPLwxqRP+sSJuDZ2rDTkkvmgnT9rUUYhpNji60Ca64LtoZDvAP79iziHg1w== +liferay-npm-build-tools-common@2.23.0, liferay-npm-build-tools-common@^2.17.1: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-build-tools-common/-/liferay-npm-build-tools-common-2.23.0.tgz#c5b8ee849de1da23a5eeb5850dcbb74f9678e4f6" + integrity sha512-aqWDPaKKL+YuSfKQdFWSP2J+Dk6nqyZZhWtp2bLEqyVUE5kQIP6mQkJrk5ZG2PnURgYp7GhL0h7B3R2aWpAVIw== dependencies: chalk "^2.4.2" dot-prop "^5.0.1" escape-string-regexp "^2.0.0" - liferay-npm-bundler-preset-standard "2.19.4" + liferay-npm-bundler-preset-standard "2.23.0" merge "^1.2.1" properties "^1.2.1" read-json-sync "^2.0.1" resolve "^1.8.1" -liferay-npm-bundler-loader-css-loader@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-loader-css-loader/-/liferay-npm-bundler-loader-css-loader-2.19.4.tgz#52a3ef2977bf2da5ffa33bf04789224a0f8d0dd5" - integrity sha512-eoN4oF4lPpw88RPLOsuTajQ7ifGMboVqYBCHSRXlkgTdm50IA0OKP/DavfLFv2avs/eFuOQ9brryfjUd8+YbPw== +liferay-npm-bundler-loader-css-loader@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-loader-css-loader/-/liferay-npm-bundler-loader-css-loader-2.23.0.tgz#fa6ce703496cc73c2d581881db693697e7d7fe1d" + integrity sha512-ddVE3/aenEyGmwl8tzD4rD7kaXezbPYzbF4l5xnZz5/OKFqDlEbENaeaN8aZpPu/AtR8E1ocXWB3/NafRZhlCw== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" read-json-sync "^2.0.1" -liferay-npm-bundler-plugin-exclude-imports@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-exclude-imports/-/liferay-npm-bundler-plugin-exclude-imports-2.19.4.tgz#9a4bcc8262d793062b44d19fead6f13c796b1b88" - integrity sha512-B4d1ITwK+DcHM3ptUxXCMFcY5iIDL5BGGm3c8NBcrseqANwUCIm984gB7nwIm5c3/qLe0ygPRXJeBVhrEvfDwQ== +liferay-npm-bundler-plugin-exclude-imports@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-exclude-imports/-/liferay-npm-bundler-plugin-exclude-imports-2.23.0.tgz#6b1824fe6288398eef6a6d603b92d05d826db452" + integrity sha512-S223XpJKw49yqbkLQCFD25VhTtQQ9JOdxOipRuOE2FaHSE6+lRs4n0QO3bpzaTozk+i68fLrkJNRaJPhWUtyoQ== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -liferay-npm-bundler-plugin-inject-imports-dependencies@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-inject-imports-dependencies/-/liferay-npm-bundler-plugin-inject-imports-dependencies-2.19.4.tgz#a84b7a3b29aef875d18c9a12c63e528efe7b327a" - integrity sha512-7VmDI365evhhlEAp+N608ma29HyrrkuF+F9tOs107PDvqBquswQlgg+fRBpTY4SoNeXVhvGrT1OSQdxfYHiBSw== +liferay-npm-bundler-plugin-inject-imports-dependencies@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-inject-imports-dependencies/-/liferay-npm-bundler-plugin-inject-imports-dependencies-2.23.0.tgz#c480113626dfb2557fa0d2b438d5c598a0d37b1c" + integrity sha512-B5NtTWu2bEXtvzGtJM0sDcafTE9Gnp6cJBM8o39++PuMF0TOOcZx/B6xrGB2OofigmOPsBm+dyi+0fpS/Is9rg== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -liferay-npm-bundler-plugin-inject-peer-dependencies@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-inject-peer-dependencies/-/liferay-npm-bundler-plugin-inject-peer-dependencies-2.19.4.tgz#e249f7de7c75ebd412427da00cab1c6477d9f009" - integrity sha512-KBGWj8O+Y0IUaMybRYPJbsZ9Xm4eJVHsShAGZueWtqxkw3U4L44jK01RTnZs9lzn4Q33vueKd+Gtqmd3ybYd6A== +liferay-npm-bundler-plugin-inject-peer-dependencies@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-inject-peer-dependencies/-/liferay-npm-bundler-plugin-inject-peer-dependencies-2.23.0.tgz#3af93aa00fd07b1a5a60300d66e14b2397288f80" + integrity sha512-dp0KbZntVzDtjLwZfgPaZPLNYTYCXr8v6MhG5Fhgwdc957g0DERGi+3ZDVrlL7ENrBJ9RtDi14w2ris1PO7diw== dependencies: globby "^10.0.1" - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" read-json-sync "^2.0.1" resolve "^1.8.1" -liferay-npm-bundler-plugin-namespace-packages@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-namespace-packages/-/liferay-npm-bundler-plugin-namespace-packages-2.19.4.tgz#43a6d97e62b05a63fc08498680463b88b961a218" - integrity sha512-pOwVnGiE/rY28xRoWQr7yqWxCxWqNZUcECTrBoC+TT92ZBn00tOEo42jl/TzYvBgteCsbuIzVVmQTmq2CbTY5w== +liferay-npm-bundler-plugin-namespace-packages@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-namespace-packages/-/liferay-npm-bundler-plugin-namespace-packages-2.23.0.tgz#49fee4fdfe5ba391913048628aadeb259904a55d" + integrity sha512-k9Ze4FwHeyEZ0rQWKIm+Raay5j5ySNElKN9JZXBH4EAs+tYHRtwWxtscPpTVdRevc2lKmi1LbClhprRVHmIRSQ== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -liferay-npm-bundler-plugin-replace-browser-modules@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-replace-browser-modules/-/liferay-npm-bundler-plugin-replace-browser-modules-2.19.4.tgz#aba0c5da58605d3a1ed8c4822650f8f4c847a35b" - integrity sha512-AT5ksA9z3vRI95IRAiNyCW1zcm0izkkC7NWue1ZMy75LjxCdnpC+NI0SYZHSuEk54hJZ/GNrzGVMKmiZDrCnqQ== +liferay-npm-bundler-plugin-replace-browser-modules@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-replace-browser-modules/-/liferay-npm-bundler-plugin-replace-browser-modules-2.23.0.tgz#329742a7ba56e0c52517af7164f368afd84d6a5b" + integrity sha512-ivhzbCJ/TvJ9l1j7yVSiv4k/zy7ruG9mWHNqnLnkea1xhkZho+sFV/kTIL0v7kq83b8+zjSSahaB4vMhSpJ25Q== dependencies: dot-prop "^5.0.1" fs-extra "^8.1.0" - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" -liferay-npm-bundler-plugin-resolve-linked-dependencies@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-resolve-linked-dependencies/-/liferay-npm-bundler-plugin-resolve-linked-dependencies-2.19.4.tgz#39627f972cda87c889fccdb9b2201de2b1dd2123" - integrity sha512-31B3O4FVwhh2wyVYxqrSauWbj4/VH5CNn4fxiRQ4FEbaYXaYollXPh0UPLxLx7YeG/vA1Cky1QDSGEzsX9oVbQ== +liferay-npm-bundler-plugin-resolve-linked-dependencies@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-plugin-resolve-linked-dependencies/-/liferay-npm-bundler-plugin-resolve-linked-dependencies-2.23.0.tgz#f84ac9339b012c5461a80eed484581c19bfe6bd2" + integrity sha512-5n9qY2qLjz4NT7xfbkgWDKXgGHgNK8dDPIZYYU3KLNRDqj/M2R5Yq5kgv/oTCX8qDucz0CreqQnGmZw3lPEeWw== dependencies: - liferay-npm-build-tools-common "2.19.4" + liferay-npm-build-tools-common "2.23.0" read-json-sync "^2.0.1" semver "^6.3.0" -liferay-npm-bundler-preset-standard@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler-preset-standard/-/liferay-npm-bundler-preset-standard-2.19.4.tgz#8760e0eed7a18c1bec0bd82ff930d810f77704fe" - integrity sha512-Z2JnQR3NU67uK73qCtmOJYGb6QMvxtVU6jbSH2/bAsKLnw1Hovj9+KRzUR0S/Tuu8baGTQr+xGdIwcABCmDg9Q== +liferay-npm-bundler-preset-standard@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler-preset-standard/-/liferay-npm-bundler-preset-standard-2.23.0.tgz#b279429ec003d8c32fbd201d4dad1ea92d96d7c4" + integrity sha512-jTI+YwI8KHMznzgatR82HoN1BjFJXpOYGKJ4BqtMBC3j0vfbg9WViWrKlwaeDS8S7j4yvwyNHvCitVr32gC/Ww== dependencies: - babel-preset-liferay-standard "2.19.4" - liferay-npm-bundler-plugin-exclude-imports "2.19.4" - liferay-npm-bundler-plugin-inject-imports-dependencies "2.19.4" - liferay-npm-bundler-plugin-inject-peer-dependencies "2.19.4" - liferay-npm-bundler-plugin-namespace-packages "2.19.4" - liferay-npm-bundler-plugin-replace-browser-modules "2.19.4" - liferay-npm-bundler-plugin-resolve-linked-dependencies "2.19.4" + babel-preset-liferay-standard "2.23.0" + liferay-npm-bundler-plugin-exclude-imports "2.23.0" + liferay-npm-bundler-plugin-inject-imports-dependencies "2.23.0" + liferay-npm-bundler-plugin-inject-peer-dependencies "2.23.0" + liferay-npm-bundler-plugin-namespace-packages "2.23.0" + liferay-npm-bundler-plugin-replace-browser-modules "2.23.0" + liferay-npm-bundler-plugin-resolve-linked-dependencies "2.23.0" -liferay-npm-bundler@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/liferay-npm-bundler/-/liferay-npm-bundler-2.19.4.tgz#b10eba18db6eee16c0b811e85f9312a9ff9bab0e" - integrity sha512-u7+c6jfFJrqQawwNNMUKDVwsiX1y6uio70HrY8KZBGNSscQNOHIcruk02MYmSKL1Sfz+MsChhURyFWdLeQXflQ== +liferay-npm-bundler@2.23.0: + version "2.23.0" + resolved "https://registry.yarnpkg.com/liferay-npm-bundler/-/liferay-npm-bundler-2.23.0.tgz#99d1bb9e707a39b625e8408de3125b463640d59f" + integrity sha512-+zgbJulNLyKjTeiyqiPnQQS4eUpt8MGPdf4yzfbvAiwGbc/Jl4XqCVS96C3wOTM/itPDgGUYaaqZOQSxBaI4cA== dependencies: babel-core "^6.26.3" clone "^2.1.2" @@ -9597,8 +9597,8 @@ liferay-npm-bundler@2.19.4: globby "^10.0.1" insight "0.10.3" jszip "^3.1.5" - liferay-npm-build-tools-common "2.19.4" - liferay-npm-bundler-preset-standard "2.19.4" + liferay-npm-build-tools-common "2.23.0" + liferay-npm-bundler-preset-standard "2.23.0" merge "^1.2.1" pretty-time "^1.1.0" read-json-sync "^2.0.1" @@ -12327,6 +12327,11 @@ qs@^6.4.0, qs@^6.9.4, qs@^6.9.6: resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== +qs@^6.9.6: + version "6.9.6" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" + integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== + qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" diff --git a/portal-web/test/functional/com/liferay/portalweb/dependencies/react-fragment-example.zip/src/collection-name/react-fragment-example/main.js b/portal-web/test/functional/com/liferay/portalweb/dependencies/react-fragment-example.zip/src/collection-name/react-fragment-example/main.js index f4016671bd10f2..5d07d2650d64ec 100644 --- a/portal-web/test/functional/com/liferay/portalweb/dependencies/react-fragment-example.zip/src/collection-name/react-fragment-example/main.js +++ b/portal-web/test/functional/com/liferay/portalweb/dependencies/react-fragment-example.zip/src/collection-name/react-fragment-example/main.js @@ -1,7 +1,7 @@ Liferay.Loader.define('__FRAGMENT_MODULE_NAME__', [ 'module', 'require', - 'frontend-js-react-web$react' + '@liferay!frontend-js-react-web$react' ], function (__MODULE__, __REQUIRE__) { (function (modules) { var installedModules = {};