js stuff

wp-blocks · Oct 13, 2023 · 7e51316 · 7e51316
1 parent beec6ef
commit 7e51316
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 19 deletions.
diff --git a/admin/CF7_AntiSpam_Admin_Core.php b/admin/CF7_AntiSpam_Admin_Core.php
@@ -188,8 +188,8 @@ public function enqueue_scripts() {
 		 * class.
 		 */
 
-		$asset = include CF7ANTISPAM_PLUGIN_DIR . '/admin/dist/admin-scripts.asset.php';
-		wp_register_script( $this->plugin_name, CF7ANTISPAM_PLUGIN_URL . '/admin/dist/admin-scripts.js', $asset['dependencies'], $asset['version'], true );
+		$asset = include CF7ANTISPAM_PLUGIN_DIR . '/build/admin-scripts.asset.php';
+		wp_register_script( $this->plugin_name, CF7ANTISPAM_PLUGIN_URL . '/build/admin-scripts.js', $asset['dependencies'], $asset['version'], true );
 		wp_enqueue_script( $this->plugin_name );
 
 		wp_localize_script(

diff --git a/core/CF7_AntiSpam_Frontend.php b/core/CF7_AntiSpam_Frontend.php
@@ -410,8 +410,8 @@ public function enqueue_scripts() {
 		 * class.
 		 */
 
-		$asset = include CF7ANTISPAM_PLUGIN_DIR . '/includes/dist/script.asset.php';
-		wp_register_script( $this->plugin_name, CF7ANTISPAM_PLUGIN_URL . '/includes/dist/script.js', $asset['dependencies'], $asset['version'], true );
+		$asset = include CF7ANTISPAM_PLUGIN_DIR . '/build/script.asset.php';
+		wp_register_script( $this->plugin_name, CF7ANTISPAM_PLUGIN_URL . '/build/script.js', $asset['dependencies'], $asset['version'], true );
 		wp_enqueue_script( $this->plugin_name );
 
 		wp_localize_script(

diff --git a/admin/src/admin-scripts.js → src/admin-scripts.js b/admin/src/admin-scripts.js → src/admin-scripts.js
diff --git a/admin/src/dashboard/dashboard.js → src/dashboard/dashboard.js b/admin/src/dashboard/dashboard.js → src/dashboard/dashboard.js
diff --git a/admin/src/dashboard/dashboard.scss → src/dashboard/dashboard.scss b/admin/src/dashboard/dashboard.scss → src/dashboard/dashboard.scss
diff --git a/admin/src/integration/integration.scss → src/integration/integration.scss b/admin/src/integration/integration.scss → src/integration/integration.scss
diff --git a/core/src/script.js → src/script.js b/core/src/script.js → src/script.js
diff --git a/admin/src/settings/settings.js → src/settings/settings.js b/admin/src/settings/settings.js → src/settings/settings.js
diff --git a/admin/src/settings/settings.scss → src/settings/settings.scss b/admin/src/settings/settings.scss → src/settings/settings.scss
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,19 +1,10 @@
 const defaultConfig = require( '@wordpress/scripts/config/webpack.config' );
 const path = require( 'path' );
 
-const addModule = ( fileName, filePath ) => {
-	return {
-		...defaultConfig,
-		name: fileName,
-		entry: path.resolve( __dirname, filePath + fileName ),
-		output: {
-			path: path.resolve( __dirname, filePath + '../dist/' ),
-			filename: fileName,
-		},
-	};
+module.exports = {
+  ...defaultConfig,
+  entry: {
+    script: path.resolve( process.cwd(), `src/script.js` ),
+    'admin-scripts': path.resolve( process.cwd(), `src/admin-scripts.js` ),
+  },
 };
-
-const mainScript = addModule( 'script.js', 'core/src/' );
-const adminScript = addModule( 'admin-scripts.js', 'admin/src/' );
-
-module.exports = [ mainScript, adminScript ];