mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2025-12-06 02:30:47 -08:00
chore: try upgrade to webpack@5
blocks by https://github.com/andywer/threads-plugin/issues/37
This commit is contained in:
tiddlygit-test
parent
8759bdf433
commit
dcd9266d70
5 changed files with 2327 additions and 2910 deletions
5124
package-lock.json
generated
5124
package-lock.json
generated
File diff suppressed because it is too large
Load diff
101
package.json
101
package.json
|
|
@ -97,19 +97,19 @@
|
|||
"@dnd-kit/sortable": "1.0.2",
|
||||
"@dnd-kit/utilities": "1.0.2",
|
||||
"@tiddlygit/tiddlywiki": "5.1.24-prerelease.20210331",
|
||||
"authing-js-sdk": "4.19.5",
|
||||
"beautiful-react-hooks": "0.31.1",
|
||||
"authing-js-sdk": "4.20.12",
|
||||
"beautiful-react-hooks": "0.35.0",
|
||||
"bluebird": "3.7.2",
|
||||
"chokidar": "3.5.1",
|
||||
"electron-settings": "4.0.2",
|
||||
"electron-unhandled": "3.0.2",
|
||||
"electron-updater": "4.3.8",
|
||||
"electron-util": "0.15.1",
|
||||
"electron-updater": "4.3.9",
|
||||
"electron-util": "0.16.0",
|
||||
"electron-window-state": "5.0.3",
|
||||
"errio": "1.2.2",
|
||||
"fs-extra": "9.1.0",
|
||||
"fs-extra": "10.0.0",
|
||||
"git-sync-js": "^0.1.7",
|
||||
"i18next": "20.2.2",
|
||||
"i18next": "20.3.1",
|
||||
"i18next-electron-fs-backend": "1.3.6",
|
||||
"i18next-fs-backend": "1.1.1",
|
||||
"intercept-stdout": "0.1.2",
|
||||
|
|
@ -118,83 +118,83 @@
|
|||
"ip": "^1.1.5",
|
||||
"jimp": "0.16.1",
|
||||
"lodash": "4.17.21",
|
||||
"logrocket": "1.1.0",
|
||||
"menubar": "9.0.3",
|
||||
"logrocket": "1.2.2",
|
||||
"menubar": "9.0.4",
|
||||
"node-fetch": "2.6.1",
|
||||
"reflect-metadata": "0.1.13",
|
||||
"regedit": "3.0.3",
|
||||
"rxjs": "7.0.0",
|
||||
"rxjs": "7.1.0",
|
||||
"semver": "7.3.5",
|
||||
"threads": "1.6.4",
|
||||
"type-fest": "1.0.2",
|
||||
"type-fest": "1.1.3",
|
||||
"uuid": "8.3.2",
|
||||
"winston": "3.3.3",
|
||||
"winston-daily-rotate-file": "4.5.2",
|
||||
"winston-daily-rotate-file": "4.5.5",
|
||||
"winston-transport": "4.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@authing/sso": "1.8.4",
|
||||
"@cucumber/cucumber": "7.2.1",
|
||||
"@date-io/date-fns": "2.10.8",
|
||||
"@electron-forge/cli": "6.0.0-beta.54",
|
||||
"@electron-forge/maker-deb": "6.0.0-beta.54",
|
||||
"@electron-forge/maker-rpm": "6.0.0-beta.54",
|
||||
"@electron-forge/maker-squirrel": "6.0.0-beta.54",
|
||||
"@electron-forge/maker-zip": "6.0.0-beta.54",
|
||||
"@electron-forge/plugin-auto-unpack-natives": "6.0.0-beta.54",
|
||||
"@electron-forge/plugin-webpack": "6.0.0-beta.54",
|
||||
"@date-io/date-fns": "2.10.11",
|
||||
"@electron-forge/cli": "6.0.0-beta.57",
|
||||
"@electron-forge/maker-deb": "6.0.0-beta.57",
|
||||
"@electron-forge/maker-rpm": "6.0.0-beta.57",
|
||||
"@electron-forge/maker-squirrel": "6.0.0-beta.57",
|
||||
"@electron-forge/maker-zip": "6.0.0-beta.57",
|
||||
"@electron-forge/plugin-auto-unpack-natives": "6.0.0-beta.57",
|
||||
"@electron-forge/plugin-webpack": "6.0.0-beta.57",
|
||||
"@material-ui/core": "5.0.0-alpha.27",
|
||||
"@material-ui/icons": "5.0.0-alpha.27",
|
||||
"@material-ui/lab": "5.0.0-alpha.27",
|
||||
"@material-ui/styled-engine-sc": "5.0.0-alpha.26",
|
||||
"@nut-tree/nut-js": "1.6.0",
|
||||
"@types/bluebird": "3.5.33",
|
||||
"@types/chai": "4.2.17",
|
||||
"@types/bluebird": "3.5.35",
|
||||
"@types/chai": "4.2.18",
|
||||
"@types/circular-dependency-plugin": "5.0.2",
|
||||
"@types/classnames": "2.3.1",
|
||||
"@types/copy-webpack-plugin": "6.4.2",
|
||||
"@types/copy-webpack-plugin": "8.0.0",
|
||||
"@types/csp-html-webpack-plugin": "3.0.1",
|
||||
"@types/electron-window-state": "2.0.34",
|
||||
"@types/eslint": "7.2.10",
|
||||
"@types/electron-window-state": "5.0.0",
|
||||
"@types/eslint": "7.2.12",
|
||||
"@types/eslint-plugin-prettier": "3.1.0",
|
||||
"@types/file-loader": "5.0.0",
|
||||
"@types/fs-extra": "9.0.11",
|
||||
"@types/i18next-fs-backend": "1.0.0",
|
||||
"@types/intercept-stdout": "0.1.0",
|
||||
"@types/ip": "^1.1.0",
|
||||
"@types/lodash": "4.14.168",
|
||||
"@types/node": "15.0.1",
|
||||
"@types/lodash": "4.14.170",
|
||||
"@types/node": "15.6.1",
|
||||
"@types/node-fetch": "2.5.10",
|
||||
"@types/prettier": "2.2.3",
|
||||
"@types/react": "17.0.4",
|
||||
"@types/react-dom": "17.0.3",
|
||||
"@types/react": "17.0.8",
|
||||
"@types/react-dom": "17.0.5",
|
||||
"@types/react-helmet": "^6.1.1",
|
||||
"@types/rimraf": "3.0.0",
|
||||
"@types/semver": "7.3.5",
|
||||
"@types/simplebar": "5.1.2",
|
||||
"@types/semver": "7.3.6",
|
||||
"@types/simplebar": "5.3.3",
|
||||
"@types/styled-components": "5.1.9",
|
||||
"@types/uuid": "8.3.0",
|
||||
"@typescript-eslint/eslint-plugin": "4.22.0",
|
||||
"@typescript-eslint/parser": "4.22.0",
|
||||
"@typescript-eslint/eslint-plugin": "4.25.0",
|
||||
"@typescript-eslint/parser": "4.25.0",
|
||||
"@zeit/webpack-asset-relocator-loader": "^0.8.0",
|
||||
"ace-builds": "1.4.12",
|
||||
"chai": "4.3.4",
|
||||
"circular-dependency-plugin": "5.2.2",
|
||||
"copy-webpack-plugin": "6.4.1",
|
||||
"copy-webpack-plugin": "9.0.0",
|
||||
"cross-env": "7.0.3",
|
||||
"csp-html-webpack-plugin": "5.1.0",
|
||||
"css-loader": "5.2.4",
|
||||
"date-fns": "2.21.1",
|
||||
"css-loader": "5.2.6",
|
||||
"date-fns": "2.22.1",
|
||||
"electron": "12.0.6",
|
||||
"electron-rebuild": "2.3.5",
|
||||
"eslint": "7.25.0",
|
||||
"eslint": "7.27.0",
|
||||
"eslint-config-prettier": "8.3.0",
|
||||
"eslint-config-standard": "16.0.2",
|
||||
"eslint-config-standard": "16.0.3",
|
||||
"eslint-config-standard-with-typescript": "20.0.0",
|
||||
"eslint-import-resolver-alias": "1.1.2",
|
||||
"eslint-import-resolver-typescript": "2.4.0",
|
||||
"eslint-plugin-html": "6.1.2",
|
||||
"eslint-plugin-import": "2.22.1",
|
||||
"eslint-plugin-import": "2.23.3",
|
||||
"eslint-plugin-node": "11.1.0",
|
||||
"eslint-plugin-prettier": "3.4.0",
|
||||
"eslint-plugin-promise": "5.1.0",
|
||||
|
|
@ -202,36 +202,35 @@
|
|||
"eslint-plugin-react-hooks": "4.2.0",
|
||||
"eslint-plugin-security": "1.4.0",
|
||||
"eslint-plugin-security-node": "1.0.14",
|
||||
"eslint-plugin-unicorn": "31.0.0",
|
||||
"eslint-plugin-unicorn": "32.0.1",
|
||||
"file-loader": "6.2.0",
|
||||
"fork-ts-checker-webpack-plugin": "6.2.5",
|
||||
"graphql-hooks": "5.1.1",
|
||||
"fork-ts-checker-webpack-plugin": "6.2.10",
|
||||
"graphql-hooks": "5.1.2",
|
||||
"if-env": "1.0.4",
|
||||
"image-webpack-loader": "7.0.1",
|
||||
"node-loader": "1.0.3",
|
||||
"prettier": "2.2.1",
|
||||
"node-loader": "2.0.0",
|
||||
"prettier": "2.3.0",
|
||||
"react": "17.0.2",
|
||||
"react-ace": "9.4.0",
|
||||
"react-dom": "17.0.2",
|
||||
"react-helmet": "^6.1.0",
|
||||
"react-i18next": "11.8.15",
|
||||
"react-i18next": "11.10.0",
|
||||
"rimraf": "3.0.2",
|
||||
"simplebar": "6.0.0-beta.4",
|
||||
"simplebar-react": "3.0.0-beta.5",
|
||||
"spectron": "14.0.0",
|
||||
"style-loader": "2.0.0",
|
||||
"styled-components": "5.2.3",
|
||||
"styled-components": "5.3.0",
|
||||
"subscriptions-transport-ws": "0.9.18",
|
||||
"threads-plugin": "1.4.0",
|
||||
"ts-import-plugin": "1.6.7",
|
||||
"ts-loader": "8.2.0",
|
||||
"ts-migrate": "0.1.18",
|
||||
"ts-node": "9.1.1",
|
||||
"ts-loader": "9.2.2",
|
||||
"ts-migrate": "0.1.19",
|
||||
"ts-node": "10.0.0",
|
||||
"typeface-roboto": "1.1.13",
|
||||
"typescript": "4.2.4",
|
||||
"typescript": "4.3.2",
|
||||
"typescript-plugin-styled-components": "1.5.0",
|
||||
"typesync": "0.8.0",
|
||||
"webpack2-externals-plugin": "1.0.0"
|
||||
"typesync": "0.8.0"
|
||||
},
|
||||
"private": false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@ module.exports = {
|
|||
alias: webpackAlias,
|
||||
extensions: ['.js', '.ts', '.jsx', '.tsx', '.json'],
|
||||
},
|
||||
externals: {
|
||||
'@tiddlygit/tiddlywiki': 'commonjs @tiddlygit/tiddlywiki',
|
||||
},
|
||||
node: {
|
||||
__filename: true,
|
||||
__dirname: true,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ const path = require('path');
|
|||
const webpack = require('webpack');
|
||||
const CopyPlugin = require('copy-webpack-plugin');
|
||||
const ThreadsPlugin = require('threads-plugin');
|
||||
const ExternalsPlugin = require('webpack2-externals-plugin');
|
||||
|
||||
exports.main = [
|
||||
// we only need one instance of TsChecker, it will check main and renderer all together
|
||||
|
|
@ -30,11 +29,6 @@ exports.main = [
|
|||
new webpack.DefinePlugin({
|
||||
'process.env.NODE_ENV': `"${process.env.NODE_ENV ?? 'production'}"`,
|
||||
}),
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
new ExternalsPlugin({
|
||||
type: 'commonjs',
|
||||
include: path.join(__dirname, 'node_modules', '@tiddlygit', 'tiddlywiki'),
|
||||
}),
|
||||
new ThreadsPlugin({
|
||||
target: 'electron-node-worker',
|
||||
plugins: ['ExternalsPlugin'],
|
||||
|
|
@ -61,6 +55,4 @@ exports.renderer = [
|
|||
},
|
||||
},
|
||||
),
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
||||
new ThreadsPlugin(),
|
||||
];
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ module.exports = {
|
|||
resolve: {
|
||||
alias: webpackAlias,
|
||||
extensions: ['.js', '.ts', '.jsx', '.tsx', '.css'],
|
||||
fallback: { crypto: false },
|
||||
},
|
||||
output: { chunkFilename: 'main_window/[name].chunk.js', publicPath: '../' },
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue