Skip to content

Commit 892791d

Browse files
tech/upgrades (#1151)
* Upgrade axios * Bump sass-loader from 16.0.7 to 17.0.0 (#1141) Bumps [sass-loader](https://github.com/webpack/sass-loader) from 16.0.7 to 17.0.0. - [Release notes](https://github.com/webpack/sass-loader/releases) - [Changelog](https://github.com/webpack/sass-loader/blob/main/CHANGELOG.md) - [Commits](webpack/sass-loader@v16.0.7...v17.0.0) --- updated-dependencies: - dependency-name: sass-loader dependency-version: 17.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update version * Add mise.toml configuration file * Bump webpack-cli from 6.0.1 to 7.0.3 (#1134) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 6.0.1 to 7.0.3. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/main/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@6.0.1...webpack-cli@7.0.3) --- updated-dependencies: - dependency-name: webpack-cli dependency-version: 7.0.3 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jest from 30.2.0 to 30.4.2 (#1140) Bumps [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) from 30.2.0 to 30.4.2. - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v30.4.2/packages/jest) --- updated-dependencies: - dependency-name: jest dependency-version: 30.4.2 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @babel/preset-react from 7.28.5 to 7.29.7 (#1139) Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.28.5 to 7.29.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-preset-react) --- updated-dependencies: - dependency-name: "@babel/preset-react" dependency-version: 7.29.7 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove engine setting * Upgrade packages to latest version * Upgrade browserlist * Use --config-node-env for setting NODE_ENV * Add webRequest to permissions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 8aee26f commit 892791d

7 files changed

Lines changed: 1452 additions & 1391 deletions

File tree

.babelrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{
2-
"presets": [
3-
["@babel/preset-env", { "useBuiltIns": "entry", "corejs": 3 }],
4-
"@babel/preset-react"
5-
],
2+
"presets": ["@babel/preset-env", "@babel/preset-react"],
63
"plugins": []
74
}

mise.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[tools]
2+
node = "25"

package.json

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,67 @@
11
{
22
"name": "moco-browser-extensions",
33
"description": "Browser plugin for MOCO",
4-
"version": "2.16.0",
4+
"version": "2.17.0",
55
"license": "MIT",
66
"browserslist": [
77
"defaults",
88
"not ie 11"
99
],
1010
"scripts": {
1111
"start": "yarn start:chrome",
12-
"start:chrome": "webpack --config webpack.chrome.config.js --watch --env browser=chrome --env NODE_ENV=development",
13-
"start:firefox": "webpack --config webpack.firefox.config.js --watch --env browser=firefox --env NODE_ENV=development",
12+
"start:chrome": "webpack --config webpack.chrome.config.js --watch --env browser=chrome --config-node-env=development",
13+
"start:firefox": "webpack --config webpack.firefox.config.js --watch --env browser=firefox --config-node-env=development",
1414
"zip:chrome": "zip -qr build/chrome/moco-bx-source.zip . -x .git/\\* build/\\* node_modules/\\* test/\\* .DS_Store",
1515
"zip:firefox": "zip -qr build/firefox/moco-bx-source.zip . -x .git/\\* build/\\* node_modules/\\* test/\\* .DS_Store",
16-
"build:chrome": "webpack --config webpack.chrome.config.js --env browser=chrome --env NODE_ENV=production",
17-
"build:firefox": "webpack --config webpack.firefox.config.js --env browser=firefox --env NODE_ENV=production",
16+
"build:chrome": "webpack --config webpack.chrome.config.js --env browser=chrome --config-node-env production",
17+
"build:firefox": "webpack --config webpack.firefox.config.js --env browser=firefox --config-node-env=production",
1818
"build": "yarn build:firefox && yarn zip:firefox && yarn build:chrome && yarn zip:chrome",
1919
"test": "./node_modules/.bin/jest",
2020
"test:watch": "jest --watch"
2121
},
2222
"dependencies": {
23-
"@vespaiach/axios-fetch-adapter": "^0.3.0",
24-
"axios": "^0.30.3",
23+
"axios": "^1.18.1",
2524
"classnames": "^2.5.1",
26-
"core-js": "^3.49.0",
27-
"date-fns": "^4.1.0",
28-
"dotenv": "^17.3.1",
29-
"focus-trap": "^8.0.0",
30-
"lodash": "^4.17.23",
25+
"date-fns": "^4.4.0",
26+
"dotenv": "^17.4.2",
27+
"focus-trap": "^8.2.2",
28+
"lodash": "^4.18.1",
3129
"prop-types": "^15.6.2",
32-
"react": "^19.2.4",
33-
"react-dom": "^19.2.4",
30+
"react": "^19.2.7",
31+
"react-dom": "^19.2.7",
3432
"react-select": "^5.10.2",
3533
"url-pattern": "^1.0.3",
3634
"webext-bridge": "^6.0.1",
3735
"webextension-polyfill": "^0.12.0"
3836
},
3937
"devDependencies": {
40-
"@babel/core": "^7.29.6",
41-
"@babel/eslint-parser": "^7.28.6",
42-
"@babel/preset-env": "^7.29.0",
43-
"@babel/preset-react": "^7.28.5",
44-
"babel-jest": "^30.2.0",
45-
"babel-loader": "^10.0.0",
38+
"@babel/core": "^8.0.1",
39+
"@babel/eslint-parser": "^8.0.1",
40+
"@babel/preset-env": "^8.0.2",
41+
"@babel/preset-react": "^8.0.1",
42+
"babel-jest": "^30.4.1",
43+
"babel-loader": "^10.1.1",
4644
"clean-webpack-plugin": "^4.0.0",
47-
"copy-webpack-plugin": "^13.0.1",
45+
"copy-webpack-plugin": "^14.0.0",
4846
"copyfiles": "^2.4.1",
4947
"css-loader": "^7.1.4",
50-
"eslint": "^9.39.2",
48+
"eslint": "^10.6.0",
5149
"eslint-config-prettier": "^10.1.8",
52-
"eslint-plugin-jest": "^29.15.0",
53-
"eslint-plugin-prettier": "^5.5.5",
50+
"eslint-plugin-jest": "^29.15.4",
51+
"eslint-plugin-prettier": "^5.5.6",
5452
"eslint-plugin-react": "^7.37.5",
5553
"file-loader": "^6.0.0",
56-
"html-webpack-plugin": "^5.6.6",
57-
"jest": "^30.2.0",
54+
"html-webpack-plugin": "^5.6.7",
55+
"jest": "^30.4.2",
5856
"mini-css-extract-plugin": "^2.10.2",
59-
"prettier": "^3.8.1",
60-
"sass": "^1.97.3",
61-
"sass-loader": "^16.0.7",
57+
"prettier": "^3.9.4",
58+
"sass": "^1.101.0",
59+
"sass-loader": "^17.0.0",
6260
"style-loader": "^4.0.0",
6361
"svg-inline-loader": "^0.8.2",
64-
"uuid": "^13.0.0",
65-
"webpack": "^5.105.3",
66-
"webpack-cli": "^6.0.1",
62+
"uuid": "^14.0.1",
63+
"webpack": "^5.108.3",
64+
"webpack-cli": "^7.1.0",
6765
"zip-webpack-plugin": "^4.0.1"
6866
},
6967
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"

src/js/api/Client.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import axios from "axios"
2-
import fetchAdapter from "@vespaiach/axios-fetch-adapter"
32
import { formatDate, mocoHost, mocoProtocol } from "utils"
43

54
const baseURL = (subdomain) => {
@@ -13,7 +12,7 @@ export default class Client {
1312
constructor({ subdomain, apiKey, version }) {
1413
this.#apiKey = apiKey
1514
this.#client = axios.create({
16-
adapter: fetchAdapter,
15+
adapter: "fetch",
1716
responseType: "json",
1817
baseURL: baseURL(subdomain),
1918
headers: {

src/manifest.firefox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"page": "options.html",
1414
"browser_style": true
1515
},
16-
"permissions": ["https://*.mocoapp.com/*", "storage", "tabs"],
16+
"permissions": ["https://*.mocoapp.com/*", "storage", "tabs", "webRequest"],
1717
"background": {
1818
"page": "background.html"
1919
},

webpack.base.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ module.exports = (env) => {
6666
cleanAfterEveryBuildPatterns: ["!manifest.json", "!*.html"],
6767
}),
6868
new webpack.DefinePlugin({
69-
"process.env.NODE_ENV": JSON.stringify(env.NODE_ENV),
7069
"process.env.USE_LOCAL_MOCO": process.env.USE_LOCAL_MOCO === "true",
7170
}),
7271
new MiniCssExtractPlugin({

0 commit comments

Comments
 (0)