Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
BlobMaster41 committed Sep 20, 2024
1 parent 200064f commit 6ec039c
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 17 deletions.
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,13 @@
"typescript-transform-paths": "^3.3.1",
"url": "^0.11.0",
"varuint-bitcoin": "^1.1.2",
"vm-browserify": "^1.1.2",
"web-vitals": "^2.1.4",
"webpack": "5.76.0",
"webpack-dev-server": "^4.6.0",
"webpack-extension-reloader": "^1.1.4",
"webpack-manifest-plugin": "^4.0.2",
"webpack-merge": "^6.0.1",
"workbox-webpack-plugin": "^6.4.1",
"zxcvbn": "^4.4.2"
},
Expand All @@ -163,6 +165,9 @@
"last 1 safari version"
]
},
"browser": {
"vm": false
},
"jest": {
"roots": [
"<rootDir>/src"
Expand Down
38 changes: 23 additions & 15 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
const webpackMerge = require('webpack-merge');
const commonConfig = require('./build/webpack.common.config');
const configs = {
dev: require('./build/webpack.dev.config'),
pro: require('./build/webpack.pro.config'),
debug: require('./build/webpack.debug.config')
dev: require('./build/webpack.dev.config'),
pro: require('./build/webpack.pro.config'),
debug: require('./build/webpack.debug.config')
};

const config = (env) => {
if (env.config == 'dev') {
process.env.NODE_ENV = 'development';
process.env.BABEL_ENV = 'development';
} else {
process.env.NODE_ENV = 'production';
process.env.BABEL_ENV = 'production';
process.env.TAILWIND_MODE = 'watch';
}
if (env.config == 'dev') {
process.env.NODE_ENV = 'development';
process.env.BABEL_ENV = 'development';
} else {
process.env.NODE_ENV = 'production';
process.env.BABEL_ENV = 'production';
process.env.TAILWIND_MODE = 'watch';
}

if (env.config) {
return webpackMerge.merge(commonConfig(env), configs[env.config]);
}
const toAdd = {
resolve: {
fallback: {
vm: require.resolve('vm-browserify')
}
}
};

return commonConfig(env);
if (env.config) {
return webpackMerge.merge(commonConfig(env), configs[env.config], toAdd);
}

return webpackMerge.merge(commonConfig(env), toAdd);
};

module.exports = config;
13 changes: 11 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16019,7 +16019,7 @@ vinyl@^3.0.0:
replace-ext "^2.0.0"
teex "^1.0.1"

vm-browserify@^1.0.0:
vm-browserify@^1.0.0, vm-browserify@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
Expand Down Expand Up @@ -16210,6 +16210,15 @@ webpack-merge@^5.7.3:
flat "^5.0.2"
wildcard "^2.0.0"

webpack-merge@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
dependencies:
clone-deep "^4.0.1"
flat "^5.0.2"
wildcard "^2.0.1"

webpack-sources@^1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
Expand Down Expand Up @@ -16421,7 +16430,7 @@ wif@^2.0.6:
dependencies:
bs58check "<3.0.0"

wildcard@^2.0.0:
wildcard@^2.0.0, wildcard@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
Expand Down

0 comments on commit 6ec039c

Please sign in to comment.