From 5630543df426667c43f26cb0ab82a55bb0318e27 Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:39:17 +0100 Subject: [PATCH 01/10] Temporarily use development branch --- src/sidebar/playground.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sidebar/playground.js b/src/sidebar/playground.js index 0a202e27..86e791af 100644 --- a/src/sidebar/playground.js +++ b/src/sidebar/playground.js @@ -50,7 +50,7 @@ function steps() { step: 'unzip', zipFile: { resource: 'url', - url: 'https://github-proxy.com/proxy/?repo=akirk/try-wordpress&branch=trunk&directory=plugins/data-liberation', + url: 'https://github-proxy.com/proxy/?repo=akirk/try-wordpress&branch=rename-plugin&directory=plugins/data-liberation', }, extractToPath: '/wordpress/wp-content', }, From 4c98cca99fac61836f2c1b60654b4720a74f53c8 Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:41:18 +0100 Subject: [PATCH 02/10] Rename and move js file --- plugins/data-liberation/data-liberation.php | 2 +- plugins/data-liberation/{js/data-liberation.js => index.js} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/data-liberation/{js/data-liberation.js => index.js} (100%) diff --git a/plugins/data-liberation/data-liberation.php b/plugins/data-liberation/data-liberation.php index d3c04992..1d0d1969 100644 --- a/plugins/data-liberation/data-liberation.php +++ b/plugins/data-liberation/data-liberation.php @@ -17,7 +17,7 @@ public function __construct() { } public function enqueue_scripts() { - wp_enqueue_script( 'data-liberation', plugin_dir_url( __FILE__ ) . 'js/data-liberation.js', array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'js/data-liberation.js' ), true ); + wp_enqueue_script( 'data-liberation', plugin_dir_url( __FILE__ ) . 'index.js', array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'index.js' ), true ); wp_enqueue_style( 'data-liberation', plugin_dir_url( __FILE__ ) . 'css/data-liberation.css', array(), filemtime( plugin_dir_path( __FILE__ ) . 'css/data-liberation.css' ) ); } diff --git a/plugins/data-liberation/js/data-liberation.js b/plugins/data-liberation/index.js similarity index 100% rename from plugins/data-liberation/js/data-liberation.js rename to plugins/data-liberation/index.js From 9bd826baf0b13be38b1e14b85e929d5de342dc37 Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:47:09 +0100 Subject: [PATCH 03/10] Rename and move css file --- plugins/data-liberation/data-liberation.php | 2 +- plugins/data-liberation/{css/data-liberation.css => style.css} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/data-liberation/{css/data-liberation.css => style.css} (100%) diff --git a/plugins/data-liberation/data-liberation.php b/plugins/data-liberation/data-liberation.php index 1d0d1969..4d05f122 100644 --- a/plugins/data-liberation/data-liberation.php +++ b/plugins/data-liberation/data-liberation.php @@ -18,7 +18,7 @@ public function __construct() { public function enqueue_scripts() { wp_enqueue_script( 'data-liberation', plugin_dir_url( __FILE__ ) . 'index.js', array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'index.js' ), true ); - wp_enqueue_style( 'data-liberation', plugin_dir_url( __FILE__ ) . 'css/data-liberation.css', array(), filemtime( plugin_dir_path( __FILE__ ) . 'css/data-liberation.css' ) ); + wp_enqueue_style( 'data-liberation', plugin_dir_url( __FILE__ ) . 'style.css', array(), filemtime( plugin_dir_path( __FILE__ ) . 'style.css' ) ); } public function create_wizard_page() { diff --git a/plugins/data-liberation/css/data-liberation.css b/plugins/data-liberation/style.css similarity index 100% rename from plugins/data-liberation/css/data-liberation.css rename to plugins/data-liberation/style.css From a51a774dc792750aad2af94f81400f7caa376730 Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:49:15 +0100 Subject: [PATCH 04/10] Rename plugin file --- plugins/data-liberation/{data-liberation.php => plugin.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/data-liberation/{data-liberation.php => plugin.php} (100%) diff --git a/plugins/data-liberation/data-liberation.php b/plugins/data-liberation/plugin.php similarity index 100% rename from plugins/data-liberation/data-liberation.php rename to plugins/data-liberation/plugin.php From 18bb9d60d9d44175d4224681cb24f3a70473f22c Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:50:25 +0100 Subject: [PATCH 05/10] Rename plugin class --- plugins/data-liberation/plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/data-liberation/plugin.php b/plugins/data-liberation/plugin.php index 4d05f122..85442210 100644 --- a/plugins/data-liberation/plugin.php +++ b/plugins/data-liberation/plugin.php @@ -10,7 +10,7 @@ exit; } -class DataLiberation { +class TryWordPress { public function __construct() { add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); add_action( 'admin_menu', array( $this, 'create_wizard_page' ) ); @@ -38,4 +38,4 @@ public function render_wizard_page() { } } -new DataLiberation(); +new TryWordPress(); From 797f29e2fc5fe4cb9cd746b7ac6ae9857ace608e Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 14:54:51 +0100 Subject: [PATCH 06/10] Rename plugin --- plugins/data-liberation/plugin.php | 2 +- src/sidebar/playground.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/data-liberation/plugin.php b/plugins/data-liberation/plugin.php index 85442210..f96d6310 100644 --- a/plugins/data-liberation/plugin.php +++ b/plugins/data-liberation/plugin.php @@ -1,6 +1,6 @@ Date: Wed, 14 Aug 2024 15:11:01 +0100 Subject: [PATCH 07/10] Move extension source to src/extension --- package.json | 4 ++-- src/{ => extension}/background/index.js | 0 src/{ => extension}/content/index.js | 0 .../content/utils/block-features.js | 0 .../content/utils/block-supports.js | 0 src/{ => extension}/content/utils/dom.js | 0 .../content/utils/interface.js | 0 src/{ => extension}/icons/icon-128.png | Bin src/{ => extension}/icons/icon-32.png | Bin src/{ => extension}/manifest-chrome.json | 0 src/{ => extension}/manifest-firefox.json | 0 src/{ => extension}/sidebar/index.js | 0 src/{ => extension}/sidebar/playground.js | 0 src/{ => extension}/sidebar/sidebar.css | 0 src/{ => extension}/sidebar/sidebar.html | 0 tests/content/dom.test.js | 2 +- webpack.config.js | 21 +++++++++++------- 17 files changed, 16 insertions(+), 11 deletions(-) rename src/{ => extension}/background/index.js (100%) rename src/{ => extension}/content/index.js (100%) rename src/{ => extension}/content/utils/block-features.js (100%) rename src/{ => extension}/content/utils/block-supports.js (100%) rename src/{ => extension}/content/utils/dom.js (100%) rename src/{ => extension}/content/utils/interface.js (100%) rename src/{ => extension}/icons/icon-128.png (100%) rename src/{ => extension}/icons/icon-32.png (100%) rename src/{ => extension}/manifest-chrome.json (100%) rename src/{ => extension}/manifest-firefox.json (100%) rename src/{ => extension}/sidebar/index.js (100%) rename src/{ => extension}/sidebar/playground.js (100%) rename src/{ => extension}/sidebar/sidebar.css (100%) rename src/{ => extension}/sidebar/sidebar.html (100%) diff --git a/package.json b/package.json index 3e050d3d..b26af03b 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "watch": "webpack --watch", "start:firefox": "concurrently \"npm:watch\" \"npm:web-ext:run:firefox\"", "start:chrome": "concurrently \"npm:watch\" \"npm:web-ext:run:chrome\"", - "web-ext:run:firefox": "web-ext -s build/firefox run --target firefox-desktop --firefox-profile try-wordpress", - "web-ext:run:chrome": "web-ext -s build/chrome run --target chromium --chromium-profile try-wordpress --arg='--disable-search-engine-choice-screen'", + "web-ext:run:firefox": "web-ext -s build/extension/firefox run --target firefox-desktop --firefox-profile try-wordpress", + "web-ext:run:chrome": "web-ext -s build/extension/chrome run --target chromium --chromium-profile try-wordpress --arg='--disable-search-engine-choice-screen'", "lint": "npm run lint:js && npm run lint:style", "lint:js": "wp-scripts lint-js", "lint:style": "wp-scripts lint-style", diff --git a/src/background/index.js b/src/extension/background/index.js similarity index 100% rename from src/background/index.js rename to src/extension/background/index.js diff --git a/src/content/index.js b/src/extension/content/index.js similarity index 100% rename from src/content/index.js rename to src/extension/content/index.js diff --git a/src/content/utils/block-features.js b/src/extension/content/utils/block-features.js similarity index 100% rename from src/content/utils/block-features.js rename to src/extension/content/utils/block-features.js diff --git a/src/content/utils/block-supports.js b/src/extension/content/utils/block-supports.js similarity index 100% rename from src/content/utils/block-supports.js rename to src/extension/content/utils/block-supports.js diff --git a/src/content/utils/dom.js b/src/extension/content/utils/dom.js similarity index 100% rename from src/content/utils/dom.js rename to src/extension/content/utils/dom.js diff --git a/src/content/utils/interface.js b/src/extension/content/utils/interface.js similarity index 100% rename from src/content/utils/interface.js rename to src/extension/content/utils/interface.js diff --git a/src/icons/icon-128.png b/src/extension/icons/icon-128.png similarity index 100% rename from src/icons/icon-128.png rename to src/extension/icons/icon-128.png diff --git a/src/icons/icon-32.png b/src/extension/icons/icon-32.png similarity index 100% rename from src/icons/icon-32.png rename to src/extension/icons/icon-32.png diff --git a/src/manifest-chrome.json b/src/extension/manifest-chrome.json similarity index 100% rename from src/manifest-chrome.json rename to src/extension/manifest-chrome.json diff --git a/src/manifest-firefox.json b/src/extension/manifest-firefox.json similarity index 100% rename from src/manifest-firefox.json rename to src/extension/manifest-firefox.json diff --git a/src/sidebar/index.js b/src/extension/sidebar/index.js similarity index 100% rename from src/sidebar/index.js rename to src/extension/sidebar/index.js diff --git a/src/sidebar/playground.js b/src/extension/sidebar/playground.js similarity index 100% rename from src/sidebar/playground.js rename to src/extension/sidebar/playground.js diff --git a/src/sidebar/sidebar.css b/src/extension/sidebar/sidebar.css similarity index 100% rename from src/sidebar/sidebar.css rename to src/extension/sidebar/sidebar.css diff --git a/src/sidebar/sidebar.html b/src/extension/sidebar/sidebar.html similarity index 100% rename from src/sidebar/sidebar.html rename to src/extension/sidebar/sidebar.html diff --git a/tests/content/dom.test.js b/tests/content/dom.test.js index 5db8ef30..be675991 100644 --- a/tests/content/dom.test.js +++ b/tests/content/dom.test.js @@ -1,4 +1,4 @@ -import { getStylesString } from '../../src/content/utils/dom'; +import { getStylesString } from '../../src/extension/content/utils/dom'; describe( 'Style formatting', function () { test( 'Convert styles object to a string', () => { diff --git a/webpack.config.js b/webpack.config.js index e2018ff7..8f27681f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,11 +8,16 @@ module.exports = function () { let modules = []; for ( const target of [ 'firefox', 'chrome' ] ) { - const targetPath = path.resolve( __dirname, 'build', target ); + const targetPath = path.resolve( + __dirname, + 'build', + 'extension', + target + ); modules = modules.concat( [ { mode, - entry: './src/background/index.js', + entry: './src/extension/background/index.js', output: { path: targetPath, filename: path.join( 'background', 'index.js' ), @@ -21,11 +26,11 @@ module.exports = function () { new CopyPlugin( { patterns: [ { - from: `./src/manifest-${ target }.json`, + from: `./src/extension/manifest-${ target }.json`, to: path.join( targetPath, 'manifest.json' ), }, { - from: './src/icons', + from: './src/extension/icons', to: path.join( targetPath, 'icons' ), }, ], @@ -34,7 +39,7 @@ module.exports = function () { }, { mode, - entry: './src/content/index.js', + entry: './src/extension/content/index.js', output: { path: targetPath, filename: path.join( 'content', 'index.js' ), @@ -42,7 +47,7 @@ module.exports = function () { }, { mode, - entry: './src/sidebar/index.js', + entry: './src/extension/sidebar/index.js', output: { path: targetPath, filename: path.join( 'sidebar', 'index.js' ), @@ -51,7 +56,7 @@ module.exports = function () { new CopyPlugin( { patterns: [ { - from: 'src/sidebar/sidebar.html', + from: './src/extension/sidebar/sidebar.html', to: path.join( targetPath, 'sidebar', @@ -59,7 +64,7 @@ module.exports = function () { ), }, { - from: 'src/sidebar/sidebar.css', + from: './src/extension/sidebar/sidebar.css', to: path.join( targetPath, 'sidebar', From 660a45005c1a2351d0b7804296dd64515c5f4d3d Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 15:14:02 +0100 Subject: [PATCH 08/10] Move plugin to src/ --- src/extension/sidebar/playground.js | 11 ++++++++--- {plugins/data-liberation => src/plugin}/index.js | 0 {plugins/data-liberation => src/plugin}/plugin.php | 0 {plugins/data-liberation => src/plugin}/style.css | 0 .../data-liberation => src/plugin}/views/wizard.php | 0 5 files changed, 8 insertions(+), 3 deletions(-) rename {plugins/data-liberation => src/plugin}/index.js (100%) rename {plugins/data-liberation => src/plugin}/plugin.php (100%) rename {plugins/data-liberation => src/plugin}/style.css (100%) rename {plugins/data-liberation => src/plugin}/views/wizard.php (100%) diff --git a/src/extension/sidebar/playground.js b/src/extension/sidebar/playground.js index 1f913834..0e7c252b 100644 --- a/src/extension/sidebar/playground.js +++ b/src/extension/sidebar/playground.js @@ -50,14 +50,19 @@ function steps() { step: 'unzip', zipFile: { resource: 'url', - url: 'https://github-proxy.com/proxy/?repo=akirk/try-wordpress&branch=rename-plugin&directory=plugins/data-liberation', + url: 'https://github-proxy.com/proxy/?repo=akirk/try-wordpress&branch=rename-plugin&directory=src/plugin', }, - extractToPath: '/wordpress/wp-content', + extractToPath: '/wordpress/wp-content/plugins', + }, + { + step: 'mv', + fromPath: '/wordpress/wp-content/plugins/src/plugin', + toPath: '/wordpress/wp-content/plugins/try-wordpress', }, { step: 'activatePlugin', pluginName: 'Try WordPress', - pluginPath: '/wordpress/wp-content/plugins/data-liberation', + pluginPath: '/wordpress/wp-content/plugins/try-wordpress', }, ]; } diff --git a/plugins/data-liberation/index.js b/src/plugin/index.js similarity index 100% rename from plugins/data-liberation/index.js rename to src/plugin/index.js diff --git a/plugins/data-liberation/plugin.php b/src/plugin/plugin.php similarity index 100% rename from plugins/data-liberation/plugin.php rename to src/plugin/plugin.php diff --git a/plugins/data-liberation/style.css b/src/plugin/style.css similarity index 100% rename from plugins/data-liberation/style.css rename to src/plugin/style.css diff --git a/plugins/data-liberation/views/wizard.php b/src/plugin/views/wizard.php similarity index 100% rename from plugins/data-liberation/views/wizard.php rename to src/plugin/views/wizard.php From 0f647e0ae3634fbfb66909bb071422920b315c70 Mon Sep 17 00:00:00 2001 From: Paulo Pinto Date: Wed, 14 Aug 2024 15:29:27 +0100 Subject: [PATCH 09/10] Rename data-liberation to try-wordpress everywhere --- src/extension/sidebar/index.js | 2 +- src/extension/sidebar/playground.js | 2 +- src/plugin/index.js | 6 +++--- src/plugin/plugin.php | 10 +++++----- src/plugin/views/wizard.php | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/extension/sidebar/index.js b/src/extension/sidebar/index.js index 43d95d84..946a9d49 100644 --- a/src/extension/sidebar/index.js +++ b/src/extension/sidebar/index.js @@ -27,7 +27,7 @@ window.addEventListener( 'message', function ( event ) { return; } const data = event.data.data; - if ( 'data-liberation-message' !== data.type ) { + if ( 'try-wordpress-message' !== data.type ) { return; } if ( 'start-import' === data.action ) { diff --git a/src/extension/sidebar/playground.js b/src/extension/sidebar/playground.js index 0e7c252b..7fa351b0 100644 --- a/src/extension/sidebar/playground.js +++ b/src/extension/sidebar/playground.js @@ -20,7 +20,7 @@ export async function initPlayground( iframeId ) { siteSlug: 'try-wordpress', blueprint: { login: true, - landingPage: '/wp-admin/admin.php?page=data-liberation', + landingPage: '/wp-admin/admin.php?page=try-wordpress', steps: steps(), }, }; diff --git a/src/plugin/index.js b/src/plugin/index.js index ea1fb28d..9534eed7 100644 --- a/src/plugin/index.js +++ b/src/plugin/index.js @@ -1,6 +1,6 @@ -if ( document.getElementById( 'data-liberation-import' ) ) { +if ( document.getElementById( 'try-wordpress-import' ) ) { document - .getElementById( 'data-liberation-import' ) + .getElementById( 'try-wordpress-import' ) .addEventListener( 'click', function () { const progressContainer = document.getElementById( 'progress-container' ); @@ -15,7 +15,7 @@ if ( document.getElementById( 'data-liberation-import' ) ) { { type: 'relay', data: { - type: 'data-liberation-message', + type: 'try-wordpress-message', action: 'start-import', }, }, diff --git a/src/plugin/plugin.php b/src/plugin/plugin.php index f96d6310..c988da6f 100644 --- a/src/plugin/plugin.php +++ b/src/plugin/plugin.php @@ -17,16 +17,16 @@ public function __construct() { } public function enqueue_scripts() { - wp_enqueue_script( 'data-liberation', plugin_dir_url( __FILE__ ) . 'index.js', array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'index.js' ), true ); - wp_enqueue_style( 'data-liberation', plugin_dir_url( __FILE__ ) . 'style.css', array(), filemtime( plugin_dir_path( __FILE__ ) . 'style.css' ) ); + wp_enqueue_script( 'try-wordpress', plugin_dir_url( __FILE__ ) . 'index.js', array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'index.js' ), true ); + wp_enqueue_style( 'try-wordpress', plugin_dir_url( __FILE__ ) . 'style.css', array(), filemtime( plugin_dir_path( __FILE__ ) . 'style.css' ) ); } public function create_wizard_page() { add_menu_page( - 'Data Liberation Wizard', - 'Data Liberation', + 'Try WordPress Wizard', + 'Try WordPress', 'manage_options', - 'data-liberation', + 'try-wordpress', array( $this, 'render_wizard_page' ), 'dashicons-admin-tools', 100 diff --git a/src/plugin/views/wizard.php b/src/plugin/views/wizard.php index 6575140a..ebdc1fb8 100644 --- a/src/plugin/views/wizard.php +++ b/src/plugin/views/wizard.php @@ -1,10 +1,10 @@
-

+

Site Title:

- + -

+