Rebase conflict

WordPress · Nov 27, 2023 · 6f262fa · 6f262fa
1 parent cce151e
commit 6f262fa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 57 deletions.
diff --git a/packages/playground/blueprints/src/lib/steps/common.ts b/packages/playground/blueprints/src/lib/steps/common.ts
@@ -25,10 +25,6 @@ export async function fileToUint8Array(file: File) {
  return new Uint8Array(await file.arrayBuffer());
 }
 
-export async function fileToString(file: File) {
- return new TextDecoder("utf-8").decode(new Uint8Array(await file.arrayBuffer()));
-}
-
 /**
  * Polyfill the File class in JSDOM which lacks arrayBuffer() method
  *

diff --git a/packages/playground/blueprints/src/lib/steps/handlers.ts b/packages/playground/blueprints/src/lib/steps/handlers.ts
@@ -3,7 +3,6 @@ export { activateTheme } from './activate-theme';
 export { applyWordPressPatches } from './apply-wordpress-patches';
 export { runPHP } from './run-php';
 export { runPHPWithOptions } from './run-php-with-options';
-export { runSqlFile } from './run-sql-file';
 export { setPhpIniEntry } from './set-php-ini-entry';
 export { request } from './request';
 export { cp } from './cp';

diff --git a/packages/playground/blueprints/src/lib/steps/index.ts b/packages/playground/blueprints/src/lib/steps/index.ts
@@ -16,7 +16,6 @@ import { SetSiteOptionsStep, UpdateUserMetaStep } from './site-data';
 import { RmStep } from './rm';
 import { CpStep } from './cp';
 import { RmdirStep } from './rmdir';
-import { RunSqlFileStep } from './run-sql-file';
 import { MkdirStep } from './mkdir';
 import { MvStep } from './mv';
 import { SetPhpIniEntryStep } from './set-php-ini-entry';
@@ -59,7 +58,6 @@ export type GenericStep<Resource> =
  | RunPHPStep
  | RunPHPWithOptionsStep
  | RunWpInstallationWizardStep
- | RunSqlFileStep
  | SetPhpIniEntryStep
  | SetSiteOptionsStep
  | UnzipStep
@@ -88,7 +86,6 @@ export type {
  RunPHPStep,
  RunPHPWithOptionsStep,
  RunWpInstallationWizardStep,
- RunSqlFileStep,
  WordPressInstallationOptions,
  SetPhpIniEntryStep,
  SetSiteOptionsStep,

diff --git a/packages/playground/blueprints/src/lib/steps/run-sql-file.ts b/packages/playground/blueprints/src/lib/steps/run-sql-file.ts
diff --git a/packages/playground/website/builder/index.js b/packages/playground/website/builder/index.js
@@ -1,5 +1,9 @@
-const importStartPlaygroundWeb = import('https://unpkg.com/@wp-playground/client/index.js');
-const fetchBlueprintSchema = fetch('https://unpkg.com/@wp-playground/blueprints/blueprint-schema.json').then((r) => r.json());
+const importStartPlaygroundWeb = import(
+ 'https://unpkg.com/@wp-playground/client/index.js'
+);
+const fetchBlueprintSchema = fetch(
+ 'https://unpkg.com/@wp-playground/blueprints/blueprint-schema.json'
+).then((r) => r.json());
 
 const FALLBACK_TIMEOUT = 30 * 1000;