8000 Merge pull request #485 from javascript-obfuscator/bug/360-no-global-… · sec-js/javascript-obfuscator@2502a5d · GitHub
[go: up one dir, main page]

Skip to content

Commit 2502a5d

Browse files
authored
Merge pull request javascript-obfuscator#485 from javascript-obfuscator/bug/360-no-global-renaming-after-two-imports
Fix bug javascript-obfuscator#360: No Global variable renaming after 2 import declarations
2 parents f355309 + 7a720af commit 2502a5d

File tree

7 files changed

+40
-4
lines changed

7 files changed

+40
-4
lines changed

dist/index.browser.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.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.

src/node-transformers/obfuscating-transformers/ImportDeclarationTransformer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ export class ImportDeclarationTransformer extends AbstractNodeTransformer {
142142
.replace(replaceableIdentifier.name, lexicalScopeNode);
143143

144144
replaceableIdentifier.name = newReplaceableIdentifier.name;
145-
NodeMetadata.set(replaceableIdentifier, { renamedIdentifier: true });
146145
});
147146
}
148147

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import ok1 from 'lib1';
2+
import ok2 from 'lib2';
3+
let test = null;
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { assert } from 'chai';
2+
import { NO_ADDITIONAL_NODES_PRESET } from '../../../src/options/presets/NoCustomNodes';
3+
import { readFileAsString } from '../../helpers/readFileAsString';
4+
import { JavaScriptObfuscator } from '../../../src/JavaScriptObfuscatorFacade';
5+
6+
//
7+
// https://github.com/javascript-obfuscator/javascript-obfuscator/issues/360
8+
//
9+
describe('Issue #360', () => {
10+
describe('Correct renaming globals after two imports', () => {
11+
const codeResult: string = 'import c from\'lib1\';import d from\'lib2\';let e=null;';
12+
13+
let obfuscatedCode: string;
14+
15+
before(() => {
16+
const code: string = readFileAsString(__dirname + '/fixtures/issue360.js');
17+
18+
obfuscatedCode = JavaScriptObfuscator.obfuscate(
19+
code,
20+
{
21+
...NO_ADDITIONAL_NODES_PRESET,
22+
compact: true,
23+
renameGlobals: true,
24+
identifierNamesGenerator: 'mangled'
25+
}
26+
).getObfuscatedCode();
27+
});
28+
29+
it('should return correct result', () => {
30+
assert.equal(obfuscatedCode, codeResult);
31+
});
32+
});
33+
});

test/index.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import './functional-tests/custom-nodes/string-array-nodes/StringArrayRotateFunc
5151
import './functional-tests/custom-nodes/string-array-nodes/StringArrayNode.spec';
5252
import './functional-tests/issues/issue321.spec';
5353
import './functional-tests/issues/issue355.spec';
54+
import './functional-tests/issues/issue360.spec';
5455
import './functional-tests/issues/issue419.spec';
5556
import './functional-tests/issues/issue424.spec';
5657
import './functional-tests/issues/issue437.spec';

0 commit comments

Comments
 (0)
0