Move preloading the data-liberation-core.phar to the compile() function

Author: adamziel

packages/playground/blueprints/src/lib/compile.ts

@@ -11,6 +11,9 @@ import { Step, StepDefinition, WriteFileStep } from './steps';
 import * as allStepHandlers from './steps/handlers';
 import { Blueprint, ExtraLibrary } from './blueprint';
 import { logger } from '@php-wasm/logger';
+/* @ts-ignore */
+// eslint-disable-next-line
+import dataLiberationCoreUrl from '../../../data-liberation/dist/data-liberation-core.phar.gz?url';
 
 // @TODO: Configure this in the `wp-cli` step, not here.
 const { wpCLI, ...otherStepHandlers } = allStepHandlers;
@@ -229,11 +232,12 @@ export function compileBlueprint(
 	);
 	if (importWxrStepIndex !== undefined && importWxrStepIndex > -1) {
 		blueprint.steps?.splice(importWxrStepIndex, 0, {
-			step: 'installPlugin',
-			pluginData: {
+			step: 'writeFile',
+			path: '/internal/shared/data-liberation-core.phar',
+			data: {
 				resource: 'url',
-				url: 'https://playground.wordpress.net/wordpress-importer.zip',
-				caption: 'Downloading the WordPress Importer plugin',
+				url: dataLiberationCoreUrl,
+				caption: 'Downloading the Data Liberation WXR importer',
 			},
 		});
 	}

packages/playground/blueprints/src/lib/steps/import-wxr.ts

@@ -37,22 +37,10 @@ export const importWxr: StepHandler<ImportWxrStep<File>> = async (
 	progress?
 ) => {
 	progress?.tracker?.setCaption('Importing content');
-	try {
-		const dataLiberationPlugin = await fetch(dataLiberationPluginUrl);
-		await playground.writeFile(
-			'/internal/shared/data-liberation.phar',
-			new Uint8Array(await dataLiberationPlugin.arrayBuffer())
-		);
-		await writeFile(playground, {
-			path: '/tmp/import.wxr',
-			data: file,
-		});
-	} catch (e) {
-		console.log('oops');
-		console.log(e);
-		console.error(e);
-		throw e;
-	}
+	await writeFile(playground, {
+		path: '/tmp/import.wxr',
+		data: file,
+	});
 	const docroot = await playground.documentRoot;
 	playground.onMessage((messageString) => {
 		const message = JSON.parse(messageString) as any;
@@ -68,6 +56,8 @@ export const importWxr: StepHandler<ImportWxrStep<File>> = async (
 		require ${phpVar(docroot)} . '/wp-load.php';
 		require ${phpVar(docroot)} . '/wp-admin/includes/admin.php';
 
+		// Defines the constants expected by the Box .phar stub when "cli" is used
+		// as the SAPI name.
 		// @TODO: Don't use the "cli" SAPI string and don't allow composer to run platform checks.
 		if(!defined('STDERR')) {
 			define('STDERR', fopen('php://stderr', 'w'));
@@ -78,7 +68,8 @@ export const importWxr: StepHandler<ImportWxrStep<File>> = async (
 		if(!defined('STDOUT')) {
 			define('STDOUT', fopen('php://stdout', 'w'));
 		}
-		require '/internal/shared/data-liberation.phar';
+		// Preloaded by the Blueprint compile() function
+		require '/internal/shared/data-liberation-core.phar';
 
 		$admin_id = get_users(array('role' => 'Administrator') )[0]->ID;
         wp_set_current_user( $admin_id );