From f8e8fbc9e3e88adaf08d972b6ae360dde4db68dd Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:19:48 +0530 Subject: [PATCH 01/12] fix workflow --- .github/workflows/lint-check-spa.yml | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-check-spa.yml b/.github/workflows/lint-check-spa.yml index 8c8470e4f..56075d054 100644 --- a/.github/workflows/lint-check-spa.yml +++ b/.github/workflows/lint-check-spa.yml @@ -45,7 +45,7 @@ jobs: # Installs @wordpress/scripts for lint checks if it does not exist in the cache. - name: Install dependencies - run: npm i @wordpress/scripts @newfold-labs/js-utility-ui-analytics + run: npm i @wordpress/scripts@26.10.0 @newfold-labs/js-utility-ui-analytics --legacy-peer-deps if: steps.cache.outputs.cache-hit != 'true' # Gets the files changed wrt to trunk and filters out the js files. diff --git a/src/constants.js b/src/constants.js index edd706f3d..2bb33977b 100644 --- a/src/constants.js +++ b/src/constants.js @@ -71,7 +71,7 @@ export const DRAWER_VIEWS = [ VIEW_DESIGN_THEMES, VIEW_DESIGN_THEME_STYLES_MENU, VIEW_DESIGN_THEME_STYLES_PREVIEW, - VIEW_DESIGN_COLORS, + VIEW_DESIGN_COLORS, VIEW_DESIGN_TYPOGRAPHY, VIEW_DESIGN_HEADER_MENU, ]; From 8f8adc9cf344be1cc60a727a6ae56616b169c2df Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:30:00 +0530 Subject: [PATCH 02/12] test php workflow exclude --- .github/workflows/lint-check-php.yml | 2 +- build/1.10.1/onboarding.asset.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml index bb5452e46..3ec6fa779 100644 --- a/.github/workflows/lint-check-php.yml +++ b/.github/workflows/lint-check-php.yml @@ -3,7 +3,7 @@ on: push: paths: - '**.php' - - '!build/**' + - '!build/**/*.php' pull_request: types: [opened, edited, reopened, ready_for_review] paths: diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index dca3fae1d..f8c4ce7e2 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1,2 @@ array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + From 67bc26d6a6a236b803ad26ad855e10c65fc2a7e4 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:31:12 +0530 Subject: [PATCH 03/12] testing exclude --- bootstrap.php | 2 +- build/1.10.1/onboarding.asset.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 35db4cfc4..4b5ed926e 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,7 +16,7 @@ function nfd_wp_module_onboarding_register() { // wp-module-onboarding register( array( - 'name' => 'onboarding', + 'name' => 'onboardings', 'label' => __( 'Onboarding', 'wp-module-onboarding' ), 'callback' => function ( Container $container ) { diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index f8c4ce7e2..8785d09b7 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1,2 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); - + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); From 50b7fdb1214a2cd84831d6d79369b3d0e64225be Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:35:54 +0530 Subject: [PATCH 04/12] testing 3 --- .github/workflows/lint-check-php.yml | 4 +++- bootstrap.php | 2 +- build/1.10.1/onboarding.asset.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml index 3ec6fa779..9e7e9cd80 100644 --- a/.github/workflows/lint-check-php.yml +++ b/.github/workflows/lint-check-php.yml @@ -33,7 +33,9 @@ jobs: - uses: technote-space/get-diff-action@v6 with: - SUFFIX_FILTER: .php + PATTERNS: | + **.php + !build/**/*.php - name: Get Composer cache directory id: composer-cache diff --git a/bootstrap.php b/bootstrap.php index 4b5ed926e..d99e75fc3 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,7 +16,7 @@ function nfd_wp_module_onboarding_register() { // wp-module-onboarding register( array( - 'name' => 'onboardings', + 'name' => 'onboardingss', 'label' => __( 'Onboarding', 'wp-module-onboarding' ), 'callback' => function ( Container $container ) { diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index 8785d09b7..ed36325dd 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); From 6d1ca996b4e97c78262a6da827f3c1d28b86b003 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:37:13 +0530 Subject: [PATCH 05/12] testing 4 --- bootstrap.php | 2 +- build/1.10.1/onboarding.asset.php | 2 +- includes/RestApi/Themes/ThemeFontsController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index d99e75fc3..35db4cfc4 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,7 +16,7 @@ function nfd_wp_module_onboarding_register() { // wp-module-onboarding register( array( - 'name' => 'onboardingss', + 'name' => 'onboarding', 'label' => __( 'Onboarding', 'wp-module-onboarding' ), 'callback' => function ( Container $container ) { diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index ed36325dd..1e34d2b7b 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 354f9faf5..66a22f975 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's route. + * The namespace of this controller's routesss. * * @var string */ From aeb98227b5f2314864a1ca36d3c76c898d25e943 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:39:02 +0530 Subject: [PATCH 06/12] testing 5 --- .github/workflows/lint-check-php.yml | 2 +- build/1.10.1/onboarding.asset.php | 2 +- includes/RestApi/Themes/ThemeFontsController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml index 9e7e9cd80..f87c2e88f 100644 --- a/.github/workflows/lint-check-php.yml +++ b/.github/workflows/lint-check-php.yml @@ -33,8 +33,8 @@ jobs: - uses: technote-space/get-diff-action@v6 with: + SUFFIX_FILTER: .php PATTERNS: | - **.php !build/**/*.php - name: Get Composer cache directory diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index 1e34d2b7b..a247a85da 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 66a22f975..105446344 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's routesss. + * The namespace of this controller's routessss. * * @var string */ From c171d285e6f3bc51ef0fb370c51cdac0a46c6925 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:40:40 +0530 Subject: [PATCH 07/12] testing 6 --- .github/workflows/lint-check-php.yml | 4 ++-- build/1.10.1/onboarding.asset.php | 2 +- includes/RestApi/Themes/ThemeFontsController.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml index f87c2e88f..b3b4c3a11 100644 --- a/.github/workflows/lint-check-php.yml +++ b/.github/workflows/lint-check-php.yml @@ -33,9 +33,9 @@ jobs: - uses: technote-space/get-diff-action@v6 with: - SUFFIX_FILTER: .php PATTERNS: | - !build/**/*.php + **/*.php + !src/exclude.ts - name: Get Composer cache directory id: composer-cache diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index a247a85da..e74b72036 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 105446344..5ab044b11 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's routessss. + * The namespace of this controller's routesssss. * * @var string */ From 25f125b8f087059b11cf5d814740546b5426f1cb Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:41:51 +0530 Subject: [PATCH 08/12] testing 7 --- .github/workflows/lint-check-php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-check-php.yml b/.github/workflows/lint-check-php.yml index b3b4c3a11..ab539d60a 100644 --- a/.github/workflows/lint-check-php.yml +++ b/.github/workflows/lint-check-php.yml @@ -35,7 +35,7 @@ jobs: with: PATTERNS: | **/*.php - !src/exclude.ts + !build/**/*.php - name: Get Composer cache directory id: composer-cache From 76c1b409c234b2415570b7203235569dae461776 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:42:28 +0530 Subject: [PATCH 09/12] testing 7 --- build/1.10.1/onboarding.asset.php | 2 +- includes/RestApi/Themes/ThemeFontsController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index e74b72036..af37c7c82 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 5ab044b11..3b4064b0e 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's routesssss. + * The namespace of this controller's routessssss. * * @var string */ From 50e1ed324228d43233ddd8a27c8a38aa1e057095 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:43:56 +0530 Subject: [PATCH 10/12] testing 8 --- bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 35db4cfc4..4b5ed926e 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,7 +16,7 @@ function nfd_wp_module_onboarding_register() { // wp-module-onboarding register( array( - 'name' => 'onboarding', + 'name' => 'onboardings', 'label' => __( 'Onboarding', 'wp-module-onboarding' ), 'callback' => function ( Container $container ) { From 56473b249c30b6987f511ab4b4a3c8678c0651bf Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:44:55 +0530 Subject: [PATCH 11/12] revert changes --- bootstrap.php | 2 +- build/1.10.1/onboarding.asset.php | 2 +- includes/RestApi/Themes/ThemeFontsController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 4b5ed926e..35db4cfc4 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,7 +16,7 @@ function nfd_wp_module_onboarding_register() { // wp-module-onboarding register( array( - 'name' => 'onboardings', + 'name' => 'onboarding', 'label' => __( 'Onboarding', 'wp-module-onboarding' ), 'callback' => function ( Container $container ) { diff --git a/build/1.10.1/onboarding.asset.php b/build/1.10.1/onboarding.asset.php index af37c7c82..dca3fae1d 100644 --- a/build/1.10.1/onboarding.asset.php +++ b/build/1.10.1/onboarding.asset.php @@ -1 +1 @@ - array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); + array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-style-engine', 'wp-url'), 'version' => '6583cfc7f1a122c50f8a'); diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 3b4064b0e..1b667b454 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's routessssss. + * The namespace of this controller's routes. * * @var string */ From 82d8332f9e9bda9cfa2626d0ada5806994b7bbe6 Mon Sep 17 00:00:00 2001 From: arunshenoy99 Date: Thu, 24 Aug 2023 14:46:30 +0530 Subject: [PATCH 12/12] revert some more --- includes/RestApi/Themes/ThemeFontsController.php | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/RestApi/Themes/ThemeFontsController.php b/includes/RestApi/Themes/ThemeFontsController.php index 1b667b454..354f9faf5 100644 --- a/includes/RestApi/Themes/ThemeFontsController.php +++ b/includes/RestApi/Themes/ThemeFontsController.php @@ -12,7 +12,7 @@ class ThemeFontsController extends \WP_REST_Controller { /** - * The namespace of this controller's routes. + * The namespace of this controller's route. * * @var string */ diff --git a/src/constants.js b/src/constants.js index 2bb33977b..edd706f3d 100644 --- a/src/constants.js +++ b/src/constants.js @@ -71,7 +71,7 @@ export const DRAWER_VIEWS = [ VIEW_DESIGN_THEMES, VIEW_DESIGN_THEME_STYLES_MENU, VIEW_DESIGN_THEME_STYLES_PREVIEW, - VIEW_DESIGN_COLORS, + VIEW_DESIGN_COLORS, VIEW_DESIGN_TYPOGRAPHY, VIEW_DESIGN_HEADER_MENU, ];