Merge pull request #725 from Automattic/update/js-packages

Update JS packages

.github/workflows/e2e-and-js-tests.yml

@@ -16,12 +16,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
-      - name: Set up NodeJS 14.x
-        uses: actions/setup-node@v2
+      - name: Set up NodeJS 20
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
+          cache: npm
 
       - name: Build Edit Flow
         run: |
@@ -34,7 +35,7 @@ jobs:
       - name: Run Lint JS
         run: npm run lint-js
 
-      - name: Run JS tests (Jest)
+      - name: Run Jest tests
         run: npm run test-jest
 
       - name: Run E2E tests

.github/workflows/php-tests.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: Install wordpress environment
         run: npm -g install @wordpress/env
@@ -39,24 +39,10 @@ jobs:
           php-version: ${{ matrix.php }}
           tools: composer
 
-      - name: Install Composer dependencies (PHP < 8.0 )
-        if: ${{ matrix.php < 8.0 }}
-        uses: ramsey/composer-install@v1
-
-      - name: Install Composer dependencies (PHP >= 8.0)
-        if: ${{ matrix.php >= 8.0 || matrix.php == 'latest' }}
-        uses: ramsey/composer-install@v1
-        with:
-          composer-options: --ignore-platform-reqs
-
-      - name: Cache Composer packages
-        id: composer-cache
-        uses: actions/cache@v2
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v3
         with:
-          path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-php-
+          composer-options: --prefer-dist --no-progress
 
       - name: Setup wp-env
         run: wp-env start

.gitignore

@@ -7,3 +7,4 @@ vendor
 
 # Test files
 .phpunit.result.cache
+artifacts/

.nvmrc

@@ -1 +1 @@
-14
+20

modules/calendar/lib/dist/calendar.react.build.js.LICENSE.txt

@@ -0,0 +1,22 @@
+/*!
+	Copyright (c) 2018 Jed Watson.
+	Licensed under the MIT License (MIT), see
+	http://jedwatson.github.io/classnames
+*/
+
+/**
+ * @license React
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @name match-sorter
+ * @license MIT license.
+ * @copyright (c) 2020 Kent C. Dodds
+ * @author Kent C. Dodds <[email protected]> (https://kentcdodds.com)
+ */

modules/calendar/lib/react/calendar.react.js

@@ -5,7 +5,7 @@
  */
 import { _n, __, sprintf } from '@wordpress/i18n';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 
 /**
  * Internal dependencies
@@ -122,13 +122,14 @@ filters.push( {
 	initialValue: EF_CALENDAR.FILTERS.num_weeks,
 } );
 
-ReactDOM.render(
+const root = createRoot( document.getElementById( 'ef-calendar-navigation-mount' ) );
+
+root.render(
 	<CalendarHeader
 		numberOfWeeks={ EF_CALENDAR.FILTERS.num_weeks }
 		beginningOfWeek={ EF_CALENDAR.BEGINNING_OF_WEEK }
 		pageUrl={ EF_CALENDAR.PAGE_URL }
 		filters={ filters }
 		filterValues={ EF_CALENDAR.FILTERS }
-	/>,
-	document.getElementById( 'ef-calendar-navigation-mount' )
+	/>
 );

modules/calendar/lib/react/combobox/index.js

@@ -6,7 +6,7 @@
 import { BaseControl, Button, IconButton } from '@wordpress/components';
 import classnames from 'classnames';
 import Downshift from 'downshift';
-import matchSorter from 'match-sorter';
+import { matchSorter } from 'match-sorter';
 import PropTypes from 'prop-types';
 import React from 'react';