Drag any of the links above onto your bookmark bar to save it as a bookmarklet which works on any site just like the full extension
Version: ${process.env.PLASMO_PUBLIC_VERSION}
`,
].join(' ');
+ const output = `${buttons}
`;
+
fs.writeFileSync(outputFile, output);
})
.catch((error) => {
diff --git a/src/services/Logger.ts b/src/services/Logger.ts
index 44216d3..d288bcf 100644
--- a/src/services/Logger.ts
+++ b/src/services/Logger.ts
@@ -5,14 +5,6 @@
import { envService } from './envService';
-/**
- * @description stateMachine of debug to cantDebug states
- */
-const debugStates = new Map([
- ['true', false],
- ['false', true],
-]);
-
const cantDebug = (shouldDebug: boolean = false) => !shouldDebug;
const nullCallback = () => null;
diff --git a/src/services/envService.ts b/src/services/envService.ts
index 69197f8..76403ab 100644
--- a/src/services/envService.ts
+++ b/src/services/envService.ts
@@ -1,70 +1,51 @@
-import { z } from 'zod';
-
-const booleanMap = new Map<'true' | 'false' | undefined, boolean>([
- ['true', true],
- ['false', false],
- [undefined, false],
-]);
+import { boolean, object, optional, parse, picklist, pipe, string, transform, ValiError, type InferOutput } from 'valibot';
const env = {
- PLASMO_PUBLIC_SHORTCUT: { value: process.env.PLASMO_PUBLIC_SHORTCUT, validator: z.string() },
- PLASMO_PUBLIC_VERSION: { value: process.env.PLASMO_PUBLIC_VERSION, validator: z.string().optional() },
- PLASMO_PUBLIC_VERSION_NAME: { value: process.env.PLASMO_PUBLIC_VERSION_NAME, validator: z.string().optional() },
+ PLASMO_PUBLIC_SHORTCUT: { value: process.env.PLASMO_PUBLIC_SHORTCUT, validator: string() },
+ PLASMO_PUBLIC_VERSION: { value: process.env.PLASMO_PUBLIC_VERSION, validator: string() },
+ PLASMO_PUBLIC_VERSION_NAME: { value: process.env.PLASMO_PUBLIC_VERSION_NAME, validator: string() },
PLASMO_PUBLIC_TARGET: {
value: process.env.PLASMO_PUBLIC_TARGET,
- validator: z
- .string()
- .default('')
- .transform((x) => x as typeof process.env.PLASMO_PUBLIC_TARGET),
+ validator: string(),
},
NODE_ENV: {
value: process.env.NODE_ENV,
- validator: z
- .string()
- .optional()
- .transform((x) => x as typeof process.env.NODE_ENV),
+ validator: pipe(
+ string(),
+ transform((input) => input as typeof process.env.NODE_ENV),
+ ),
},
PLASMO_PUBLIC_DEBUG: {
value: process.env.PLASMO_PUBLIC_DEBUG,
- validator: z
- .boolean()
- .or(
- z
- .enum(['TRUE', 'FALSE'])
- // .optional()
- // .default('true')
- .transform((x) => booleanMap.get(x as keyof typeof booleanMap.keys)),
- )
- .default(false),
+ validator: pipe(
+ optional(picklist(['TRUE', 'FALSE'] as const), 'FALSE'),
+ transform((input) => ({ TRUE: true, FALSE: false, '': false })[input]),
+ boolean(),
+ ),
},
PLASMO_PUBLIC_ENABLE_TRACKING: {
value: process.env.PLASMO_PUBLIC_ENABLE_TRACKING,
- validator: z
- .boolean()
- .or(
- z
- .enum(['true', 'false'])
- .optional()
- .default('false')
- .transform((x) => booleanMap.get(x as keyof typeof booleanMap.keys)),
- )
- .default(false),
+ validator: pipe(
+ optional(picklist(['TRUE', 'FALSE'] as const), 'FALSE'),
+ transform((input) => ({ TRUE: true, FALSE: false })[input] ?? false),
+ boolean(),
+ ),
},
- PLASMO_PUBLIC_HOME_URL: { value: process.env.PLASMO_PUBLIC_HOME_URL, validator: z.string().optional() },
+ PLASMO_PUBLIC_HOME_URL: { value: process.env.PLASMO_PUBLIC_HOME_URL, validator: optional(string(), '') },
};
type Env = typeof env;
console.log({ env });
-let envSchema = z.object(Object.fromEntries(Object.entries(env).map(([key, { validator }]) => [key, validator])) as { [K in keyof Env]: Env[K]['validator'] });
+let envSchema = object(Object.fromEntries(Object.entries(env).map(([key, { validator }]) => [key, validator])) as { [K in keyof Env]: Env[K]['validator'] });
let envSelection = Object.fromEntries(Object.entries(env).map(([key, { value }]) => [key, value])) as (typeof process)['env'];
-let sourceEnv: z.infer
;
+let sourceEnv: InferOutput;
try {
- sourceEnv = envSchema.parse(envSelection);
+ sourceEnv = parse(envSchema, envSelection);
} catch (error) {
- const zerr = JSON.stringify((error as z.ZodError).flatten(), null, 2);
+ const zerr = JSON.stringify(error as typeof ValiError, null, 2);
console.error(zerr);
throw new Error(zerr);
}
diff --git a/tsconfig.json b/tsconfig.json
index 139ceb6..441fafb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,10 +3,11 @@
"exclude": ["node_modules"],
"include": [".plasmo/index.d.ts", ".plasmo/**/*", "./**/*.ts", "./**/*.tsx"],
"compilerOptions": {
- "target": "ES2023",
+ "target": "ES2018",
"strict": true,
"noUnusedLocals": true,
"alwaysStrict": true,
+ "removeComments": true,
"baseUrl": ".",
"paths": {
"~*": ["./src/*"]