chore(git): git rebase origin/update-node-js

mattgoud · Sep 27, 2024 · a1746e4 · a1746e4
1 parent 45b7389
commit a1746e4
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 25 deletions.
diff --git a/...components/grid/extension/action/bulk/category/delete-categories-bulk-action-extension.ts b/...components/grid/extension/action/bulk/category/delete-categories-bulk-action-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/.../components/grid/extension/action/bulk/customer/delete-customers-bulk-action-extension.ts b/.../components/grid/extension/action/bulk/customer/delete-customers-bulk-action-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/.../js/components/grid/extension/action/row/category/delete-category-row-action-extension.ts b/.../js/components/grid/extension/action/row/category/delete-category-row-action-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/.../js/components/grid/extension/action/row/customer/delete-customer-row-action-extension.ts b/.../js/components/grid/extension/action/row/customer/delete-customer-row-action-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/...components/grid/extension/action/row/image_type/delete-image-type-row-action-extension.ts b/...components/grid/extension/action/row/image_type/delete-image-type-row-action-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/...v/themes/new-theme/js/components/grid/extension/action/row/submit-row-action-extension.ts b/...v/themes/new-theme/js/components/grid/extension/action/row/submit-row-action-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 import {ConfirmModal} from '@components/modal';

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/ajax-bulk-action-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/ajax-bulk-action-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import ProgressModal from '@components/modal/progress-modal';
 import ConfirmModal from '@components/modal/confirm-modal';
 import GridMap from '@components/grid/grid-map';

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-open-tabs-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-open-tabs-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 import Router from '../../router';
 

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/choice-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/choice-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/column-toggling-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/column-toggling-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/...emes/new-theme/js/components/grid/extension/column/catalog/category-position-extension.ts b/...emes/new-theme/js/components/grid/extension/column/catalog/category-position-extension.ts
@@ -24,7 +24,7 @@
  */
 
 import 'tablednd/dist/jquery.tablednd.min';
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/...mes/new-theme/js/components/grid/extension/column/common/async-toggle-column-extension.ts b/...mes/new-theme/js/components/grid/extension/column/common/async-toggle-column-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/export-to-sql-manager-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/export-to-sql-manager-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/filters-reset-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/filters-reset-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import resetSearch from '@app/utils/reset_search';
 import GridMap from '@components/grid/grid-map';
 

diff --git a/.../themes/new-theme/js/components/grid/extension/filters-submit-button-enabler-extension.ts b/.../themes/new-theme/js/components/grid/extension/filters-submit-button-enabler-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 /**

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/link-row-action-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/link-row-action-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 import {isUndefined} from '@js/@types/typeguard';
 

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/modal-form-submit-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/modal-form-submit-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 import {isUndefined} from '@js/@types/typeguard';
 import 'tablednd/dist/jquery.tablednd.min';

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/preview-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/preview-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/reload-list-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/reload-list-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 /**

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/sorting-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/sorting-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import TableSorting from '@app/utils/table-sorting';
 import GridMap from '@components/grid/grid-map';
 

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/submit-bulk-action-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/submit-bulk-action-extension.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import ConfirmModal from '@components/modal';
 import GridMap from '@components/grid/grid-map';
 

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/submit-grid-action-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/submit-grid-action-extension.ts
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-import {Grid} from 'js/@types/grid';
+import {Grid} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$} = window;

diff --git a/admin-dev/themes/new-theme/js/components/grid/grid.ts b/admin-dev/themes/new-theme/js/components/grid/grid.ts
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-import {GridExtension} from 'js/@types/grid';
+import {GridExtension} from '@js/@types/grid';
 import GridMap from '@components/grid/grid-map';
 
 const {$}: Window = window;