Merge pull request #186 from 10up/dependabot/npm_and_yarn/npm_and_yar…

…n-security-group-3b83d95909

Bump the npm_and_yarn group across 1 directory with 6 updates

.github/workflows/cypress.yml

@@ -37,20 +37,14 @@ jobs:
       run: ls -R
       working-directory: ${{ github.event.repository.name }}
 
-    - name: Cache node_modules
-      id: cache-node-modules
-      uses: actions/cache@v3
-      env:
-        cache-name: cache-node-modules
+    - name: Setup node and npm cache
+      uses: actions/setup-node@v4
       with:
-        path: |
-          node_modules
-          ~/.cache
-          ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+        node-version-file: .nvmrc
+        cache: npm
 
-    - name: Install dependencies
-      run: npm install
+    - name: Install Node dependencies
+      run: npm ci --no-optional
 
     - name: Set the core version and plugins config 
       run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }}

.github/workflows/lint.yml

@@ -1,9 +1,5 @@
 name: Linting
 
-env:
-  COMPOSER_VERSION: "2"
-  COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
-
 on:
   push:
     branches:
@@ -17,49 +13,35 @@ jobs:
   eslint:
     name: eslint
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v3
-    - name: install node v12
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
-    - name: npm install
-      run: npm install
-    - name: eslint
-      uses: icrawl/action-eslint@v1
-      with:
-        custom-glob: assets
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  phpcs:
-    name: phpcs
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set standard 10up cache directories
-      run: |
-        composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
-    - name: Prepare composer cache
-      uses: actions/cache@v2
+    - uses: actions/checkout@v4
+
+    - name: Setup node and npm cache
+      uses: actions/setup-node@v4
       with:
-        path: ${{ env.COMPOSER_CACHE }}
-        key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          composer-${{ env.COMPOSER_VERSION }}-
-    - name: Set PHP version
-      uses: shivammathur/setup-php@v2
+        node-version-file: .nvmrc
+        cache: npm
+
+    - name: Install Node dependencies
+      run: npm ci --no-optional
+
+    - name: Get updated JS files
+      id: changed-files
+      uses: tj-actions/changed-files@v42
       with:
-        php-version: '7.4'
-        coverage: none
-        tools: composer:v2, cs2pr
+        files: |
+          **/*.js
+
     - name: composer install
       run: composer install --ignore-platform-reqs
     - name: Check PHPCS standard
       run: ./vendor/bin/phpcs -i
+
     - name: PHPCS check
       id: phpcs
       run: ./vendor/bin/phpcs . --runtime-set testVersion 7.4- --report-checkstyle=${RUNNER_TEMP}/phpcs-report.xml
-    - name: Show PHPCS results in PR
-      if: ${{ always() && steps.phpcs.outcome == 'failure' }}
-      run: cs2pr --graceful-warnings ${RUNNER_TEMP}/phpcs-report.xml
+
+    - name: Run JS linting
+      if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+      run: ./node_modules/.bin/10up-toolkit lint-js ${{ steps.changed-files.outputs.all_changed_files }}

.nvmrc

@@ -0,0 +1 @@
+v14.21.1

includes/blocks/block-editor/tabs-item/block.json

@@ -9,6 +9,5 @@
     "reusable": false,
     "html": false
   },
-	"parent":[ "tenup/tabs" ],
-	"editorScript": "file:../../../../dist/blocks/tabs-item-block/editor.js"
+	"parent":[ "tenup/tabs" ]
 }

includes/blocks/block-editor/tabs-item/register.php

@@ -23,6 +23,24 @@ function register() {
 			]
 		);
 	}
+
+	// Enqueue assets.
+	add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
+}
+
+/**
+ * Enqueue block assets.
+ */
+function enqueue_block_assets() {
+	$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-item-block.asset.php';
+
+	wp_enqueue_script(
+		'publisher-media-kit-tabs-item-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-item-block.js',
+		$asset_file['dependencies'],
+		$asset_file['version'],
+		true
+	);
 }
 
 /**

includes/blocks/block-editor/tabs/block.json

@@ -49,8 +49,5 @@
   },
   "supports": {
     "html": false
-  },
-	"editorScript": "file:../../../../dist/blocks/tabs-block/editor.js",
-	"editorStyle": "file:../../../../dist/blocks/tabs-block/editor.css",
-	"style": "file:../../../../dist/blocks/tabs-block/editor.css"
+  }
 }

includes/blocks/block-editor/tabs/register.php

@@ -23,6 +23,31 @@ function register() {
 			]
 		);
 	}
+
+	// Enqueue assets.
+	add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
+}
+
+/**
+ * Enqueue block assets.
+ */
+function enqueue_block_assets() {
+	$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-block.asset.php';
+
+	wp_enqueue_script(
+		'publisher-media-kit-tabs-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.js',
+		$asset_file['dependencies'],
+		$asset_file['version'],
+		true
+	);
+
+	wp_enqueue_style(
+		'publisher-media-kit-tabs-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.css',
+		[],
+		$asset_file['version']
+	);
 }
 
 /**