8000 Merge pull request #636 from javascript-obfuscator/dependencies-updat… · sec-js/javascript-obfuscator@d8cd0e2 · GitHub
[go: up one dir, main page]

Skip to content

Commit d8cd0e2

Browse files
authored
Merge pull request javascript-obfuscator#636 from javascript-obfuscator/dependencies-update-20.06
Dependencies update 20.06
2 parents 74489f0 + 57dd4fc commit d8cd0e2

File tree

8 files changed

+473
-548
lines changed

8 files changed

+473
-548
lines changed

.eslintrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,18 @@ module.exports = {
189189
"guard-for-in": "error",
190190
"id-blacklist": "off",
191191
"id-match": "off",
192+
"import/export": "error",
193+
"import/first": "error",
194+
"import/newline-after-import": "error",
195+
"import/no-absolute-path": "error",
196 8000 +
"import/no-cycle": "error",
192197
"import/no-default-export": "error",
193198
"import/no-deprecated": "error",
194199
"import/no-extraneous-dependencies": "error",
195200
"import/no-internal-modules": "error",
201+
"import/no-mutable-exports": "error",
196202
"import/no-unassigned-import": "off",
203+
"import/no-useless-path-segments": "error",
197204
"import/order": "off",
198205
"indent": "off",
199206
"jsdoc/no-types": "off",

dist/index.browser.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.cli.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
"dependencies": {
2424
"@gradecam/tsenum": "1.2.0",
2525
"@nuxtjs/opencollective": "0.2.2",
26-
"acorn": "7.2.0",
27-
"chalk": "4.0.0",
26+
"acorn": "7.3.1",
27+
"chalk": "4.1.0",
2828
"chance": "1.1.6",
2929
"class-validator": "0.12.2",
3030
"commander": "5.1.0",
3131
"escodegen": "1.14.2",
3232
"eslint-scope": "5.1.0",
3333
"estraverse": "5.1.0",
3434
"eventemitter3": "4.0.4",
35-
"fast-deep-equal": "3.1.1",
35+
"fast-deep-equal": "3.1.3",
3636
"inversify": "5.0.1",
3737
"js-string-escape": "1.0.1",
3838
"md5": "2.2.1",
@@ -54,35 +54,35 @@
5454
"@types/mkdirp": "1.0.1",
5555
"@types/mocha": "7.0.2",
5656
"@types/multimatch": "4.0.0",
57-
"@types/node": "14.0.11",
57+
"@types/node": "14.0.13",
5858
"@types/rimraf": "3.0.0",
5959
"@types/sinon": "9.0.4",
6060
"@types/string-template": "1.0.2",
6161
"@types/webpack-env": "1.15.2",
62-
"@typescript-eslint/eslint-plugin": "3.1.0",
63-
"@typescript-eslint/parser": "3.1.0",
62+
"@typescript-eslint/eslint-plugin": "3.3.0",
63+
"@typescript-eslint/parser": "3.3.0",
6464
"chai": "4.2.0",
6565
"coveralls": "3.1.0",
66-
"eslint": "7.2.0",
67-
"eslint-plugin-import": "2.20.2",
68-
"eslint-plugin-jsdoc": "27.0.4",
66+
"eslint": "7.3.0",
67+
"eslint-plugin-import": "2.21.2",
68+
"eslint-plugin-jsdoc": "27.1.2",
6969
"eslint-plugin-no-null": "1.0.2",
7070
"eslint-plugin-prefer-arrow": "1.2.1",
7171
"eslint-plugin-unicorn": "20.1.0",
72-
"fork-ts-checker-notifier-webpack-plugin": "2.0.0",
73-
"fork-ts-checker-webpack-plugin": "4.1.6",
74-
"mocha": "7.2.0",
72+
"fork-ts-checker-notifier-webpack-plugin": "3.0.0",
73+
"fork-ts-checker-webpack-plugin": "5.0.4",
74+
"mocha": "8.0.1",
7575
"nyc": "15.1.0",
7676
"pjson": "1.0.9",
7777
"pre-commit": "1.2.2",
7878
"rimraf": "3.0.2",
7979
"sinon": "9.0.2",
80-
"threads": "1.4.1",
80+
"threads": "1.6.1",
8181
"ts-loader": "7.0.5",
8282
"ts-node": "6.1.0",
8383
"typescript": "3.9.5",
8484
"webpack": "4.43.0",
85-
"webpack-cli": "3.3.11",
85+
"webpack-cli": "3.3.12",
8686
"webpack-node-externals": "1.7.2"
8787
},
8888
"repository": {

test/helpers/evaluateInWorker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { spawn, Thread, Worker } from 'threads/dist';
1+
import { spawn, Thread, Worker } from 'threads';
22

33
/**
44
* @param {string} code

webpack/webpack.node.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,12 @@ module.exports = {
5050
BUILD_TIMESTAMP: Date.now()
5151
}),
5252
new ForkTsCheckerWebpackPlugin({
53-
tsconfig: 'src/tsconfig.node.json',
54-
eslint: true
53+
eslint: {
54+
files: 'src/**/*.ts'
55+
},
56+
typescript: {
57+
configFile: 'src/tsconfig.node.json'
58+
}
5559
}),
5660
new ForkTsCheckerNotifierWebpackPlugin({
5761
skipFirstNotification: true

0 commit comments

Comments
 (0)
0