revert a few changes

10up · Jun 13, 2024 · 074a836 · 074a836
1 parent 8a12324
commit 074a836
Show file tree

Hide file tree

Showing 7 changed files with 324 additions and 4,919 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,42 +1,65 @@
-name: JS Linting
+name: Linting
+
+env:
+  COMPOSER_VERSION: "2"
+  COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
 
 on:
   push:
     branches:
       - develop
       - trunk
-    paths:
-      - '**.js'
   pull_request:
     branches:
       - develop
-    paths:
-      - '**.js'
 
 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@v4
-
-    - name: Setup node and npm cache
-      uses: actions/setup-node@v4
+      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
       with:
-        node-version-file: .nvmrc
-        cache: npm
-
-    - name: Install Node dependencies
-      run: npm ci --omit=optional
-
-    - name: Get updated JS files
-      id: changed-files
-      uses: tj-actions/changed-files@v42
+        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
       with:
-        files: |
-          **/*.js
-
-    - 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 }}
+        php-version: '7.4'
+        coverage: none
+        tools: composer:v2, cs2pr
+    - 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
diff --git a/includes/blocks/block-editor/tabs-item/block.json b/includes/blocks/block-editor/tabs-item/block.json
@@ -9,5 +9,6 @@
     "reusable": false,
     "html": false
   },
-	"parent":[ "tenup/tabs" ]
+	"parent":[ "tenup/tabs" ],
+	"editorScript": "file:../../../../dist/blocks/tabs-item-block.js"
 }
diff --git a/includes/blocks/block-editor/tabs-item/register.php b/includes/blocks/block-editor/tabs-item/register.php
@@ -23,24 +23,6 @@ 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
-	);
 }
 
 /**

diff --git a/includes/blocks/block-editor/tabs/block.json b/includes/blocks/block-editor/tabs/block.json
@@ -49,5 +49,8 @@
   },
   "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"
 }
diff --git a/includes/blocks/block-editor/tabs/register.php b/includes/blocks/block-editor/tabs/register.php
@@ -23,31 +23,6 @@ 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']
-	);
 }
 
 /**