Fix types after rebase

extension-js · Sep 3, 2024 · 70aaee7 · 70aaee7
1 parent 24fe284
commit 70aaee7
Show file tree

Hide file tree

Showing 6 changed files with 558 additions and 1,194 deletions.
diff --git a/programs/develop/commands/commands-lib/extract-from-zip.ts b/programs/develop/commands/commands-lib/extract-from-zip.ts
@@ -1,4 +1,3 @@
-import fs from 'fs/promises'
 import path from 'path'
 import axios from 'axios'
 import AdmZip from 'adm-zip'

diff --git a/programs/develop/package.json b/programs/develop/package.json
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@rspack/cli": "^1.0.0-beta.5",
-    "@rspack/core": "^1.0.0-beta.5",
+    "@rspack/cli": "^1.0.1",
+    "@rspack/core": "^1.0.1",
     "@swc/core": "^1.7.3",
     "@swc/helpers": "^0.5.12",
     "@types/firefox-webext-browser": "^120.0.4",

diff --git a/programs/develop/webpack/lib/__spec__/utils.spec.ts b/programs/develop/webpack/lib/__spec__/utils.spec.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import {Compilation} from 'webpack'
+import {Compilation} from '@rspack/core'
 import * as utils from '../utils'
 import {Manifest, FilepathList} from '../../webpack-types'
 

diff --git a/.../develop/webpack/plugin-extension/feature-scripts/steps/add-public-path-for-main-world.ts b/.../develop/webpack/plugin-extension/feature-scripts/steps/add-public-path-for-main-world.ts
@@ -1,4 +1,4 @@
-import {type Compiler} from '@rspack/core'
+import {Compiler} from '@rspack/core'
 import {
   type FilepathList,
   type PluginInterface,
@@ -20,7 +20,7 @@ export class AddPublicPathForMainWorld {
     this.includeList = options.includeList || {}
     this.excludeList = options.excludeList || {}
   }
-  public apply(): void {
+  public apply(_compiler: Compiler): void {
     const manifest: Manifest = require(this.manifestPath)
     if (
       manifest.content_scripts?.some(

diff --git a/programs/develop/webpack/plugin-extension/feature-scripts/steps/add-scripts.ts b/programs/develop/webpack/plugin-extension/feature-scripts/steps/add-scripts.ts
@@ -1,4 +1,4 @@
-import {type Compiler} from '@rspack/core'
+import {type EntryObject, type Compiler} from '@rspack/core'
 
 import {type FilepathList, type PluginInterface} from '../../../webpack-types'
 import {getScriptEntries, getCssEntries} from '../scripts-lib/utils'
@@ -17,7 +17,7 @@ export class AddScripts {
   public apply(compiler: Compiler): void {
     const scriptFields = this.includeList || {}
 
-    const newEntries: Record<string, webpack.EntryObject> = {}
+    const newEntries: Record<string, EntryObject> = {}
 
     for (const [feature, scriptPath] of Object.entries(scriptFields)) {
       const scriptImports = getScriptEntries(scriptPath, this.excludeList)