@crxjs/vite-plugin 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/index.d.ts

@@ -202,7 +202,8 @@ declare const defineManifest: (manifest: ManifestV3Export) => ManifestV3Export;
  *
  * You don't need to define a match pattern for dynamic content script
  * resources, but if you want to do so, you can use the helper function
- * `defineDynamicResource` to define your web accessible resources in a TypeScript file:
+ * `defineDynamicResource` to define your web accessible resources in a
+ * TypeScript file:
  *
  * ```typescript
  * import { crx, defineManifest, defineDynamicResource }

package/dist/index.mjs

@@ -14,7 +14,6 @@ import { createLogger } from 'vite';
 import { readFileSync, existsSync, promises } from 'fs';
 import { createRequire } from 'module';
 import fg from 'fast-glob';
-import getPort, { portNumbers } from 'get-port';
 import { load } from 'cheerio';
 import jsesc from 'jsesc';
 import colors from 'picocolors';
@@ -30,12 +29,15 @@ const pluginOptionsProvider = (options) => {
     }
   };
 };
-const getOptions = ({ plugins }) => {
+const getOptions = async ({
+  plugins
+}) => {
   if (typeof plugins === "undefined") {
     throw new Error("config.plugins is undefined");
   }
+  const awaitedPlugins = await Promise.all(plugins);
   let options;
-  for (const p of plugins.flat()) {
+  for (const p of awaitedPlugins.flat()) {
     if (isCrxPlugin(p)) {
       if (p.name === pluginName$1) {
         const plugin = p;
@@ -558,8 +560,8 @@ const pluginContentScripts = () => {
     {
       name: "crx:content-scripts",
       apply: "serve",
-      config(config) {
-        const { contentScripts: contentScripts2 = {} } = getOptions(config);
+      async config(config) {
+        const { contentScripts: contentScripts2 = {} } = await getOptions(config);
         hmrTimeout = contentScripts2.hmrTimeout ?? 5e3;
         preambleCode = preambleCode ?? contentScripts2.preambleCode;
       },
@@ -661,8 +663,8 @@ const pluginContentScriptsCss = () => {
   return {
     name: "crx:content-scripts-css",
     enforce: "post",
-    config(config) {
-      const { contentScripts: contentScripts2 = {} } = getOptions(config);
+    async config(config) {
+      const { contentScripts: contentScripts2 = {} } = await getOptions(config);
       injectCss = contentScripts2.injectCss ?? true;
     },
     renderCrxManifest(manifest) {
@@ -691,7 +693,7 @@ const pluginDeclaredContentScripts = () => {
   return [];
 };
 
-const _dynamicScriptRegEx = /\b(import.meta).CRX_DYNAMIC_SCRIPT_(.+?);$/gm;
+const _dynamicScriptRegEx = /\b(import.meta).CRX_DYNAMIC_SCRIPT_(.+?)[,;]/gm;
 const dynamicScriptRegEx = () => {
   _dynamicScriptRegEx.lastIndex = 0;
   return _dynamicScriptRegEx;
@@ -1061,7 +1063,6 @@ const pluginHMR = () => {
           server.hmr = {};
         server.hmr = server.hmr ?? {};
         server.hmr.host = "localhost";
-        server.hmr.port = server.hmr.port ?? await getPort({ port: portNumbers(5200, 5300) });
         return { server, ...config2 };
       },
       configResolved(_config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crxjs/vite-plugin",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.5",
   "description": "Build Chrome Extensions with this Vite plugin.",
   "keywords": [
     "rollup-plugin",
@@ -23,9 +23,10 @@
   },
   "license": "MIT",
   "author": "Jack and Amy Steam <jacksteamdev@gmail.com>",
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
+      "require": "./index.cjs",
       "import": "./dist/index.mjs",
       "types": "./dist/index.d.ts"
     },
@@ -71,7 +72,6 @@
     "es-module-lexer": "^0.10.0",
     "fast-glob": "^3.2.11",
     "fs-extra": "^10.0.1",
-    "get-port": "^6.1.2",
     "jsesc": "^3.0.2",
     "magic-string": "^0.26.0",
     "picocolors": "^1.0.0",
@@ -82,11 +82,11 @@
   "devDependencies": {
     "@extend-chrome/messages": "1.2.2",
     "@extend-chrome/storage": "1.5.0",
-    "@rollup/plugin-alias": "3.1.9",
+    "@rollup/plugin-alias": "4.0.2",
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "13.2.0",
-    "@sveltejs/vite-plugin-svelte": "1.0.9",
+    "@sveltejs/vite-plugin-svelte": "1.1.0",
     "@types/acorn": "4.0.6",
     "@types/chrome": "0.0.198",
     "@types/debug": "4.1.7",
@@ -94,16 +94,16 @@
     "@types/jest-image-snapshot": "^5.1.0",
     "@types/jsesc": "3.0.1",
     "@types/node": "17.0.18",
-    "@types/react": "17.0.50",
-    "@types/react-dom": "17.0.17",
-    "@typescript-eslint/eslint-plugin": "5.27.1",
-    "@typescript-eslint/parser": "5.27.1",
+    "@types/react": "17.0.52",
+    "@types/react-dom": "17.0.18",
+    "@typescript-eslint/eslint-plugin": "5.41.0",
+    "@typescript-eslint/parser": "5.41.0",
     "@vitejs/plugin-react": "^2.1.0",
-    "@vitejs/plugin-vue": "3.1.2",
+    "@vitejs/plugin-vue": "3.2.0",
     "chokidar": "^3.5.3",
     "esbuild": "0.15.12",
     "esbuild-runner": "2.2.2",
-    "eslint": "8.17.0",
+    "eslint": "8.26.0",
     "eslint-plugin-react": "^7.29.4",
     "jest-image-snapshot": "^5.2.0",
     "npm-run-all": "^4.1.5",
@@ -117,7 +117,7 @@
     "typescript": "^4.6.4",
     "vite": "^3.1.7",
     "vite-plugin-inspect": "0.7.5",
-    "vitest": "^0.23.4",
+    "vitest": "0.24.3",
     "vue": "3.2.41"
   }
 }