wip

elementor · Jul 25, 2024 · e5fbe2e · e5fbe2e
1 parent 29f3c5e
commit e5fbe2e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/actions/setup-wp-env/action.yml b/actions/setup-wp-env/action.yml
@@ -51,7 +51,7 @@ runs:
               ACTION_PATH: ${{ github.action_path }}
               INPUT_CONFIG: ${{ inputs.config }}
           run: |
-              npx zx@8 $ACTION_PATH/dist/create-wp-env-config.cjs \
+              npx zx@8 $ACTION_PATH/dist/create-wp-env-config.js \
               --wp="$INPUT_WP" \
               --php="$INPUT_PHP" \
               --plugins="$INPUT_PLUGINS" \

diff --git a/...etup-wp-env/dist/create-wp-env-config.cjs → ...setup-wp-env/dist/create-wp-env-config.js b/...etup-wp-env/dist/create-wp-env-config.cjs → ...setup-wp-env/dist/create-wp-env-config.js
@@ -1,5 +1,3 @@
-"use strict";
-
 // actions/setup-wp-env/create-wp-env-config.ts
 
 
@@ -46,14 +44,14 @@ async function main() {
       )
     }
   };
-  await import_zx.fs.ensureDir(WP_ENV_TMP_DIR);
-  await import_zx.fs.writeJSON(`${WP_ENV_TMP_DIR}/.wp-env.json`, content, {
+  await fs.ensureDir(WP_ENV_TMP_DIR);
+  await fs.writeJSON(`${WP_ENV_TMP_DIR}/.wp-env.json`, content, {
     spaces: 2
   });
 }
 function getOptions(args) {
   const entries = Object.entries(args);
-  const options = (0, import_zx.minimist)(process.argv.slice(2), {
+  const options = minimist(process.argv.slice(2), {
     string: entries.filter(([, { type }]) => type === "string").map(([key]) => key),
     boolean: entries.filter(([, { type }]) => type === "boolean").map(([key]) => key),
     default: Object.fromEntries(

diff --git a/scripts/remove-zx-imports-tsup-plugin.js b/scripts/remove-zx-imports-tsup-plugin.js
@@ -14,9 +14,9 @@ export default function removeZxImportsTsupPlugin() {
 		buildEnd: ({ writtenFiles }) =>
 			Promise.all(
 				writtenFiles.map(async (file) => {
-					const content = (await fs.readFile(file.name, 'utf-8'))
-						.replaceAll(/^import .+ from "zx";?$/gm, '')
-						.replaceAll('var import_zx = require("zx");', '');
+					const content = (
+						await fs.readFile(file.name, 'utf-8')
+					).replaceAll(/^import .+ from "zx";?$/gm, '');
 
 					await fs.writeFile(file.name, content, 'utf-8');
 				}),

diff --git a/tsup.config.ts b/tsup.config.ts
@@ -2,21 +2,18 @@ import { defineConfig } from 'tsup';
 import removeZxImportsTsupPlugin from './scripts/remove-zx-imports-tsup-plugin.js';
 
 export default [
-	defineActionConfig('setup-wp-env'),
-	defineActionConfig('setup-elementor-env', ['index.ts'], true),
-];
-
-function defineActionConfig(
-	action: string,
-	files: string[] = [],
-	bundle: boolean = false,
-) {
-	return defineConfig({
-		entry: [`actions/${action}/${files.join(',') || '*.ts'}`],
-		outDir: `actions/${action}/dist`,
-		format: 'cjs',
+	defineConfig({
+		entry: [`actions/setup-wp-env/*.ts`],
+		outDir: `actions/setup-wp-env/dist`,
+		format: 'esm',
 		plugins: [removeZxImportsTsupPlugin()],
-		noExternal: bundle ? [/.+/] : [],
 		platform: 'node',
-	});
-}
+	}),
+	defineConfig({
+		entry: [`actions/setup-elementor-env/index.ts`],
+		outDir: `actions/setup-elementor-env/dist`,
+		format: 'cjs',
+		noExternal: [/.+/],
+		platform: 'node',
+	}),
+];