From 73da4150627daac040150d653f79d53707c79daf Mon Sep 17 00:00:00 2001 From: kvhnuke <10602065+kvhnuke@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:00:53 -0700 Subject: [PATCH] devop: revert updates --- .../extension/configs/rollup.config.base.ts | 2 +- .../configs/vite/transform-manifest.ts | 2 +- packages/extension/package.json | 6 +-- yarn.lock | 37 +++++++++++++------ 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/packages/extension/configs/rollup.config.base.ts b/packages/extension/configs/rollup.config.base.ts index 6900500c..941dff26 100644 --- a/packages/extension/configs/rollup.config.base.ts +++ b/packages/extension/configs/rollup.config.base.ts @@ -24,7 +24,7 @@ const base: RollupOptions = { replace({ preventAssignment: true, __VERSION__: JSON.stringify(packageJson.version), - __IS_OPERA__: process.env.BROWSER === 'opera-edge', + __IS_OPERA__: process.env.BROWSER === 'opera', }), typescript({ exclude: [/node_modules/], diff --git a/packages/extension/configs/vite/transform-manifest.ts b/packages/extension/configs/vite/transform-manifest.ts index 323c1f53..f2341109 100644 --- a/packages/extension/configs/vite/transform-manifest.ts +++ b/packages/extension/configs/vite/transform-manifest.ts @@ -18,7 +18,7 @@ function transFormManifest(): CrxPlugin { run_at: 'document_start', }, ] as any - if (process.env.BROWSER === 'opera') { + if (process.env.BROWSER !== 'opera') { manifest.content_scripts?.push({ matches: ['file://*/*', 'http://*/*', 'https://*/*'], js: ['scripts/inject.js'], diff --git a/packages/extension/package.json b/packages/extension/package.json index 18064e66..a46e81aa 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -24,7 +24,6 @@ }, "dependencies": { "@amplitude/analytics-browser": "^2.11.8", - "@crxjs/vite-plugin": "^2.0.0-beta.25", "@enkryptcom/extension-bridge": "workspace:^", "@enkryptcom/hw-wallets": "workspace:^", "@enkryptcom/keyring": "workspace:^", @@ -52,7 +51,6 @@ "@polkadot/ui-shared": "^3.10.1", "@polkadot/util": "^13.1.1", "@polkadot/wasm-crypto": "^7.3.2", - "@rollup/plugin-replace": "^5.0.7", "@solana-developers/helpers": "^2.5.6", "@solana/spl-token": "^0.4.8", "@solana/wallet-standard-features": "^1.2.0", @@ -91,10 +89,12 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { - "@rollup/plugin-commonjs": "^26.0.3", + "@crxjs/vite-plugin": "^2.0.0-beta.25", + "@rollup/plugin-commonjs": "^28.0.1", "@rollup/plugin-inject": "^5.0.5", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.3.0", + "@rollup/plugin-replace": "^6.0.1", "@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-typescript": "^12.1.1", "@tsconfig/node20": "^20.1.4", diff --git a/yarn.lock b/yarn.lock index a0a015e7..b1bbcc3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1607,11 +1607,11 @@ __metadata: "@polkadot/ui-shared": ^3.10.1 "@polkadot/util": ^13.1.1 "@polkadot/wasm-crypto": ^7.3.2 - "@rollup/plugin-commonjs": ^26.0.3 + "@rollup/plugin-commonjs": ^28.0.1 "@rollup/plugin-inject": ^5.0.5 "@rollup/plugin-json": ^6.1.0 "@rollup/plugin-node-resolve": ^15.3.0 - "@rollup/plugin-replace": ^5.0.7 + "@rollup/plugin-replace": ^6.0.1 "@rollup/plugin-terser": ^0.4.4 "@rollup/plugin-typescript": ^12.1.1 "@solana-developers/helpers": ^2.5.6 @@ -6341,22 +6341,23 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-commonjs@npm:^26.0.3": - version: 26.0.3 - resolution: "@rollup/plugin-commonjs@npm:26.0.3" +"@rollup/plugin-commonjs@npm:^28.0.1": + version: 28.0.1 + resolution: "@rollup/plugin-commonjs@npm:28.0.1" dependencies: "@rollup/pluginutils": ^5.0.1 commondir: ^1.0.1 estree-walker: ^2.0.2 - glob: ^10.4.1 + fdir: ^6.2.0 is-reference: 1.2.1 magic-string: ^0.30.3 + picomatch: ^4.0.2 peerDependencies: rollup: ^2.68.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - checksum: 6f3ce53054f9b2edfd04a673c7572b5f8ba6b8416da55a7aef670a9b4630caf46e3e8d74b481d05e1d9f9cb98fa96228e23abad10ab2c95a6cc0b1a0065568e6 + checksum: b230b2733b7198fca1b585f6b237ab05f3305ef7a50083caff28baef0fd611c0e90399ea7548181f97a4d0b0372487ca27f81327e355db495396a0fb8934244d languageName: node linkType: hard @@ -6408,9 +6409,9 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-replace@npm:^5.0.7": - version: 5.0.7 - resolution: "@rollup/plugin-replace@npm:5.0.7" +"@rollup/plugin-replace@npm:^6.0.1": + version: 6.0.1 + resolution: "@rollup/plugin-replace@npm:6.0.1" dependencies: "@rollup/pluginutils": ^5.0.1 magic-string: ^0.30.3 @@ -6419,7 +6420,7 @@ __metadata: peerDependenciesMeta: rollup: optional: true - checksum: 67985e3f4056b92a5f6847b9ddf5b8e9aaecefa0e20b96751dcd63c3ca1f907dadad2940f270867dab2e24bc27da6b0e82f0ce6bb20309aa3465869a9d2e3f13 + checksum: fdb9a3c7596547d3fab763efe8ed0cec9c82bed7dadcc2dccbbae2b69651f04109b7d49498c54c3c9bb0df2375f0015927598c9d31c36c3366bd86bc2d0ff60a languageName: node linkType: hard @@ -16023,6 +16024,18 @@ __metadata: languageName: node linkType: hard +"fdir@npm:^6.2.0": + version: 6.4.2 + resolution: "fdir@npm:6.4.2" + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + checksum: 517ad31c495f1c0778238eef574a7818788efaaf2ce1969ffa18c70793e2951a9763dfa2e6720b8fcef615e602a3cbb47f9b8aea9da0b02147579ab36043f22f + languageName: node + linkType: hard + "fdir@npm:^6.4.0": version: 6.4.0 resolution: "fdir@npm:6.4.0" @@ -16758,7 +16771,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.3.10, glob@npm:^10.3.7, glob@npm:^10.4.1": +"glob@npm:^10.3.10, glob@npm:^10.3.7": version: 10.4.5 resolution: "glob@npm:10.4.5" dependencies: