Merge pull request #1209 from vektor-inc/fix/vk-compo/composer

VK Compo を Composer から取得

Author: kurudrive

.github/workflows/build_check.yml

@@ -1,57 +1,11 @@
-name: Build Check
+name: PHP Unit Test
 
 on:
   pull_request:
     branches:
       - master
       - develop
 jobs:
-  buid_check:
-    name: build test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 20.x
-
-      - run: cp _g2/assets/js/lightning.min.js lightning.min.js.before
-      - run: cp _g2/assets/css/common.css common.css.before
-      - run: cp _g2/assets/css/common_editor.css common_editor.css.before
-      - run: cp _g2/assets/css/wp-embed.css wp-embed.css.before
-
-      - run: cp _g2/library/bootstrap-4/css/bootstrap.css bootstrap4.css.before
-      - run: cp _g2/library/bootstrap-3/css/bootstrap.css bootstrap3.css.before
-
-      - run: cp _g2/design-skin/origin/css/style.css origin.style.css.before
-      - run: cp _g2/design-skin/origin/css/editor.css origin.editor.css.before
-
-      - run: cp _g2/design-skin/origin2/css/style.css origin2.style.css.before
-      - run: cp _g2/design-skin/origin2/css/editor.css origin2.editor.css.before
-
-      - run: cp _g2/plugin-support/woocommerce/css/woo.css woo.css.before
-
-      - run: npm install -D
-
-      # js forget compile check
-      - name: build Javascript
-        run: npm run build:script
-      - run: diff _g2/assets/js/lightning.min.js lightning.min.js.before
-
-      # common css forget compile check
-      - name: build Common StyleSheet
-        run: npx gulp sass
-      - run: diff _g2/assets/css/common.css common.css.before
-      - run: diff _g2/assets/css/common_editor.css common_editor.css.before
-      - run: diff _g2/assets/css/wp-embed.css wp-embed.css.before
-      - run: diff _g2/library/bootstrap-4/css/bootstrap.css bootstrap4.css.before
-      - run: diff _g2/library/bootstrap-3/css/bootstrap.css bootstrap3.css.before
-      - run: diff _g2/design-skin/origin/css/style.css origin.style.css.before
-      - run: diff _g2/design-skin/origin/css/editor.css origin.editor.css.before
-      - run: diff _g2/design-skin/origin2/css/style.css origin2.style.css.before
-      - run: diff _g2/design-skin/origin2/css/editor.css origin2.editor.css.before
-      - run: diff _g2/plugin-support/woocommerce/css/woo.css woo.css.before
-
   php_unit:
     name: php unittest
     runs-on: ubuntu-latest
@@ -84,6 +38,10 @@ jobs:
           php-version: ${{ matrix.php }}
       - name: install npm scripts
         run: npm install
+      - name: install Composer dependencies
+        run: composer install
+      - name: Build
+        run: npm run build
       - name: wp-env start
         run: ./node_modules/@wordpress/env/bin/wp-env start
       - name: install composer

.github/workflows/github_release.yml

@@ -13,6 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 20.x
+    - name: Install NPM Scripts
+      run: npm install
+    - name: install Composer dependencies
+      run: composer install
+    - name: Build
+      run: npm run build
     - run: bash bin/dist
     - run: echo "DIST_VERSION=$(echo ${{ github.ref }} | sed -E 's/^refs\/tags\/v?(.*)$/\1/')" >> $GITHUB_ENV
     - run: test -e dist/${{ env.dist_name }}.zip

_g2/assets/_scss/_vk_compo_overwrite.scss

@@ -1,5 +1,6 @@
 @charset "utf-8";
 @import "../../design-skin/foundation/_scss/variables";
+@import "../../../vendor/vektor-inc/vk-component/src/assets/scss/variables.scss";
 
 // メインセクション直下の投稿リストで1カラムの時だけ文字を大きくする
 .mainSection > .vk_posts,

_g2/assets/_scss/common.scss

@@ -2,7 +2,7 @@
 @import "variables";
 @import "../../inc/vk-mobile-nav/package/_scss/vk-mobile-nav-bright.scss";
 // VK Components is no using image that using sass is no probrem.
-@import "../../inc/vk-components/package/_scss/vk-components.scss";
+@import "../../../vendor/vektor-inc/vk-component/src/assets/scss/vk-components.scss";
 @import "block/block";
 @import "vk_compo_overwrite";
 @import "veu_overwrite";

_g2/assets/_scss/common_editor.scss

@@ -1,6 +1,7 @@
 @charset "utf-8";
 @import "variables";
-@import "../../inc/vk-components/package/_scss/vk-components.scss";
+// VK Components is no using image that using sass is no probrem.
+@import "../../../vendor/vektor-inc/vk-component/src/assets/scss/vk-components.scss";
 @import "block/block";
 @import "block/block_editor";
 @import "block/block_editor_width";

_g2/assets/css/common.css

@@ -155,7 +155,7 @@ function lightning_theme_setup() {
 	/*-------------------------------------------*/
 	require __DIR__ . '/inc/package-manager.php';
 	require __DIR__ . '/inc/term-color/term-color-config.php';
-	require __DIR__ . '/inc/vk-components/vk-components-config.php';
+	require __DIR__ . '/inc/vk-component/config.php';
 	require __DIR__ . '/inc/template-redirect.php';
 	require __DIR__ . '/inc/layout-controller/layout-controller.php';
 	require __DIR__ . '/inc/vk-footer-customize/vk-footer-customize-config.php';

_g2/assets/css/common_editor.css

@@ -0,0 +1,11 @@
+<?php
+/**
+ * VK Component Config
+ */
+use VektorInc\VK_Component\VK_Component_Button;
+use VektorInc\VK_Component\VK_Component_Mini_Contents;
+use VektorInc\VK_Component\VK_Component_Posts;
+
+VK_Component_Button::init();
+VK_Component_Mini_Contents::init();
+VK_Component_Posts::init();