@atlaspack/transformer-webextension 2.14.5-canary.35 → 2.14.5-canary.351

package/src/{WebExtensionTransformer.js → WebExtensionTransformer.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {MutableAsset, HMROptions} from '@atlaspack/types';
 
 import {Transformer} from '@atlaspack/plugin';
@@ -39,8 +38,10 @@ const DEP_LOCS = [
 async function collectDependencies(
   asset: MutableAsset,
   program: any,
-  ptrs: {[key: string]: any, ...},
-  hmrOptions: ?HMROptions,
+  ptrs: {
+    [key: string]: any;
+  },
+  hmrOptions?: HMROptions | null,
 ) {
   const hot = Boolean(hmrOptions);
   const fs = asset.fs;
@@ -50,13 +51,13 @@ async function collectDependencies(
   delete program.$schema;
   if (program.default_locale) {
     const locales = path.join(assetDir, '_locales');
-    let err = !(await fs.exists(locales))
+    let err: 'key' | 'value' | null = !(await fs.exists(locales))
       ? 'key'
       : !(await fs.exists(
-          path.join(locales, program.default_locale, 'messages.json'),
-        ))
-      ? 'value'
-      : null;
+            path.join(locales, program.default_locale, 'messages.json'),
+          ))
+        ? 'value'
+        : null;
     if (err) {
       throw new ThrowableDiagnostic({
         diagnostic: [
@@ -151,7 +152,7 @@ async function collectDependencies(
       const loc = {
         filePath,
         ...getJSONSourceLocation(ptrs[`/dictionaries/${dict}`], 'value'),
-      };
+      } as const;
       program.dictionaries[dict] = asset.addURLDependency(dictFile, {
         needsStableName: true,
         loc,
@@ -181,12 +182,12 @@ async function collectDependencies(
     }
   }
   if (program.web_accessible_resources) {
-    let war = [];
+    let war: Array<any> | Array<any | string> = [];
     for (let i = 0; i < program.web_accessible_resources.length; ++i) {
       // TODO: this doesn't support Atlaspack resolution
       const currentEntry = program.web_accessible_resources[i];
       const files = isMV2 ? [currentEntry] : currentEntry.resources;
-      let currentFiles = [];
+      let currentFiles: Array<any> | Array<any | string> = [];
       for (let j = 0; j < files.length; ++j) {
         const globFiles = (
           await glob(path.join(assetDir, files[j]), fs, {})
@@ -218,8 +219,11 @@ async function collectDependencies(
     program.web_accessible_resources = war;
   }
   if (program.declarative_net_request) {
-    const rrs: {|path: string, id: string, enabled: boolean|}[] =
-      program.declarative_net_request?.rule_resources ?? [];
+    const rrs: {
+      path: string;
+      id: string;
+      enabled: boolean;
+    }[] = program.declarative_net_request?.rule_resources ?? [];
     rrs.forEach((resources, i) => {
       resources.path = asset.addURLDependency(resources.path, {
         pipeline: 'raw',
@@ -344,7 +348,7 @@ async function collectDependencies(
       program.permissions.push('scripting');
     }
     const hostPerms = [
-      ...new Set(program.content_scripts?.flatMap((sc) => sc.matches)),
+      ...new Set(program.content_scripts?.flatMap((sc: any) => sc.matches)),
     ];
     if (isMV2) program.permissions = program.permissions.concat(hostPerms);
     else {
@@ -354,7 +358,7 @@ async function collectDependencies(
   }
 }
 
-function cspPatchHMR(policy: ?string, insert?: string) {
+function cspPatchHMR(policy?: string | null, insert?: string) {
   let defaultSrc = "'self'";
   if (insert == null) {
     insert = "'unsafe-eval'";
@@ -381,7 +385,7 @@ function cspPatchHMR(policy: ?string, insert?: string) {
   }
 }
 
-export default (new Transformer({
+export default new Transformer({
   async transform({asset, options}) {
     // Set environment to browser, since web extensions are always used in
     // browsers, and because it avoids delegating extra config to the user
@@ -433,4 +437,4 @@ export default (new Transformer({
     asset.meta.webextEntry = true;
     return [asset];
   },
-}): Transformer);
+}) as Transformer<unknown>;

package/src/{schema.js → schema.ts}

@@ -1,7 +1,6 @@
-// @flow strict-local
 import type {SchemaEntity} from '@atlaspack/utils';
 
-const validateVersion = (ver: string): ?string => {
+const validateVersion = (ver: string): string | null | undefined => {
   const parts = ver.split('.', 5);
   if (parts.length == 5) return 'Extension versions to have at most three dots';
   if (
@@ -33,12 +32,12 @@ const actionProps = {
   },
   default_popup: string,
   default_title: string,
-};
+} as const;
 
 const arrStr = {
   type: 'array',
   items: string,
-};
+} as const;
 
 const browserAction = {
   type: 'object',
@@ -64,7 +63,7 @@ const browserAction = {
     },
   },
   additionalProperties: false,
-};
+} as const;
 
 const warBase = {
   type: 'object',
@@ -75,7 +74,7 @@ const warBase = {
     use_dynamic_url: boolean,
   },
   additionalProperties: false,
-};
+} as const;
 
 const mv2Background = {
   type: 'object',
@@ -85,7 +84,7 @@ const mv2Background = {
     persistent: boolean,
   },
   additionalProperties: false,
-};
+} as const;
 
 const commonProps = {
   $schema: string,
@@ -145,7 +144,7 @@ const commonProps = {
     },
     additionalProperties: false,
   },
-  commands: ({
+  commands: {
     type: 'object',
     properties: {},
     additionalProperties: {
@@ -168,7 +167,7 @@ const commonProps = {
       },
       additionalProperties: false,
     },
-  }: SchemaEntity),
+  } as SchemaEntity,
   content_scripts: {
     type: 'array',
     items: {
@@ -195,7 +194,7 @@ const commonProps = {
       required: ['matches'],
     },
   },
-  declarative_net_request: ({
+  declarative_net_request: {
     type: 'object',
     properties: {
       rule_resources: {
@@ -214,14 +213,14 @@ const commonProps = {
     },
     additionalProperties: false,
     required: ['rule_resources'],
-  }: SchemaEntity),
+  } as SchemaEntity,
   devtools_page: string,
   // looks to be FF only
-  dictionaries: ({
+  dictionaries: {
     type: 'object',
     properties: {},
     additionalProperties: string,
-  }: SchemaEntity),
+  } as SchemaEntity,
   externally_connectable: {
     type: 'object',
     properties: {
@@ -280,11 +279,11 @@ const commonProps = {
     additionalProperties: false,
   },
   offline_enabled: boolean,
-  omnibox: ({
+  omnibox: {
     type: 'object',
     properties: {},
     additionalProperties: string,
-  }: SchemaEntity),
+  } as SchemaEntity,
   optional_host_permissions: arrStr,
   optional_permissions: arrStr,
   // options_page is deprecated
@@ -453,9 +452,9 @@ const commonProps = {
     additionalProperties: false,
   },
   version_name: string,
-};
+} as const;
 
-export const MV3Schema = ({
+export const MV3Schema = {
   type: 'object',
   properties: {
     ...commonProps,
@@ -525,9 +524,9 @@ export const MV3Schema = ({
     },
   },
   required: ['manifest_version', 'name', 'version'],
-}: SchemaEntity);
+} as SchemaEntity;
 
-export const MV2Schema = ({
+export const MV2Schema = {
   type: 'object',
   properties: {
     ...commonProps,
@@ -560,9 +559,9 @@ export const MV2Schema = ({
     web_accessible_resources: arrStr,
   },
   required: ['manifest_version', 'name', 'version'],
-}: SchemaEntity);
+} as SchemaEntity;
 
-export const VersionSchema = ({
+export const VersionSchema = {
   type: 'object',
   properties: {
     $schema: string,
@@ -572,4 +571,4 @@ export const VersionSchema = ({
     },
   },
   required: ['manifest_version'],
-}: SchemaEntity);
+} as SchemaEntity;

package/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    }
+  ]
+}