Release

.distignore

@@ -21,7 +21,6 @@ package.json
 package-lock.json
 composer.json
 composer.lock
-assets/js/bundle.js
 npm-debug.log
 bin
 key.enc
@@ -33,7 +32,13 @@ grunt
 tests
 dist
 artifact
-assets/vue
+assets/src
 .wporg
 .nvmrc
 .github
+cypress.config.js
+.eslintrc
+postcss.config.js
+tailwind.config.js
+phpstan.neon
+development.php

.github/workflows/build-dev-artifacts.yml

@@ -40,10 +40,15 @@ jobs:
           npm ci
           composer install --no-dev --prefer-dist --no-progress --no-suggest
       - name: Make build
-        run: |
-          npm run build
+        run: yarn run build
       - name: Create zip
         run: yarn run dist
+      - name: Remove build folder
+        run: rm -rf assets/build
+      - name: Make build
+        run: yarn run build-dev
+      - name: Create dev zip
+        run: yarn run dist --dev
       - name: Retrieve branch name
         id: retrieve-branch-name
         run: echo "::set-output name=branch_name::$(REF=${GITHUB_HEAD_REF:-$GITHUB_REF} && echo ${REF#refs/heads/} | sed 's/\//-/g')"
@@ -90,7 +95,8 @@ jobs:
         id: get-comment-body
         run: |
           body="Plugin build for ${{ github.event.pull_request.head.sha }} is ready :bellhop_bell:!
-          - Download [build](https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/optimole-wp.zip)"
+          - Download [build](https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/optimole-wp.zip)
+          - Download [dev](https://verti-artifacts.s3.amazonaws.com/${{ github.event.pull_request.base.repo.name }}-${{ needs.dev-zip.outputs.branch-name }}-${{ needs.dev-zip.outputs.git-sha-8 }}/optimole-wp-dev.zip)"
           body="${body//$'\n'/'%0A'}"
           echo "::set-output name=body::$body"
       - name: Create comment on PR with links to plugin builds

.github/workflows/test-php.yml

@@ -70,4 +70,30 @@ jobs:
         - name: Install composer
           run: composer install --prefer-dist --no-progress --no-suggest --no-dev
         - name: Run phpunit
-          run: phpunit
+          run: phpunit
+  phpstan:
+    name: PHPStan
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP version
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: simplexml, mysql
+      - name: Checkout source code
+        uses: actions/checkout@v2
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Setup Composer cache
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Install composer
+        run: composer install --prefer-dist --no-progress --no-suggest
+      - name: PHPStan Static Analysis
+        run: composer phpstan

assets/src/parts/connected/Sidebar.js

@@ -9,6 +9,8 @@ import {
 
 import { useSelect } from '@wordpress/data';
 
+import { addQueryArgs } from '@wordpress/url';
+
 const reasons = [
 	optimoleDashboardApp.strings.upgrade.reason_1,
 	optimoleDashboardApp.strings.upgrade.reason_2,
@@ -69,7 +71,7 @@ const Sidebar = () => {
 				/>
 			</div>
 
-			{ 'free' === plan && (
+			{ 'free' === plan ? (
 				<div
 					className="bg-info flex flex-col text-white border-0 rounded-lg shadow-md p-8 bg-promo bg-no-repeat"
 					style={ {
@@ -90,7 +92,6 @@ const Sidebar = () => {
 						) ) }
 					</ul>
 
-
 					<Button
 						variant="link"
 						className="optml__button flex w-full justify-center font-bold min-h-40 !no-underline !text-white !bg-opaque-black !rounded"
@@ -100,6 +101,19 @@ const Sidebar = () => {
 						{ optimoleDashboardApp.strings.upgrade.cta }
 					</Button>
 				</div>
+			) : (
+				<Button
+					variant="default"
+					className="bg-white flex font-bold border-0 rounded-lg shadow-md p-8 text-sm justify-center"
+					href={ addQueryArgs( 'https://optimole.com/contact/', {
+						contact_name: window.optimoleDashboardApp.user_data.display_name,
+						contact_email: optimoleDashboardApp.user_data.user_email,
+						contact_website: optimoleDashboardApp.home_url
+					}) }
+					target="_blank"
+				>
+					{ optimoleDashboardApp.strings.premium_support }
+				</Button>
 			) }
 		</div>
 	);

assets/src/parts/connected/settings/FilterControl.js

@@ -105,6 +105,7 @@ const FilterControl = ({
 	const [ filterOperator, setFilterOperator ] = useState( optimoleDashboardApp.strings.options_strings.filter_operator_contains );
 	const [ filterValue, setFilterValue ] = useState( '' );
 	const [ filterMatchType, setFilterMatchType ] = useState( optimoleDashboardApp.strings.options_strings.filter_operator_contains );
+	const [ lengthError, setLengthError ] = useState( false );
 
 	const changeFilterType = value => {
 		let selectedValue = '';
@@ -122,12 +123,20 @@ const FilterControl = ({
 			setFilterOperator( optimoleDashboardApp.strings.options_strings.filter_operator_contains );
 		}
 
+		setLengthError( false );
 		setFilterValue( selectedValue );
 		setFilterType( value );
 	};
 
+	const updateFilterValue = value => {
+		setFilterValue( value );
+		setLengthError( false );
+	};
+
 	const addFilter = () => {
 		if ( 3 > filterValue.length ) {
+			setLengthError( true );
+
 			return;
 		}
 
@@ -255,7 +264,7 @@ const FilterControl = ({
 							<TextControl
 								value={ filterValue }
 								placeholder={ 'matches' === filterMatchType ? 'path' : 'word' }
-								onChange={ setFilterValue }
+								onChange={ updateFilterValue }
 								className="optml__input"
 							/>
 						) }
@@ -271,6 +280,9 @@ const FilterControl = ({
 						{ optimoleDashboardApp.strings.options_strings.add_filter }
 					</Button>
 				</div>
+				{ lengthError && (
+					<p className="text-red-500 bg-red-100 p-2 rounded-md border border-solid border-red-200">{ optimoleDashboardApp.strings.options_strings.filter_length_error }</p>
+				)}
 			</BaseControl>
 
 			{ hasItems && (

assets/src/parts/connected/settings/OffloadMedia.js

@@ -27,8 +27,6 @@ import {
 	useState
 } from '@wordpress/element';
 
-import { addAction } from '@wordpress/hooks';
-
 /**
  * Internal dependencies.
  */
@@ -142,13 +140,19 @@ const OffloadMedia = ({
 		const data = { ...settings };
 
 		if ( 0 === value.length ) {
-			sites.all = true;
+			sites.all = 'true';
 		} else {
 			value.forEach( ( site ) => {
-				sites[ site ] = true;
+				sites[ site ] = 'true';
 			});
 		}
 
+		Object.keys( data[ 'cloud_sites' ]).forEach( ( site ) => {
+			if ( ! Object.prototype.hasOwnProperty.call( sites, site ) ) {
+				sites[ site ] = 'false';
+			}
+		});
+
 		data[ 'cloud_sites' ] = sites;
 		setSettings( data );
 	};
@@ -190,14 +194,6 @@ const OffloadMedia = ({
 		});
 	};
 
-	addAction(
-		'optimole.settings.save',
-		'optimole/rollback',
-		() => {
-			console.log( 'Trigger save!!!' );
-		}
-	);
-
 	return (
 		<>
 			<ToggleControl
@@ -223,7 +219,7 @@ const OffloadMedia = ({
 					>
 						<div className="optml__token__base flex p-6 bg-light-blue border border-blue-300 rounded-md items-center gap-8">
 							<FormTokenField
-								value={ Object.keys( settings['cloud_sites']).filter( site => 'all' !== site ).map( site => site ) || []}
+								value={ Object.keys( settings['cloud_sites']).filter( site => 'all' !== site && 'false' !== settings['cloud_sites'][ site ]).map( site => site ) || []}
 								suggestions={ whitelistedDomains }
 								onChange={ updateSites }
 								__experimentalExpandOnFocus={ true }

bin/dist.sh

@@ -6,15 +6,38 @@ BUILD_NAME=$(node -pe "require('./package.json').name")
 export BUILD_NAME
 
 if [ ! -d "dist" ]; then
-  mkdir "dist"
+	mkdir "dist"
 fi
 
 if [ ! -d "artifact" ]; then
-  mkdir "artifact"
+	mkdir "artifact"
 fi
 
-rsync -rc --exclude-from ".distignore" "./" "dist/$BUILD_NAME"
+if [ "$1" = "--dev" ]; then
+	DIST_FOLDER="$BUILD_NAME-dev"
+else
+	DIST_FOLDER=$BUILD_NAME
+fi
+
+rsync -rc --exclude-from ".distignore" "./" "dist/$DIST_FOLDER"
+
+if [ "$1" = "--dev" ]; then
+    cp -f "development.php" "dist/$DIST_FOLDER"
+    file="dist/$DIST_FOLDER/optimole-wp.php"
+
+    # Necessary for mac os.
+  	if [[ $(uname -s) == 'Darwin' ]]; then
+  		I_FLAG='-i.bak'
+  	else
+  		I_FLAG='-i'
+  	fi
+
+    sed $I_FLAG "s/define( 'OPTML_BASEFILE', __FILE__ );/define( 'OPTML_BASEFILE', __FILE__ );\nrequire_once OPTML_PATH . '\/development.php';/" $file
+
+fi
 
 cd dist
-zip -r "../artifact/$BUILD_NAME" "./$BUILD_NAME/"
+zip -r "../artifact/$DIST_FOLDER" "./$DIST_FOLDER/"
+
+echo "BUILD GENERATED: $DIST_FOLDER"
 cd -

composer.json

@@ -20,10 +20,16 @@
       "vendor/codeinwp/themeisle-sdk/load.php"
     ]
   },
+  "autoload-dev": {
+    "files": [
+      "vendor/codeinwp/themeisle-sdk/load.php",
+      "development.php"
+    ]
+  },
   "config": {
     "optimize-autoloader": true,
     "platform": {
-      "php": "5.6"
+      "php": "7.4"
     },
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
@@ -34,14 +40,18 @@
     "squizlabs/php_codesniffer": "^3.3",
     "wp-coding-standards/wpcs": "^2.3.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-    "yoast/phpunit-polyfills": "^1.0"
+    "yoast/phpunit-polyfills": "^1.0",
+    "phpstan/phpstan": "^1.10",
+    "szepeviktor/phpstan-wordpress": "^1.3",
+    "php-stubs/wp-cli-stubs": "^2.8"
   },
   "scripts": {
     "format": "phpcbf --standard=phpcs.xml --report-summary --report-source",
     "phpcs": "phpcs --standard=phpcs.xml --extensions=php -s",
     "phpmd": "phpmd inc text phpmd.xml",
     "test": "phpunit --configuration=phpunit.xml",
     "lint": "composer run-script phpcs",
+    "phpstan": "phpstan analyse --memory-limit 2G",
     "install-wp-tests": "bash bin/install-wp-tests.sh wordpress_test root '' localhost latest"
   },
   "require": {