Merge 6f4e4cf into d2c18b5

.eslintrc.json

@@ -10,7 +10,10 @@
 		"generateBlocksStyling": "readonly",
 		"generateBlocksSettings": "readonly",
 		"generateBlocksLegacyDefaults": "readonly",
-		"generateBlocksPatternLibrary": "readonly"
+		"generateBlocksPatternLibrary": "readonly",
+		"generateblocksBlockMedia": "readonly",
+		"generateBlocksEditor": "readonly",
+		"generateblocksDashboard": "readonly"
 	},
 	"env": {
 	  "browser": true,
@@ -33,6 +36,20 @@
 	"settings": {
 		"react": {
 			"pragma": "wp"
+		},
+		"import/resolver": {
+			"node": {
+				"extensions": [".js", ".jsx"]
+			},
+			"eslint-import-resolver-custom-alias": {
+				"extensions": [".js", ".jsx"],
+				"alias": {
+					"@utils": "./src/utils",
+					"@components": "./src/components",
+					"@hooks": "./src/hooks",
+					"@hoc": "./src/hoc"
+				}
+			}
 		}
 	},
 	"rules": {

.github/workflows/ci.yml

@@ -45,9 +45,13 @@ jobs:
         if: steps.js-files.outputs.any_changed == 'true'
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
 
+      - name: Configure npm for private registry
+        if: steps.js-files.outputs.any_changed == 'true'
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
       - name: Download deps
         if: steps.js-files.outputs.any_changed == 'true'
         uses: bahmutov/npm-install@v1
@@ -77,9 +81,13 @@ jobs:
         if: steps.js-files.outputs.any_changed == 'true'
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
 
+      - name: Configure npm for private registry
+        if: steps.js-files.outputs.any_changed == 'true'
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
       - name: Download deps
         if: steps.js-files.outputs.any_changed == 'true'
         uses: bahmutov/npm-install@v1
@@ -111,9 +119,13 @@ jobs:
         if: steps.js-files.outputs.any_changed == 'true'
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'npm'
 
+      - name: Configure npm for private registry
+        if: steps.js-files.outputs.any_changed == 'true'
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
       - name: Download deps
         if: steps.js-files.outputs.any_changed == 'true'
         uses: bahmutov/npm-install@v1
@@ -209,7 +221,10 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
+
+      - name: Configure npm for private registry
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
 
       - name: Download deps
         uses: bahmutov/npm-install@v1

.gitignore

@@ -7,3 +7,4 @@ composer.lock
 ## keep compiled files out of version control
 # dist/
 .phpunit.result.cache
+.npmrc

Gruntfile.js

@@ -25,7 +25,6 @@ module.exports = function( grunt ) {
 					'!*.sh',
 					'!*.map',
 					'!Gruntfile.js',
-					'!package.json',
 					'!.gitignore',
 					'!phpunit.xml',
 					'!README.md',
@@ -39,6 +38,7 @@ module.exports = function( grunt ) {
 					'!.eslintrc.json',
 					'!*.zip',
 					'!.nvmrc',
+					'!config/**',
 				],
 				dest: 'package/generateblocks/',
 			},

assets/css/dashboard-global.css

@@ -16,3 +16,15 @@
 	font-size: 18px;
 	margin-top: 1px;
 }
+
+#adminmenu #toplevel_page_generateblocks a[href="admin.php?page=generateblocks-upgrade"] {
+	font-weight: 600;
+	background-color: #0171d5;
+	color: #fff;
+	margin: 3px 10px 0;
+	display: block;
+	text-align: center;
+	border-radius: 3px;
+	transition: all .3s;
+	box-shadow: 0 0 0;
+}

config/webpack-dependency-extraction.js

@@ -0,0 +1,33 @@
+const WPDependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
+
+class DependencyExtractionWebpackPlugin extends WPDependencyExtractionWebpackPlugin {
+	/**
+	 * Extend the default stringify behavior to sort dependencies by name before returning them.
+	 *
+	 * @param {any} asset Asset Data
+	 * @return {string} Stringified asset data suitable for output
+	 */
+	stringify( asset ) {
+		const prefix = 'generateblocks-';
+		const sortedDeps = asset.dependencies.sort( ( a, b ) => {
+			const aMatches = a.startsWith( prefix );
+			const bMatches = b.startsWith( prefix );
+
+			if ( aMatches && ! bMatches ) {
+				return 1;
+			}
+			if ( bMatches && ! aMatches ) {
+				return -1;
+			}
+
+			return a.localeCompare( b );
+		} );
+
+		const updatedAsset = { ...asset, dependencies: sortedDeps };
+
+		// Fallback to the original method with the updated asset.
+		return super.stringify( updatedAsset );
+	}
+}
+
+module.exports = DependencyExtractionWebpackPlugin;

dist/block-styles-imported.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => 'efa82fe89c6f1a14f7be');

dist/block-styles.asset.php

@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => 'a4522fa7e290a23cd862');