@dword-design/base-config-web-extension 3.0.0 → 3.0.2

package/dist/dev.js

@@ -1,6 +1,10 @@
 import { execaCommand } from 'execa';
-export default (() => browser => execaCommand('vite', {
+import getManifest from "./get-manifest.js";
+export default (() => async (browser = 'chrome') => execaCommand('vite', {
   env: {
+    MANIFEST: JSON.stringify(await getManifest({
+      browser
+    })),
     TARGET: browser
   },
   stdio: 'inherit'

package/dist/get-manifest.js

@@ -4,7 +4,6 @@ import { pick } from 'lodash-es';
 export default (async ({
   browser
 }) => {
-  var _config$css, _config$css2;
   const packageConfig = await loadPkg();
   const config = await fs.readJson('config.json').catch(() => ({}));
   const iconExists = await fs.exists('assets/icon.png');
@@ -29,10 +28,10 @@ export default (async ({
         ...(typeof config.action === 'object' && config.action)
       }
     }),
-    ...(((await fs.exists('content.js')) || ((_config$css = config.css) === null || _config$css === void 0 ? void 0 : _config$css.length) > 0) && {
+    ...(((await fs.exists('content.js')) || config.css?.length > 0) && {
       content_scripts: [{
         js: ['content.js'],
-        ...(((_config$css2 = config.css) === null || _config$css2 === void 0 ? void 0 : _config$css2.length) > 0 && {
+        ...(config.css?.length > 0 && {
           css: config.css
         }),
         matches: config.matches || ['<all_urls>']
@@ -48,6 +47,6 @@ export default (async ({
         })
       }
     }),
-    ...pick(config, ['permissions', 'browser_specific_settings', 'css'])
+    ...pick(config, ['host_permissions', 'optional_host_permissions', 'optional_permissions', 'permissions', 'browser_specific_settings', 'css'])
   };
 });

package/dist/index.js

@@ -1,16 +1,10 @@
 import depcheckParserSass from '@dword-design/depcheck-parser-sass';
-import endent from "@dword-design/functions/dist/endent.js";
+import { endent } from '@dword-design/functions';
 import packageName from 'depcheck-package-name';
-import { createRequire } from 'module';
 import outputFiles from 'output-files';
-import P from 'path';
-import { fileURLToPath } from 'url';
 import dev from "./dev.js";
 import lint from "./lint.js";
 import prepublishOnly from "./prepublish-only.js";
-const __dirname = P.dirname(fileURLToPath(import.meta.url));
-const isInNodeModules = __dirname.split(P.sep).includes('node_modules');
-const resolver = createRequire(import.meta.url);
 export default (config => ({
   allowedMatches: ['assets', 'background.js', 'content.js', 'config.json', 'icon.png', 'index.spec.js', 'options.html', 'popup.html', 'options.js', 'popup.js', 'model'],
   commands: {
@@ -40,23 +34,37 @@ export default (config => ({
   deployPlugins: [[packageName`@semantic-release/exec`, {
     prepareCmd: `yarn prepublishOnly && yarn prepublishOnly firefox && zip -r dist/chrome dist/chrome.zip && zip -r dist/firefox dist/firefox.zip && git archive --output=dist/firefox-sources.zip HEAD && ${packageName`publish-browser-extension`} --chrome-zip=dist/chrome.zip --firefox-zip=dist/firefox.zip --firefox-sources=dist/firefox-sources.zip`
   }]],
-  editorIgnore: ['.eslintrc.json', 'dist'],
-  gitignore: ['/.eslintrc.json', '/dist'],
+  editorIgnore: ['.eslintrc.json', 'dist', 'vite.config.js'],
+  gitignore: ['/.eslintrc.json', '/dist', '/vite.config.js'],
   isLockFileFixCommitType: true,
   lint,
-  prepare: () => {
-    const configPath = isInNodeModules ? '@dword-design/base-config-web-extension/config' : `./${P.relative(process.cwd(), resolver.resolve('./config.js')).split(P.sep).join('/')}`;
-    outputFiles({
-      '.eslintrc.json': `${JSON.stringify({
-        extends: packageName`@dword-design/eslint-config`
-      }, undefined, 2)}\n`,
-      'vite.config.js': endent`
-        import config from '${configPath}'
+  prepare: () => outputFiles({
+    '.eslintrc.json': `${JSON.stringify({
+      extends: packageName`@dword-design/eslint-config`
+    }, undefined, 2)}\n`,
+    'vite.config.js': endent`
+        import vue from '${packageName`@vitejs/plugin-vue`}'
+        import P from 'path'
+        import { defineConfig } from '${packageName`vite`}'
+        import babel from '${packageName`vite-plugin-babel`}'
+        import eslint from '${packageName`vite-plugin-eslint`}'
+        import webExtension from '${packageName`vite-plugin-web-extension`}'
 
-        export default config
+        export default defineConfig({
+          build: {
+            outDir: P.join('dist', process.env.TARGET),
+          },
+          plugins: [
+            vue(),
+            webExtension({
+              browser: process.env.TARGET,
+              manifest: () => JSON.parse(process.env.MANIFEST),
+              scriptViteConfig: { plugins: [eslint({ fix: true }), babel()] },
+            }),
+          ],
+        })\n
       `
-    });
-  },
+  }),
   readmeInstallString: endent`
     ## Recommended setup
     * Node.js 20.11.1

package/dist/prepublish-only.js

@@ -1,6 +1,10 @@
 import { execaCommand } from 'execa';
-export default (() => browser => execaCommand('vite build', {
+import getManifest from "./get-manifest.js";
+export default (() => async (browser = 'chrome') => execaCommand('vite build', {
   env: {
+    MANIFEST: JSON.stringify(await getManifest({
+      browser
+    })),
     TARGET: browser
   },
   stdio: 'inherit'

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "@dword-design/base-config-web-extension",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "repository": "dword-design/base-config-web-extension",
   "funding": "https://github.com/sponsors/dword-design",
   "license": "MIT",
   "author": "Sebastian Landwehr <info@sebastianlandwehr.com>",
   "type": "module",
-  "exports": {
-    ".": "./dist/index.js",
-    "./config": "./dist/config.js"
-  },
+  "exports": "./dist/index.js",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -28,7 +25,7 @@
   "dependencies": {
     "@dword-design/depcheck-parser-sass": "^4.0.4",
     "@dword-design/eslint-config": "^5.0.1",
-    "@dword-design/functions": "^5.0.27",
+    "@dword-design/functions": "^6.0.0",
     "@semantic-release/exec": "^6.0.3",
     "@vitejs/plugin-vue": "^5.0.4",
     "depcheck-package-name": "^3.0.1",

package/dist/config.js

@@ -1,24 +0,0 @@
-import vue from '@vitejs/plugin-vue';
-import P from 'path';
-import { defineConfig } from 'vite';
-import babel from 'vite-plugin-babel';
-import eslint from 'vite-plugin-eslint';
-import webExtension from 'vite-plugin-web-extension';
-import getManifest from "./get-manifest.js";
-process.env.TARGET = process.env.TARGET || 'chrome';
-export default defineConfig({
-  build: {
-    outDir: P.join('dist', process.env.TARGET)
-  },
-  plugins: [vue(), webExtension({
-    browser: process.env.TARGET,
-    manifest: () => getManifest({
-      browser: process.env.TARGET
-    }),
-    scriptViteConfig: {
-      plugins: [eslint({
-        fix: true
-      }), babel()]
-    }
-  })]
-});