wp-advads 1.0.16 → 1.0.18

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "wp-advads",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Create a Advanced Ads wordPress plugin eco system.",
   "author": {
     "name": "Shakeeb Ahmed",

package/src/app.js

@@ -49,6 +49,10 @@ async function app() {
     if ( 'make:release' === command ) {
         commands.release(args)
     }
+
+    if ( 'patch' === command ) {
+        commands.patch(args)
+    }
 }
 
 app()

package/src/commands/index.js

@@ -1,5 +1,6 @@
 export { default as backup } from './backup/index.js'
 export { default as makeFile } from './file/index.js'
 export { default as help } from './help/index.js'
+export { default as patch } from './patch/index.js'
 export { default as release } from './release/index.js'
 export { default as setupPlugin } from './setup/index.js'

package/src/commands/patch/index.js

@@ -0,0 +1,83 @@
+/**
+ * External Dependencies
+ */
+import fs from 'fs'
+import logSymbols from 'log-symbols'
+import { waterfall } from 'async'
+
+/**
+ * Internal Dependencies
+ */
+import { heading, getCacheStore, msgSuccessOnSameLine, msgErrorTitle, msgSuccessTitle, onSameLine, SemVer } from "../../utilities/index.js"
+
+let pluginVersion = false
+
+/**
+ * Get version from readme.txt file
+ */
+function getVersion(next) {
+    heading( 'Parsing readme.txt for version' )
+
+    fs.readFile('./readme.txt', (err, buffer) => {
+        if ( null !== err ) {
+            onSameLine(`${logSymbols.error} Failed to get Readme file`)
+            return next(true)
+        }
+
+        const content = buffer.toString()
+        let regex = new RegExp('^(?<prefix>Stable tag:\\h*)(?<version>(.*))$', 'mi')
+        regex = regex.exec(content)
+        if (null !== regex) {
+            regex = regex.groups
+            pluginVersion = regex.version.trim()
+            msgSuccessOnSameLine('Version found: ' + pluginVersion)
+        }
+
+        next()
+    })
+}
+
+function updateVersion(next, args) {
+    const cache = getCacheStore()
+    const answers = cache.getKey('answers')
+    const semver = new SemVer(pluginVersion)
+    const increment = {
+        major: false,
+        minor: false,
+        patch: false,
+        ...args
+    }
+
+    let strIncrement = 'patch'
+    if ( increment.major ) {
+        strIncrement = 'major'
+    } else if ( increment.minor ) {
+        strIncrement = 'minor'
+    }
+
+    answers.wp.version = semver.inc(strIncrement)
+    cache.setKey( 'answers', answers )
+    cache.save()
+    next()
+}
+
+export default function(args) {
+    heading('Incrementing Version...')
+    console.log('');
+
+    waterfall(
+        [
+           getVersion,
+           (next) => updateVersion(next, args)
+        ],
+        ( err, results ) => {
+            console.log('');
+			if (err) {
+				msgErrorTitle('We failed!!!')
+				return
+			}
+
+            msgSuccessTitle('All done!')
+        }
+    )
+}

package/src/commands/setup/create-plugin.js

@@ -35,7 +35,7 @@ function setPluginData(next) {
 		// Root
 		pluginData.folder,
 		pluginData.folder + '/languages',
-		pluginData.folder + '/templates',
+		pluginData.folder + '/views',
 
 		// Assets
 		pluginData.folder + '/assets/css',
@@ -43,7 +43,6 @@ function setPluginData(next) {
 		pluginData.folder + '/assets/js',
 		pluginData.folder + '/assets/src',
 		pluginData.folder + '/assets/img',
-		pluginData.folder + '/assets/acf',
 
 		// Includes
 		pluginData.folder + '/includes',
@@ -93,21 +92,33 @@ function prepareConfigFiles(next) {
 		'/.editorconfig',
 		'/.eslintignore',
 		'/.eslintrc.js',
-		'/.gitattributes',
-		'/.gitignore',
+		'/gitattributes',
+		'/gitignore',
 		'/.phpcs.xml.dist',
 		'/.prettierignore',
 		'/.prettierrc.js',
 		'/.stylelintrc',
 		'/composer.json',
 		'/package.json',
+		'/postcss.config.js',
+		'/tailwind.config.js',
 		'/webpack.mix.js',
+		'/webpack.mix.local.js',
 	]
 
 	write('Preparing configuration files...')
 
 	eachSeries( files, ( file, nextConfig ) => {
-		prepareFile( template + file, pluginData.folder + file, nextConfig )
+		let dest = file
+		if ( '/gitattributes' === file ) {
+			dest = '/.gitattributes'
+		}
+
+		if ( '/gitignore' === file ) {
+			dest = '/.gitignore'
+		}
+
+		prepareFile( template + file, pluginData.folder + dest, nextConfig )
 	}, () => {
 		msgSuccessOnSameLine(`${files.length} Configuration files prepared`)
 		next()

package/src/commands/setup/prompts.js

@@ -8,7 +8,7 @@ import kebabCase from 'lodash/kebabCase.js'
 /**
  * Node dependencies
  */
-import { getCacheStore, getSettings, heading } from '../../utilities/index.js'
+import { getCacheStore, getSettings } from '../../utilities/index.js'
 
 export default ( next ) => {
     const cache = getCacheStore()
@@ -29,7 +29,7 @@ export default ( next ) => {
             type: 'input',
             name: 'wp.version',
             message: 'Enter plugin version',
-            default: getAnswer( 'version', '1.0.0' ),
+            default: getAnswer( 'wp.version', '1.0.0' ),
             filter: ( val ) => val.toLowerCase()
         },
         {

package/src/utilities/index.js

@@ -4,3 +4,4 @@ export * from './file.js'
 export * from './folder.js'
 export * from './formatting.js'
 export * from './shell.js'
+export * from './semver.js'

package/src/utilities/semver.js

@@ -0,0 +1,33 @@
+export class SemVer {
+    constructor(version) {
+        this.rawVersion = version
+
+        this.parseVersion()
+    }
+
+    parseVersion() {
+        const regex = new RegExp('(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-(?<pre>alpha|beta|rc))?(?:\\.(?<pre_count>\\d+))?', 'gm')
+        this.baseVersion = { ...regex.exec(this.rawVersion).groups }
+
+        this.baseVersion.major = parseInt(this.baseVersion.major)
+        this.baseVersion.minor = parseInt(this.baseVersion.minor)
+        this.baseVersion.patch = parseInt(this.baseVersion.patch)
+        this.baseVersion.pre = undefined === this.baseVersion.pre ? false : this.baseVersion.pre
+        this.baseVersion.pre_count = undefined === this.baseVersion.pre_count ? false : this.baseVersion.pre_count
+    }
+
+    getCurrentVersion() {
+        return this.rawVersion
+    }
+
+    inc(type) {
+        const nextVersion = { ...this.baseVersion }
+        nextVersion[type] += 1
+
+        return this.format(nextVersion);
+    }
+
+    format(version) {
+        return `${version.major}.${version.minor}.${version.patch}`
+    }
+}

package/template/configs/.phpcs.xml.dist

@@ -23,6 +23,7 @@
 	<!-- PHPCompatibility configs: -->
 	<config name="testVersion" value="7.2-" />
 	<config name="minimum_supported_wp_version" value="4.9" />
+	<config name="minimum_wp_version" value="4.9" />
 
 	<rule ref="PHPCompatibility">
 		<include-pattern>*\.php$</include-pattern>
@@ -55,7 +56,7 @@
 
 	<!-- Disable disallow short arrays and enforce them: -->
 	<rule ref="WordPress-Extra">
-		<exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax"/>
 	</rule>
 
 	<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>

package/template/configs/gitignore

@@ -0,0 +1,43 @@
+# Wordpress - ignore core, configuration, examples, uploads and logs.
+# https://github.com/github/gitignore/blob/main/WordPress.gitignore
+
+# Operating System files
+.DS_Store
+Thumbs.db
+
+# IDE files
+.vscode/*
+project.xml
+project.properties
+.project
+.settings*
+*.sublime-project
+*.sublime-workspace
+.sublimelinterrc
+
+# Caches
+.eslintcache
+.stylelintcache
+
+# Environment files
+wp-cli.local.yml
+.wp-env.override.json
+npm-debug.log
+.pnpm-debug.log
+
+# Node Package Dependencies
+node_modules/
+
+# Composer
+packages/**/tests/
+vendor/
+bin/composer/**/vendor/
+
+# Support .gitkeep Files
+!.gitkeep
+webpack.mix.local.js
+mix-manifest.json
+
+# WP Browser Files
+tests/_output
+tests/.env

package/template/configs/webpack.mix.local.js

@@ -0,0 +1,3 @@
+module.exports = {
+	wpUrl: '{{wp.proxy}}',
+};