Some fixes

.gitignore

@@ -1,10 +1,9 @@
 .DS_Store
 .sass-cache/
 npm-debug.log
-/node_modules/
+node_modules/
 /resources/assets/
-/vendor/
-packages/
+vendor/
 *.sql
 /bin/*.xml
 release/

.travis.yml

@@ -18,7 +18,7 @@ env:
 cache:
   directories:
   - node_modules
-  - vendor
+  - resources/vendor
   - "$HOME/.composer/cache"
 before_install:
 - openssl aes-256-cbc -K $encrypted_73c066875ca0_key -iv $encrypted_73c066875ca0_iv -in .travis/github_deploy_key.enc -out .travis/github_deploy_key -d
@@ -34,7 +34,7 @@ before_script:
 - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
 script:
 - # yarn run gulp build  # Because Mimizuku builded after composer install
-- ls -la resources/style.css resources/index.php vendor/autoload.php
+- ls -la resources/style.css resources/index.php resources/vendor/autoload.php
 - composer test
 - bash bin/create-release-branch.sh
 after_success:

README.md

@@ -66,6 +66,7 @@ themes/mimizuku
 │  │  ├─ view              # View templates
 │  │  ├─ static            # Static view templates
 │  │  └─ widget            # Templates for WP Awesome Widgets
+│  ├─ vendor               # Composer packages
 │  ├─ style.css            # Theme meta information
 │  ├─ index.php
 │  ├─ functions.php
@@ -75,15 +76,15 @@ themes/mimizuku
 
 ### Template hierarchical
 #### Layout templates
-1. /vendor/inc2734/mimizuku-core/src/view/templates/\*\*/\*.php
+1. /resources/vendor/inc2734/mimizuku-core/src/view/templates/\*\*/\*.php
 2. /resources/templates/\*\*/\*.php
 
 #### Custo page templates
 1. /resources/page-templates/\*.php
 2. /page-templats/\*.php
 
 #### Base templates
-1. /vendor/inc2734/mimizuku-core/src/view/\*.php
+1. /resources/vendor/inc2734/mimizuku-core/src/view/\*.php
 2. /resources/\*.php
 3. /\*.php
 

bin/create-release-branch.sh

@@ -12,7 +12,7 @@ if [[ "master" != "$TRAVIS_BRANCH" ]]; then
   exit
 fi
 
-if [[ "7" != "$TRAVIS_PHP_VERSION" ]]; then
+if [[ "7.1" != "$TRAVIS_PHP_VERSION" ]]; then
 	echo "deploy only PHP 7"
 	exit
 fi
@@ -22,13 +22,13 @@ cd release
 ls | xargs rm -rf
 ls -la
 cd ../
+rm -rf node_modules
 yarn install
-yarn run gulp release
+rm -rf vendor
+composer install --no-dev
+cp -r resources/. release/
 cd release
 ls -la
-yarn install
-composer install --no-dev
-rm -rf composer.json composer.lock package.json yarn.lock gulpfile.js node_modules .editorconfig .gitignore .travis.yml .travis
 sed -i.org -e '/^node_modules/d' vendor/inc2734/wp-basis/.gitignore
 echo node_modules/* >> vendor/inc2734/wp-basis/.gitignore
 echo !node_modules/sass-basis >> vendor/inc2734/wp-basis/.gitignore

bin/phpunit.sh

@@ -10,7 +10,7 @@ if [ -e /tmp/wordpress-tests-lib ]; then
   fi
 
   cd ${themedir};
-  vendor/bin/phpunit --configuration= ${themedir}/phpunit.xml
+  resources/vendor/bin/phpunit --configuration= ${themedir}/phpunit.xml
   exit 0
 fi
 

bin/wpphpunit.sh

@@ -23,7 +23,7 @@ if [ -e ${themedir}/bin/install-wp-tests.sh ]; then
   fi
 
   bash "${themedir}/bin/install-wp-tests.sh" wordpress_test root '' localhost latest;
-  vendor/bin/phpunit --configuration= ${themedir}/phpunit.xml
+  resources/vendor/bin/phpunit --configuration= ${themedir}/phpunit.xml
 else
   echo "${themedir}/bin/install-wp-tests.sh not found."
 fi;

codesniffer.ruleset.xml

@@ -22,7 +22,7 @@
 
   <file>./resources</file>
   <exclude-pattern>*/resources/assets/*</exclude-pattern>
-  <exclude-pattern>*/vendor/*</exclude-pattern>
+  <exclude-pattern>*/resources/vendor/*</exclude-pattern>
   <exclude-pattern>*/tests/*</exclude-pattern>
   <exclude-pattern>*/release/*</exclude-pattern>
 </ruleset>

composer.json

@@ -3,7 +3,7 @@
   "description": "Mimizuku is a WordPress starter theme or theme framework for child themes development.",
   "type": "wordpress-theme",
   "license": "GPL-2.0+",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "authors": [
     {
       "name": "Takashi Kitajima",
@@ -22,16 +22,17 @@
   },
   "require": {
     "php": ">=5.6",
-    "inc2734/mimizuku-core": ">=0.5.2"
+    "inc2734/mimizuku-core": ">=0.6.0"
   },
   "config": {
-    "process-timeout": 0
+    "process-timeout": 0,
+    "vendor-dir": "resources/vendor"
   },
   "scripts" :{
     "test": [
-      "vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs",
-      "vendor/bin/phpcs -p -s -v -n . --standard=./codesniffer.ruleset.xml --extensions=php",
-      "vendor/bin/phpmd ./ text phpmd.ruleset.xml --suffixes php --exclude /vendor/,/tests/",
+      "resources/vendor/bin/phpcs --config-set installed_paths resources/vendor/wp-coding-standards/wpcs",
+      "resources/vendor/bin/phpcs -p -s -v -n . --standard=./codesniffer.ruleset.xml --extensions=php",
+      "resources/vendor/bin/phpmd ./ text phpmd.ruleset.xml --suffixes php --exclude /resources/vendor/,/tests/",
       "bash bin/phpunit.sh"
     ],
     "server": "bash bin/server.sh",
@@ -41,7 +42,7 @@
     "wpphpunit": "bash bin/wpphpunit.sh",
     "phpunit": "bash bin/phpunit.sh",
     "post-install-cmd": [
-      "cd vendor/inc2734/wp-basis && yarn install && yarn upgrade && cd ../../../ && yarn run gulp build"
+      "cd resources/vendor/inc2734/wp-basis && yarn install && yarn upgrade && cd ../../../../ && yarn run gulp build"
     ],
     "post-update-cmd": [
       "composer run post-install-cmd"

gulpfile.js

@@ -155,35 +155,6 @@ gulp.task('browsersync', function() {
   });
 });
 
-/**
- * Creates directory for release branch.
- * Copy needed source files and build on Travis CI.
- */
-gulp.task('release', function(){
-  return gulp.src(
-      [
-        '**',
-        '!README.md',
-        '!tests',
-        '!tests/**',
-        '!node_modules',
-        '!node_modules/**',
-        '!vendor',
-        '!vendor/**',
-        '!bin',
-        '!bin/**',
-        '!release',
-        '!release/**',
-        '!codesniffer.ruleset.xml',
-        '!phpmd.ruleset.xml',
-        '!phpunit.xml',
-        '!mimizuku.zip'
-      ],
-      {base: './'}
-    )
-    .pipe(gulp.dest('release'));
-});
-
 /**
  * Creates the zip file
  * This command must be build beforehand on Travis CI !!

resources/app/setup/nav-menus.php

@@ -18,7 +18,7 @@
 	register_nav_menus( [
 		'global-nav' => esc_html__( 'Global Navigation (For PC)', 'mimizuku' ),
 		'drawer-nav' => esc_html__( 'Drawer Navigation (For Mobile)', 'mimizuku' ),
-		'social-nav' => esc_html__( 'Social Navigation', 'snow-monkey' ),
+		'social-nav' => esc_html__( 'Social Navigation', 'mimizuku' ),
 	] );
 } );
 

resources/functions.php

@@ -10,7 +10,7 @@
 /**
 * Uses composer autoloader
 */
-require_once( get_theme_file_path( '/../vendor/autoload.php' ) );
+require_once( get_theme_file_path( '/vendor/autoload.php' ) );
 
 /**
  * Make theme available for translation