Merge branch 'release/v1.0.1'

Author: renestalder

.editorconfig

@@ -5,7 +5,19 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
 indent_size = 2
+trim_trailing_whitespace = true
+
+[*.php]
+indent_size = 4
+
+[Makefile]
+indent_size = 4
+indent_style = tab
+
+[.htaccess]
+indent_size = 4

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.0.1 - 2015-09-23
+### Fixed
+- The JavaScript Minification in build mode works now correctly.
+- A bug in the watcher task was removed.
+
+### Changes
+- The default output theme folder will be named after package.json of your project instead of the npm package.
+
 ## v1.0.0 - 2015-07-03
 ### Added
 - **npm support**: gulp-wp-theme is now useable via npm. This makes it easier to

Makefile

@@ -11,3 +11,12 @@ build:
 
 compile:
 	@node_modules/gulp/bin/gulp.js
+
+wordpress:
+	@cd dist && rm -rf wp-{a*,b*,com*,cont*,cr*,config-s*,i*,l*,m*,s*,t*} xmlrpc.php in* lic* lie* rea* wor*
+	@curl https://wordpress.org/latest.zip -o dist/wordpress.zip
+	@cd dist && unzip wordpress.zip
+	@cd dist && rm ./wordpress/wp-config-sample.php
+	@cd dist && cp -Rfn ./wordpress/* .
+	@if [ ! -a dist/local-config.php ]; then php dist/local-config-generator.php; fi;
+	@cd dist && rm -rf wordpress readme.html liesmich.html license.txt wordpress.zip wp-content/themes/twenty*

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-wp-theme",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "WordPress Theme Project Templates for Gulp ",
   "authors": [
     "René Stalder <[email protected]>"

dist/local-config-generator.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * local-config.php Generator
+ */
+
+if (php_sapi_name() !== 'cli') {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
+if (file_exists(__DIR__ . '/local-config.php')) {
+    die('local-config.php already exists.');
+}
+
+$contents = [];
+
+$contents[] = '<?php';
+$contents[] = '';
+$contents[] = 'define(\'DB_NAME\',     \'gulp-wp-theme\');';
+$contents[] = 'define(\'DB_USER\',     \'root\');';
+$contents[] = 'define(\'DB_PASSWORD\', \'\');';
+$contents[] = 'define(\'DB_HOST\',     \'localhost\');';
+$contents[] = '';
+$contents[] = '$table_prefix =       \'wp_\';';
+$contents[] = '';
+$contents[] = 'define(\'WP_DEBUG\',    false);';
+$contents[] = '';
+$contents[] = file_get_contents('https://api.wordpress.org/secret-key/1.1/salt/');
+
+file_put_contents(__DIR__ . '/local-config.php', implode(PHP_EOL, $contents));
+
+echo PHP_EOL . 'please insert your database details in dist/local-config.php' . PHP_EOL;

dist/wp-config.php

@@ -0,0 +1,108 @@
+<?php
+/**
+ * The base configuration for WordPress
+ *
+ * The wp-config.php creation script uses this file during the
+ * installation. You don't have to use the web site, you can
+ * copy this file to "wp-config.php" and fill in the values.
+ *
+ * This file contains the following configurations:
+ *
+ * * MySQL settings
+ * * Secret keys
+ * * Database table prefix
+ * * ABSPATH
+ *
+ * @link https://codex.wordpress.org/Editing_wp-config.php
+ *
+ * @package WordPress
+ */
+
+if (file_exists(dirname(__FILE__) . '/local-config.php'))
+    require(dirname(__FILE__) . '/local-config.php');
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+if ( !defined('DB_NAME') )
+    define('DB_NAME', 'database_name_here');
+
+/** MySQL database username */
+if ( !defined('DB_USER') )
+    define('DB_USER', 'username_here');
+
+/** MySQL database password */
+if ( !defined('DB_PASSWORD') )
+    define('DB_PASSWORD', 'password_here');
+
+/** MySQL hostname */
+if ( !defined('DB_HOST') )
+    define('DB_HOST', 'localhost');
+
+/** Database Charset to use in creating database tables. */
+if ( !defined('DB_CHARSET') )
+    define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+if ( !defined('DB_COLLATE') )
+    define('DB_COLLATE', '');
+
+/**#@+
+ * Authentication Unique Keys and Salts.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+if ( !defined('AUTH_KEY') )
+    define('AUTH_KEY',         'put your unique phrase here');
+if ( !defined('SECURE_AUTH_KEY') )
+    define('SECURE_AUTH_KEY',  'put your unique phrase here');
+if ( !defined('LOGGED_IN_KEY') )
+    define('LOGGED_IN_KEY',    'put your unique phrase here');
+if ( !defined('NONCE_KEY') )
+    define('NONCE_KEY',        'put your unique phrase here');
+if ( !defined('AUTH_SALT') )
+    define('AUTH_SALT',        'put your unique phrase here');
+if ( !defined('SECURE_AUTH_SALT') )
+    define('SECURE_AUTH_SALT', 'put your unique phrase here');
+if ( !defined('LOGGED_IN_SALT') )
+    define('LOGGED_IN_SALT',   'put your unique phrase here');
+if ( !defined('NONCE_SALT') )
+    define('NONCE_SALT',       'put your unique phrase here');
+
+/**#@-*/
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each
+ * a unique prefix. Only numbers, letters, and underscores please!
+ */
+if (!isset($table_prefix))
+    $table_prefix  = 'wp_';
+
+/**
+ * For developers: WordPress debugging mode.
+ *
+ * Change this to true to enable the display of notices during development.
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG
+ * in their development environments.
+ *
+ * For information on other constants that can be used for debugging,
+ * visit the Codex.
+ *
+ * @link https://codex.wordpress.org/Debugging_in_WordPress
+ */
+if ( !defined('WP_DEBUG') )
+    define('WP_DEBUG', false);
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+    define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');

gulp/config-development.js

@@ -1,5 +1,5 @@
 var fs           = require('fs');
-var packageConfig = require('../package.json');
+var packageConfig = require(process.env.PWD + '/package.json');
 
 var dest = './dist/wp-content/themes/' + packageConfig.name;
 var src = './src';

gulp/config-production.js

@@ -1,6 +1,6 @@
 var fs   = require('fs');
 var gutil = require('gulp-util');
-var packageConfig = require('../package.json');
+var packageConfig = require(process.env.PWD + '/package.json');
 
 var dest = './dist/wp-content/themes/' + packageConfig.name;
 var src = './src';

gulp/tasks/browserify.js

@@ -60,9 +60,11 @@ module.exports = function(gulp, config){
       b.transform(debowerify);
 
       if(config.browserify.transforms && config.browserify.transforms.uglifyify){
-        b.transform({
-          global: true
-        }, 'uglifyify');
+        if(!bundleConfig.transforms){
+          bundleConfig.transforms = [];
+        }
+
+        bundleConfig.transforms.push([ 'uglifyify', { global: true } ]);
       }
 
       var bundle = function() {

gulp/tasks/watchify.js

@@ -1,7 +1,7 @@
 'use strict';
-var browserifyTask = require('./browserify');
 
-module.exports = function(gulp){
+module.exports = function(gulp, config){
+  var browserifyTask = require('./browserify')(gulp, config);
   gulp.task('watchify', function(callback) {
     // Start browserify task with devMode === true
     browserifyTask(callback, true);