chore: bump deps

cli/create-plasmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-plasmo",
-  "version": "0.59.0-alpha.1",
+  "version": "0.59.0-alpha.2",
   "description": "Create Plasmo Framework Browser Extension",
   "main": "dist/index.js",
   "bin": "bin/index.mjs",
@@ -45,6 +45,6 @@
     "@plasmo/constants": "workspace:*",
     "@plasmo/utils": "workspace:*",
     "plasmo": "workspace:*",
-    "typescript": "4.8.4"
+    "typescript": "4.9.3"
   }
 }

cli/create-plasmo/src/index.ts

@@ -4,7 +4,8 @@ import init from "plasmo/src/commands/init"
 import { argv, exit } from "process"
 
 import { ErrorMessage } from "@plasmo/constants"
-import { aLog, eLog, exitCountDown } from "@plasmo/utils"
+import { aLog, eLog } from "@plasmo/utils/logging"
+import { exitCountDown } from "@plasmo/utils/wait"
 
 process.env.APP_VERSION = version
 

cli/plasmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plasmo",
-  "version": "0.59.0-alpha.1",
+  "version": "0.59.0-alpha.2",
   "description": "The Plasmo Platform CLI",
   "main": "dist/index.js",
   "types": "dist/type.d.ts",
@@ -35,10 +35,10 @@
   ],
   "dependencies": {
     "@expo/spawn-async": "1.7.0",
-    "@parcel/core": "2.7.0",
-    "@parcel/fs": "2.7.0",
-    "@parcel/package-manager": "2.7.0",
-    "@parcel/watcher": "2.0.5",
+    "@parcel/core": "2.8.0",
+    "@parcel/fs": "2.8.0",
+    "@parcel/package-manager": "2.8.0",
+    "@parcel/watcher": "2.0.7",
     "@plasmohq/init": "workspace:*",
     "@plasmohq/parcel-config": "workspace:*",
     "archiver": "5.3.1",
@@ -50,18 +50,18 @@
     "events": "3.3.0",
     "fflate": "0.7.4",
     "get-port": "6.1.2",
-    "got": "12.5.2",
+    "got": "12.5.3",
     "inquirer": "9.1.4",
     "is-path-inside": "4.0.0",
     "mnemonic-id": "3.2.7",
     "node-object-hash": "2.3.10",
     "package-json": "8.1.0",
     "process": "0.11.10",
     "semver": "7.3.8",
-    "sharp": "0.31.1",
+    "sharp": "0.31.2",
     "tempy": "3.0.0",
     "tiny-glob": "0.2.9",
-    "typescript": "4.8.4"
+    "typescript": "4.9.3"
   },
   "devDependencies": {
     "@plasmo/config": "workspace:*",

cli/plasmo/src/commands/build.ts

@@ -1,7 +1,9 @@
 import { createWriteStream } from "fs"
 import { resolve } from "path"
 
-import { getNonFlagArgvs, hasFlag, iLog, sLog } from "@plasmo/utils"
+import { getNonFlagArgvs } from "@plasmo/utils/argv"
+import { hasFlag } from "@plasmo/utils/flags"
+import { iLog, sLog } from "@plasmo/utils/logging"
 
 import { getBundleConfig } from "~features/extension-devtools/get-bundle-config"
 import { nextNewTab } from "~features/extra/next-new-tab"

cli/plasmo/src/commands/dev.ts

@@ -1,4 +1,5 @@
-import { aLog, eLog, getFlag, hasFlag, iLog, vLog } from "@plasmo/utils"
+import { getFlag, hasFlag } from "@plasmo/utils/flags"
+import { aLog, eLog, iLog, vLog } from "@plasmo/utils/logging"
 
 import { getBundleConfig } from "~features/extension-devtools/get-bundle-config"
 import { createProjectWatcher } from "~features/extension-devtools/project-watcher"
@@ -94,6 +95,7 @@ async function dev() {
         })
       })
     }
+    process.env.__PLASMO_FRAMEWORK_INTERNAL_WATCHER_STARTED = "true"
   })
 
   const cleanup = () => {

cli/plasmo/src/commands/init.ts

@@ -2,7 +2,9 @@ import { paramCase } from "change-case"
 import { resolve } from "path"
 import { cwd } from "process"
 
-import { ensureWritableAndEmpty, hasFlag, vLog } from "@plasmo/utils"
+import { hasFlag } from "@plasmo/utils/flags"
+import { ensureWritableAndEmpty } from "@plasmo/utils/fs"
+import { vLog } from "@plasmo/utils/logging"
 
 import { getCommonPath } from "~features/extension-devtools/common-path"
 import { getPackageManager } from "~features/helpers/package-manager"

cli/plasmo/src/commands/start.ts

@@ -1,4 +1,4 @@
-import { iLog } from "@plasmo/utils"
+import { iLog } from "@plasmo/utils/logging"
 
 async function start() {
   iLog("Start the extension development...")

cli/plasmo/src/features/extension-devtools/content-script-config.ts

@@ -3,7 +3,7 @@ import type { Node, VariableDeclaration } from "typescript"
 import typescript from "typescript"
 
 import type { ManifestContentScript } from "@plasmo/constants"
-import { eLog, vLog } from "@plasmo/utils"
+import { eLog, vLog } from "@plasmo/utils/logging"
 
 import { parseAst } from "./parse-ast"
 

cli/plasmo/src/features/extension-devtools/generate-icons.ts

@@ -2,7 +2,7 @@ import { copy, ensureDir, existsSync } from "fs-extra"
 import { basename, resolve } from "path"
 import sharp from "sharp"
 
-import { vLog, wLog } from "@plasmo/utils"
+import { vLog, wLog } from "@plasmo/utils/logging"
 
 import { flagMap } from "~features/helpers/flag"
 

cli/plasmo/src/features/extension-devtools/load-env-config.ts

@@ -6,7 +6,7 @@ import { existsSync, statSync } from "fs"
 import { readFile } from "fs/promises"
 import { join } from "path"
 
-import { eLog, iLog } from "@plasmo/utils"
+import { eLog, iLog } from "@plasmo/utils/logging"
 
 import { browser } from "~features/extension-devtools/get-bundle-config"
 import { flagMap } from "~features/helpers/flag"
@@ -17,12 +17,15 @@ export type LoadedEnvFiles = Array<{
   contents: string
 }>
 
+export const EMBED_ENV_PREFIX = "PLASMO_"
+export const PUBLIC_ENV_PREFIX = "PLASMO_PUBLIC_"
+
 export class PlasmoPublicEnv {
   data: Env
 
   constructor(_env: Env) {
     this.data = Object.keys(_env)
-      .filter((k) => k.startsWith("PLASMO_PUBLIC_"))
+      .filter((k) => k.startsWith(PUBLIC_ENV_PREFIX))
       .reduce(
         (env, key) => {
           env[key] = _env[key]
@@ -59,7 +62,7 @@ function processEnv(loadedEnvFiles: LoadedEnvFiles, dir?: string) {
           if (typeof parsed[key] === "undefined") {
             parsed[key] = resultData[key]
 
-            if (key.startsWith("PLASMO_")) {
+            if (key.startsWith(EMBED_ENV_PREFIX)) {
               process.env[key] = resultData[key]
             }
           }

cli/plasmo/src/features/extension-devtools/package-file.ts

@@ -21,7 +21,8 @@ export const generatePackage = ({
     packageManager: undefined as string | undefined,
     scripts: {
       dev: "plasmo dev",
-      build: "plasmo build"
+      build: "plasmo build",
+      package: "plasmo package"
     },
     dependencies: {
       plasmo: process.env.APP_VERSION,

cli/plasmo/src/features/extension-devtools/project-watcher.ts

@@ -1,7 +1,9 @@
 import { Event, subscribe } from "@parcel/watcher"
 
-import { PARCEL_WATCHER_BACKEND } from "@plasmo/constants"
-import { assertUnreachable, hasFlag, iLog, vLog, wLog } from "@plasmo/utils"
+import { PARCEL_WATCHER_BACKEND } from "@plasmo/constants/misc"
+import { assertUnreachable } from "@plasmo/utils/assert"
+import { hasFlag } from "@plasmo/utils/flags"
+import { iLog, vLog, wLog } from "@plasmo/utils/logging"
 
 import type { BaseFactory } from "~features/manifest-factory/base"
 

cli/plasmo/src/features/extra/next-new-tab.ts

@@ -3,7 +3,8 @@ import { copy, emptyDir, readJson, writeJson } from "fs-extra"
 import { mkdir } from "fs/promises"
 import { resolve } from "path"
 
-import { fileExists, sLog, vLog } from "@plasmo/utils"
+import { fileExists } from "@plasmo/utils/fs"
+import { sLog, vLog } from "@plasmo/utils/logging"
 
 import { getCommonPath } from "~features/extension-devtools/common-path"
 import type { PackageJSON } from "~features/extension-devtools/package-file"

cli/plasmo/src/features/framework-update/version-tracker.ts

@@ -2,7 +2,7 @@ import { existsSync } from "fs"
 import { emptyDir, ensureDir, readJson, writeJson } from "fs-extra"
 import semver from "semver"
 
-import { wLog } from "@plasmo/utils"
+import { wLog } from "@plasmo/utils/logging"
 
 import type { CommonPath } from "~features/extension-devtools/common-path"
 

cli/plasmo/src/features/helpers/flag.ts

@@ -1,6 +1,6 @@
 import { paramCase } from "change-case"
 
-import { getFlag } from "@plasmo/utils"
+import { getFlag } from "@plasmo/utils/flags"
 
 const srcPath = getFlag("--src-path") || process.env.PLASMO_SRC_PATH || "src"
 

cli/plasmo/src/features/helpers/print.ts

@@ -1,4 +1,4 @@
-import { cLog } from "@plasmo/utils"
+import { cLog } from "@plasmo/utils/logging"
 
 import { validCommandList } from "~commands"
 import { flagHelp } from "~features/helpers/flag"

cli/plasmo/src/features/helpers/traverse.ts

@@ -1,4 +1,4 @@
-import { iLog } from "@plasmo/utils"
+import { iLog } from "@plasmo/utils/logging"
 
 const defaultTransformer = (target: any) =>
   iLog({
@@ -16,14 +16,14 @@ export const definedTraverse = (
   if (Array.isArray(target)) {
     return target
       .map((item) => definedTraverse(item, transformer))
-      .filter((i) => typeof i !== "undefined")
+      .filter((i) => i !== undefined)
   } else if (typeof target === "object") {
     const result = {} as any
 
     for (const key in target) {
       if (target.hasOwnProperty(key)) {
         result[key] = definedTraverse(target[key], transformer)
-        if (typeof result[key] === "undefined") {
+        if (result[key] === undefined) {
           delete result[key]
         }
       }

cli/plasmo/src/features/manifest-factory/base.ts

@@ -29,7 +29,9 @@ import type {
   ManifestContentScript,
   ManifestPermission
 } from "@plasmo/constants"
-import { assertTruthy, vLog } from "@plasmo/utils"
+import { assertTruthy } from "@plasmo/utils/assert"
+import { injectEnv } from "@plasmo/utils/env"
+import { vLog } from "@plasmo/utils/logging"
 
 import {
   CommonPath,
@@ -203,7 +205,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
     }
 
     this.data.permissions = autoPermissionList.filter(
-      (p) => `@plasmohq/${p}` in (this.packageData?.dependencies || {})
+      (p) => `@plasmohq/${p}` in (this.packageData.dependencies || {})
     )
 
     await Promise.all([
@@ -332,7 +334,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
         )
       }
 
-      const contentScript = this.injectEnv({
+      const contentScript = this.injectEnvToObj({
         matches: ["<all_urls>"],
         js: [scriptPath],
         ...(metadata?.config || {})
@@ -428,10 +430,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
     }
 
     base.permissions = [
-      ...new Set([
-        ...base.permissions!,
-        ...((overridePermissions as any) || [])
-      ])
+      ...new Set([...base.permissions!, ...(overridePermissions || [])])
     ]
 
     if (base.permissions?.length === 0) {
@@ -491,7 +490,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
       }
     }
 
-    return this.injectEnv(output)
+    return this.injectEnvToObj(output)
   }
 
   protected abstract resolveWAR: (
@@ -553,7 +552,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
     }
   }
 
-  protected injectEnv = <T = any, O = T>(target: T): O =>
+  protected injectEnvToObj = <T = any, O = T>(target: T): O =>
     definedTraverse(target, (value) => {
       if (typeof value !== "string") {
         return value
@@ -562,10 +561,7 @@ export abstract class BaseFactory<T extends ExtensionManifest = any> {
       if (!!value.match(/^\$(\w+)$/)) {
         return this.combinedEnv[value.substring(1)] || undefined
       } else {
-        return value.replace(
-          /\$(\w+)/gm,
-          (envKey) => this.combinedEnv[envKey.substring(1)] || envKey
-        )
+        return injectEnv(value, this.combinedEnv)
       }
     })
 }

cli/plasmo/src/features/manifest-factory/create-manifest.ts

@@ -1,6 +1,6 @@
 import { existsSync } from "fs-extra"
 
-import { vLog, wLog } from "@plasmo/utils"
+import { vLog, wLog } from "@plasmo/utils/logging"
 
 import type { PlasmoBundleConfig } from "~features/extension-devtools/get-bundle-config"
 

cli/plasmo/src/features/manifest-factory/scaffolder.ts

@@ -3,7 +3,7 @@ import { copy, ensureDir } from "fs-extra"
 import { readFile, writeFile } from "fs/promises"
 import { ParsedPath, join, relative, resolve } from "path"
 
-import { vLog } from "@plasmo/utils"
+import { vLog } from "@plasmo/utils/logging"
 
 import { toPosix } from "~features/helpers/path"
 

cli/plasmo/src/features/manifest-factory/ui-library.ts

@@ -3,7 +3,8 @@ import { resolve } from "path"
 import { cwd } from "process"
 import semver from "semver"
 
-import { assertUnreachable, fileExists } from "@plasmo/utils"
+import { assertUnreachable } from "@plasmo/utils/assert"
+import { fileExists } from "@plasmo/utils/fs"
 
 import type { BaseFactory } from "./base"
 

cli/plasmo/src/features/project-creator/from-existing-manifest.ts

@@ -11,7 +11,8 @@ import type {
   ExtensionManifestV3,
   ManifestPermission
 } from "@plasmo/constants"
-import { getFlag, vLog } from "@plasmo/utils"
+import { getFlag } from "@plasmo/utils/flags"
+import { vLog } from "@plasmo/utils/logging"
 
 import type { CommonPath } from "~features/extension-devtools/common-path"
 import {

cli/plasmo/src/features/project-creator/get-raw-name.ts

@@ -1,6 +1,7 @@
 import { createQuestId } from "mnemonic-id"
 
-import { getNonFlagArgvs, vLog } from "@plasmo/utils"
+import { getNonFlagArgvs } from "@plasmo/utils/argv"
+import { vLog } from "@plasmo/utils/logging"
 
 export const getRawName = async () => {
   const [rawNameNonInteractive] = getNonFlagArgvs("init")

cli/plasmo/src/features/project-creator/git-init.ts

@@ -1,7 +1,7 @@
 import spawnAsync, { SpawnOptions } from "@expo/spawn-async"
 import { existsSync } from "fs-extra"
 
-import { iLog, vLog, wLog } from "@plasmo/utils"
+import { iLog, vLog, wLog } from "@plasmo/utils/logging"
 
 import type { CommonPath } from "~features/extension-devtools/common-path"
 

cli/plasmo/src/features/project-creator/index.ts

@@ -7,7 +7,8 @@ import { userInfo } from "os"
 import { resolve } from "path"
 import { temporaryDirectory } from "tempy"
 
-import { getFlag, hasFlag, iLog, vLog } from "@plasmo/utils"
+import { getFlag, hasFlag } from "@plasmo/utils/flags"
+import { iLog, vLog } from "@plasmo/utils/logging"
 
 import type { CommonPath } from "~features/extension-devtools/common-path"
 import { generateGitIgnore } from "~features/extension-devtools/git-ignore"

cli/plasmo/src/features/project-creator/install-dependencies.ts

@@ -1,6 +1,6 @@
 import spawnAsync from "@expo/spawn-async"
 
-import { iLog, wLog } from "@plasmo/utils"
+import { iLog, wLog } from "@plasmo/utils/logging"
 
 import type { PackageManagerInfo } from "~features/helpers/package-manager"
 

cli/plasmo/src/features/project-creator/print-ready.ts

@@ -1,4 +1,4 @@
-import { sLog } from "@plasmo/utils"
+import { sLog } from "@plasmo/utils/logging"
 
 import type { CommonPath } from "~features/extension-devtools/common-path"
 import type { PackageManagerInfo } from "~features/helpers/package-manager"