@crxjs/vite-plugin 1.0.6 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @crxjs/vite-plugin
 
+## 1.0.9
+
+### Patch Changes
+
+- 8941353: Remove & refactor use of fs-extra
+
+## 1.0.8
+
+### Patch Changes
+
+- 8a09cb9: Optimize rollup input
+
+## 1.0.7
+
+### Patch Changes
+
+- e1604d8: Strip paths from content script resource match patterns
+
 ## 1.0.6
 
 ### Patch Changes

package/dist/index.cjs

@@ -8,16 +8,16 @@ var crypto = require('crypto');
 var debug$5 = require('debug');
 var fg = require('fast-glob');
 var v8 = require('v8');
-var fsExtra = require('fs-extra');
+var fs = require('fs');
 var MagicString = require('magic-string');
 var path = require('path');
+var fsExtra = require('fs-extra');
 var perf_hooks = require('perf_hooks');
 var colors = require('picocolors');
 var vite = require('vite');
 var module$1 = require('module');
 var cheerio = require('cheerio');
 var jsesc = require('jsesc');
-var fs = require('fs');
 var injector = require('connect-injector');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -43,8 +43,8 @@ function _interopNamespace(e) {
 var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug$5);
 var fg__default = /*#__PURE__*/_interopDefaultLegacy(fg);
 var v8__default = /*#__PURE__*/_interopDefaultLegacy(v8);
-var fsExtra__default = /*#__PURE__*/_interopDefaultLegacy(fsExtra);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
+var fsExtra__default = /*#__PURE__*/_interopDefaultLegacy(fsExtra);
 var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
 var jsesc__default = /*#__PURE__*/_interopDefaultLegacy(jsesc);
 var injector__default = /*#__PURE__*/_interopDefaultLegacy(injector);
@@ -132,6 +132,12 @@ function encodeManifest(manifest) {
   const json = JSON.stringify(JSON.stringify(manifest));
   return `export default ${json}`;
 }
+const stubMatchPattern = (pattern) => {
+  const [schema, rest] = pattern.split("://");
+  const [origin, pathname] = rest.split("/");
+  const root = `${schema}://${origin}`;
+  return pathname ? `${root}/*` : root;
+};
 
 const idBySource = /* @__PURE__ */ new Map();
 const idByUrl = /* @__PURE__ */ new Map();
@@ -212,6 +218,7 @@ const preambleId = "/crx-client-preamble";
 const stubId = "/crx-stub";
 const workerClientId = "/crx-client-worker";
 
+const { readFile: readFile$2 } = fs.promises;
 const debug$4 = _debug("file-writer").extend("chunks");
 for (const source of [viteClientId, customElementsId]) {
   setUrlMeta(sourceToUrlMeta(source));
@@ -286,7 +293,7 @@ const pluginFileWriterChunks = () => {
             this.emitFile({
               type: "asset",
               fileName: relative(server.config.root, file),
-              source: await fsExtra.readFile(file)
+              source: await readFile$2(file)
             });
         }
         if (url)
@@ -2298,6 +2305,7 @@ const pluginFileWriterHtml = () => {
   };
 };
 
+const { readFile: readFile$1 } = fs.promises;
 const pluginFileWriterPublic = () => {
   let config;
   return {
@@ -2311,7 +2319,7 @@ const pluginFileWriterPublic = () => {
         this.addWatchFile(config.publicDir);
         const publicFiles = await fg__default["default"](`${config.publicDir}/**/*`);
         for (const file of publicFiles) {
-          const source = await fsExtra.readFile(file);
+          const source = await readFile$1(file);
           const fileName = relative(config.publicDir, file);
           this.emitFile({ type: "asset", fileName, source });
         }
@@ -2322,8 +2330,8 @@ const pluginFileWriterPublic = () => {
 
 const _require = typeof require === "undefined" ? module$1.createRequire((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index.cjs', document.baseURI).href))) : require;
 const customElementsPath = _require.resolve(customElementsId);
-const customElementsCode = fsExtra.readFileSync(customElementsPath, "utf8");
-const customElementsMap = fsExtra.readFileSync(`${customElementsPath}.map`, "utf8");
+const customElementsCode = fs.readFileSync(customElementsPath, "utf8");
+const customElementsMap = fs.readFileSync(`${customElementsPath}.map`, "utf8");
 const pluginFileWriterPolyfill = () => {
   return {
     name: "crx:file-writer-polyfill",
@@ -2766,6 +2774,7 @@ const pluginHtmlAuditor = () => {
   };
 };
 
+const { readFile } = fs.promises;
 const pluginManifest = (_manifest) => () => {
   let manifest;
   let plugins;
@@ -2778,17 +2787,28 @@ const pluginManifest = (_manifest) => () => {
       async config(config2, env) {
         manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
         if (manifest.manifest_version !== 3)
-          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
+          throw new Error(`CRXJS does not support Manifest v${manifest.manifest_version}, please use Manifest v3`);
         if (env.command === "serve") {
           const {
             contentScripts: js,
             background: sw,
             html
           } = await manifestFiles(manifest);
-          let { entries = [] } = config2.optimizeDeps ?? {};
-          entries = [entries].flat();
-          const set = new Set(entries);
-          for (const x of [...js, ...sw, ...html])
+          const { entries = [] } = config2.optimizeDeps ?? {};
+          let { input = [] } = config2.build?.rollupOptions ?? {};
+          if (typeof input === "string")
+            input = [input];
+          else
+            input = Object.values(input);
+          input = input.map((f) => {
+            let result = f;
+            if (isAbsolute(f)) {
+              result = relative(config2.root ?? process.cwd(), f);
+            }
+            return result;
+          });
+          const set = new Set([entries, input].flat());
+          for (const x of [js, sw, html].flat())
             set.add(x);
           return {
             ...config2,
@@ -2963,7 +2983,7 @@ Public dir: "${config.publicDir}"`);
             this.emitFile({
               type: "asset",
               fileName: f,
-              source: await fsExtra.readFile(filename)
+              source: await readFile(filename)
             });
           }
         }));
@@ -3332,6 +3352,7 @@ const pluginResources = ({ contentScripts = {} }) => {
                         resource.resources.push(...css);
                       }
                     if (resource.resources.length) {
+                      resource.matches = resource.matches.map(stubMatchPattern);
                       manifest.web_accessible_resources.push(resource);
                     }
                   }

package/dist/index.mjs

@@ -4,16 +4,16 @@ import { createHash as createHash$1 } from 'crypto';
 import debug$5 from 'debug';
 import fg from 'fast-glob';
 import v8 from 'v8';
-import fsExtra, { readFile, readFileSync } from 'fs-extra';
+import { promises, readFileSync, existsSync } from 'fs';
 import MagicString from 'magic-string';
 import { posix } from 'path';
+import fsExtra from 'fs-extra';
 import { performance } from 'perf_hooks';
 import colors from 'picocolors';
 import { createLogger } from 'vite';
 import { createRequire } from 'module';
 import { load } from 'cheerio';
 import jsesc from 'jsesc';
-import { existsSync } from 'fs';
 import injector from 'connect-injector';
 
 const _debug = (id) => debug$5("crx").extend(id);
@@ -99,6 +99,12 @@ function encodeManifest(manifest) {
   const json = JSON.stringify(JSON.stringify(manifest));
   return `export default ${json}`;
 }
+const stubMatchPattern = (pattern) => {
+  const [schema, rest] = pattern.split("://");
+  const [origin, pathname] = rest.split("/");
+  const root = `${schema}://${origin}`;
+  return pathname ? `${root}/*` : root;
+};
 
 const idBySource = /* @__PURE__ */ new Map();
 const idByUrl = /* @__PURE__ */ new Map();
@@ -179,6 +185,7 @@ const preambleId = "/crx-client-preamble";
 const stubId = "/crx-stub";
 const workerClientId = "/crx-client-worker";
 
+const { readFile: readFile$2 } = promises;
 const debug$4 = _debug("file-writer").extend("chunks");
 for (const source of [viteClientId, customElementsId]) {
   setUrlMeta(sourceToUrlMeta(source));
@@ -253,7 +260,7 @@ const pluginFileWriterChunks = () => {
             this.emitFile({
               type: "asset",
               fileName: relative(server.config.root, file),
-              source: await readFile(file)
+              source: await readFile$2(file)
             });
         }
         if (url)
@@ -2265,6 +2272,7 @@ const pluginFileWriterHtml = () => {
   };
 };
 
+const { readFile: readFile$1 } = promises;
 const pluginFileWriterPublic = () => {
   let config;
   return {
@@ -2278,7 +2286,7 @@ const pluginFileWriterPublic = () => {
         this.addWatchFile(config.publicDir);
         const publicFiles = await fg(`${config.publicDir}/**/*`);
         for (const file of publicFiles) {
-          const source = await readFile(file);
+          const source = await readFile$1(file);
           const fileName = relative(config.publicDir, file);
           this.emitFile({ type: "asset", fileName, source });
         }
@@ -2733,6 +2741,7 @@ const pluginHtmlAuditor = () => {
   };
 };
 
+const { readFile } = promises;
 const pluginManifest = (_manifest) => () => {
   let manifest;
   let plugins;
@@ -2745,17 +2754,28 @@ const pluginManifest = (_manifest) => () => {
       async config(config2, env) {
         manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
         if (manifest.manifest_version !== 3)
-          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
+          throw new Error(`CRXJS does not support Manifest v${manifest.manifest_version}, please use Manifest v3`);
         if (env.command === "serve") {
           const {
             contentScripts: js,
             background: sw,
             html
           } = await manifestFiles(manifest);
-          let { entries = [] } = config2.optimizeDeps ?? {};
-          entries = [entries].flat();
-          const set = new Set(entries);
-          for (const x of [...js, ...sw, ...html])
+          const { entries = [] } = config2.optimizeDeps ?? {};
+          let { input = [] } = config2.build?.rollupOptions ?? {};
+          if (typeof input === "string")
+            input = [input];
+          else
+            input = Object.values(input);
+          input = input.map((f) => {
+            let result = f;
+            if (isAbsolute(f)) {
+              result = relative(config2.root ?? process.cwd(), f);
+            }
+            return result;
+          });
+          const set = new Set([entries, input].flat());
+          for (const x of [js, sw, html].flat())
             set.add(x);
           return {
             ...config2,
@@ -3299,6 +3319,7 @@ const pluginResources = ({ contentScripts = {} }) => {
                         resource.resources.push(...css);
                       }
                     if (resource.resources.length) {
+                      resource.matches = resource.matches.map(stubMatchPattern);
                       manifest.web_accessible_resources.push(resource);
                     }
                   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crxjs/vite-plugin",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "Build Chrome Extensions with this Vite plugin.",
   "keywords": [
     "rollup-plugin",
@@ -83,20 +83,20 @@
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-node-resolve": "13.2.0",
     "@types/acorn": "4.0.6",
-    "@types/chrome": "0.0.184",
+    "@types/chrome": "0.0.188",
     "@types/debug": "4.1.7",
     "@types/fs-extra": "9.0.13",
-    "@types/jest": "27.5.0",
+    "@types/jest": "27.5.1",
     "@types/jest-image-snapshot": "4.3.1",
     "@types/jsesc": "3.0.1",
     "@types/node": "17.0.18",
     "@types/react": "17.0.44",
-    "@types/react-dom": "17.0.16",
+    "@types/react-dom": "17.0.17",
     "@typescript-eslint/eslint-plugin": "5.23.0",
     "@typescript-eslint/parser": "5.23.0",
     "@vitejs/plugin-react": "1.3.2",
-    "@vitejs/plugin-vue": "2.3.2",
-    "esbuild": "0.14.38",
+    "@vitejs/plugin-vue": "2.3.3",
+    "esbuild": "0.14.42",
     "esbuild-runner": "2.2.1",
     "eslint": "8.15.0",
     "jest": "27.5.1",
@@ -111,7 +111,7 @@
     "typescript": "^4.6.4",
     "vite": "^2.9.5",
     "vite-plugin-inspect": "0.5.0",
-    "vue": "3.2.33"
+    "vue": "3.2.36"
   },
   "peerDependencies": {
     "vite": "^2.9.0"