Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 8335738

Browse files
evmarcopybara-github
authored andcommitted
drop the module = module; emit by tsickle
This was a workaround for JSCompiler warning that module is an unused variable, but we fixed this more appropriately by suppressing that warning. PiperOrigin-RevId: 316150037
1 parent f8f5eb0 commit 8335738

File tree

197 files changed

+2
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+2
-207
lines changed

src/googmodule.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,6 @@ export function commonJsToGoogmoduleTransformer(
613613
'module', /* type */ undefined, moduleVarInitializer)]));
614614
headerStmts.push(modAssign);
615615

616-
if (!host.es5Mode) {
617-
// The module=module assignment suppresses an unused variable warning which may trigger
618-
// depending on the project's compilation flags.
619-
headerStmts.push(ts.createStatement(
620-
ts.createAssignment(ts.createIdentifier('module'), ts.createIdentifier('module'))));
621-
}
622-
623616
// Add `goog.require('tslib');` if not JS transpilation, and it hasn't already been required.
624617
// Rationale:
625618
// TS gets compiled to Development mode (ES5) and Closure mode (~ES6)

test/googmodule_test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ console.log('hello');
7777
// NB: no line break added below.
7878
expectCommonJs('a.ts', `console.log('hello');`, false).toBe(`goog.module('a');
7979
var module = module || { id: 'a.ts' };
80-
module = module;
8180
goog.require('tslib');
8281
console.log('hello');
8382
`);
@@ -124,7 +123,6 @@ console.log(mod_1.x);
124123
/* es5 mode= */ false)
125124
.toBe(`goog.module('a');
126125
var module = module || { id: 'a.ts' };
127-
module = module;
128126
goog.require('tslib');
129127
const mod_1 = goog.require('req.mod');
130128
console.log(mod_1.x);
@@ -389,7 +387,6 @@ console.log(goog_foo_bar_1, relative_1.es6RelativeRequire, relative_2.es6NonRela
389387
expectCommonJs('a.ts', `export {}; console.log('hello'); exports = 1;`, false)
390388
.toBe(`goog.module('a');
391389
var module = module || { id: 'a.ts' };
392-
module = module;
393390
goog.require('tslib');
394391
console.log('hello');
395392
exports = 1;

test_files/abstract/abstract.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.abstract.abstract');
77
var module = module || { id: 'test_files/abstract/abstract.ts' };
8-
module = module;
98
goog.require('tslib');
109
/**
1110
* @abstract

test_files/anon_class/anon_class.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// produce {?}.
99
goog.module('test_files.anon_class.anon_class');
1010
var module = module || { id: 'test_files/anon_class/anon_class.ts' };
11-
module = module;
1211
goog.require('tslib');
1312
/** @type {?} */
1413
const anonClassInstance = new class {

test_files/arrow_fn.untyped/arrow_fn.untyped.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.arrow_fn.untyped.arrow_fn.untyped');
77
var module = module || { id: 'test_files/arrow_fn.untyped/arrow_fn.untyped.ts' };
8-
module = module;
98
goog.require('tslib');
109
/** @type {?} */
1110
var fn3 = (/**

test_files/arrow_fn/arrow_fn.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.arrow_fn.arrow_fn');
77
var module = module || { id: 'test_files/arrow_fn/arrow_fn.ts' };
8-
module = module;
98
goog.require('tslib');
109
/** @type {function(number): number} */
1110
var fn3 = (/**

test_files/async_functions/async_functions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.async_functions.async_functions');
77
var module = module || { id: 'test_files/async_functions/async_functions.ts' };
8-
module = module;
98
const tslib_1 = goog.require('tslib');
109
/**
1110
* Exercises various forms of async functions. When TypeScript downlevels these functions, it

test_files/augment/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.augment.user');
77
var module = module || { id: 'test_files/augment/user.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_angular_1 = goog.requireType("test_files.augment.angular.index");
1110
const ng = goog.require('test_files.augment.angular.index');

test_files/automatic_semicolon_insertion/asi.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.automatic_semicolon_insertion.asi');
77
var module = module || { id: 'test_files/automatic_semicolon_insertion/asi.ts' };
8-
module = module;
98
goog.require('tslib');
109
/**
1110
* @return {function(number): number}

test_files/basic.untyped/basic.untyped.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.basic.untyped.basic.untyped');
77
var module = module || { id: 'test_files/basic.untyped/basic.untyped.ts' };
8-
module = module;
98
goog.require('tslib');
109
// This test is just a random collection of typed code, to
1110
// ensure the output is all with {?} annotations.

test_files/blacklisted_ambient_external_module/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.blacklisted_ambient_external_module.user');
77
var module = module || { id: 'test_files/blacklisted_ambient_external_module/user.ts' };
8-
module = module;
98
goog.require('tslib');
109
class User {
1110
constructor() { this.field = null; }

test_files/cast_extends/cast_extends.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111
goog.module('test_files.cast_extends.cast_extends');
1212
var module = module || { id: 'test_files/cast_extends/cast_extends.ts' };
13-
module = module;
1413
goog.require('tslib');
1514
class Someclass {
1615
}

test_files/class.untyped/class.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
goog.module('test_files.class.untyped.class');
88
var module = module || { id: 'test_files/class.untyped/class.ts' };
9-
module = module;
109
goog.require('tslib');
1110
/**
1211
* @record

test_files/class/class.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
// other options.
1919
goog.module('test_files.class.class');
2020
var module = module || { id: 'test_files/class/class.ts' };
21-
module = module;
2221
goog.require('tslib');
2322
/**
2423
* @record

test_files/clutz.no_externs/import_default.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
goog.module('test_files.clutz.no_externs.import_default');
1010
var module = module || { id: 'test_files/clutz.no_externs/import_default.ts' };
11-
module = module;
1211
goog.require('tslib');
1312
const tsickle_goog_default_export_1 = goog.requireType("default_export");
1413
/** @type {(null|!tsickle_goog_default_export_1)} */

test_files/clutz.no_externs/strip_clutz_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.clutz.no_externs.strip_clutz_type');
77
var module = module || { id: 'test_files/clutz.no_externs/strip_clutz_type.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_space_1 = goog.requireType("some.name.space");
1110
const tsickle_other_2 = goog.requireType("some.other");

test_files/clutz_type_value.no_externs/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
goog.module('test_files.clutz_type_value.no_externs.user');
1010
var module = module || { id: 'test_files/clutz_type_value.no_externs/user.ts' };
11-
module = module;
1211
goog.require('tslib');
1312
const tsickle_goog_type_value_1 = goog.requireType("type_value");
1413
// We expect IFace to show up in the @implements tag.

test_files/coerce/coerce.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.coerce.coerce');
77
var module = module || { id: 'test_files/coerce/coerce.ts' };
8-
module = module;
98
goog.require('tslib');
109
/**
1110
* @param {string} arg

test_files/comments/comments.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.comments.comments');
77
var module = module || { id: 'test_files/comments/comments.ts' };
8-
module = module;
98
goog.require('tslib');
109
class Comments {
1110
}

test_files/conditional_rest_tuple_type/conditional_rest_tuple_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
goog.module('test_files.conditional_rest_tuple_type.conditional_rest_tuple_type');
1010
var module = module || { id: 'test_files/conditional_rest_tuple_type/conditional_rest_tuple_type.ts' };
11-
module = module;
1211
goog.require('tslib');
1312
/**
1413
* @template T

test_files/conditional_type/conditional_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
goog.module('test_files.conditional_type.conditional_type');
88
var module = module || { id: 'test_files/conditional_type/conditional_type.ts' };
9-
module = module;
109
goog.require('tslib');
1110
/** @typedef {?} */
1211
exports.Filter;

test_files/ctors/ctors.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.ctors.ctors');
77
var module = module || { id: 'test_files/ctors/ctors.ts' };
8-
module = module;
98
goog.require('tslib');
109
/** @type {function(new:Document)} */
1110
let x = Document;

test_files/debugger/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// See https://github.com/Microsoft/TypeScript/issues/29459
1010
goog.module('test_files.debugger.user');
1111
var module = module || { id: 'test_files/debugger/user.ts' };
12-
module = module;
1312
goog.require('tslib');
1413
/** @type {(null|!_debugger.Foo)} */
1514
const x = null;

test_files/declare/declare_nondts.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55
*/
66
goog.module('test_files.declare.declare_nondts');
77
var module = module || { id: 'test_files/declare/declare_nondts.ts' };
8-
module = module;
98
goog.require('tslib');

test_files/declare/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.declare.user');
77
var module = module || { id: 'test_files/declare/user.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_declare_module_1 = goog.requireType("test_files.declare.declare_module");
1110
const declare_module_1 = goog.require('test_files.declare.declare_module');

test_files/declare_class_ns/declare_class_ns.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55
*/
66
goog.module('test_files.declare_class_ns.declare_class_ns');
77
var module = module || { id: 'test_files/declare_class_ns/declare_class_ns.ts' };
8-
module = module;
98
goog.require('tslib');

test_files/declare_class_overloads/declare_class_overloads.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@
55
*/
66
goog.module('test_files.declare_class_overloads.declare_class_overloads');
77
var module = module || { id: 'test_files/declare_class_overloads/declare_class_overloads.ts' };
8-
module = module;
98
goog.require('tslib');

test_files/declare_export.untyped/declare_export.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.declare_export.untyped.declare_export');
77
var module = module || { id: 'test_files/declare_export.untyped/declare_export.ts' };
8-
module = module;
98
goog.require('tslib');
109
;
1110
;

test_files/declare_export/declare_export.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// Closure builtin Error type.
1616
goog.module('test_files.declare_export.declare_export');
1717
var module = module || { id: 'test_files/declare_export/declare_export.ts' };
18-
module = module;
1918
goog.require('tslib');
2019
/** @type {!test_files$declare_export$declare_export.ExportDeclaredIf} */
2120
let user1;

test_files/declare_export_dts/user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.declare_export_dts.user');
77
var module = module || { id: 'test_files/declare_export_dts/user.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_declare_export_dts_1 = goog.requireType("test_files.declare_export_dts.declare_export_dts");
1110
/** @type {!tsickle_declare_export_dts_1.InterfaceExportedInDts} */

test_files/declare_import/export_default.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.declare_import.export_default');
77
var module = module || { id: 'test_files/declare_import/export_default.ts' };
8-
module = module;
98
goog.require('tslib');
109
// tslint:disable-next-line:no-default-export
1110
class ExportDefaultClass {

test_files/declare_import/exporter.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.declare_import.exporter');
77
var module = module || { id: 'test_files/declare_import/exporter.ts' };
8-
module = module;
98
goog.require('tslib');
109
class ExportedClass {
1110
}

test_files/decorator/decorator.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
*/
77
goog.module('test_files.decorator.decorator');
88
var module = module || { id: 'test_files/decorator/decorator.ts' };
9-
module = module;
10-
const __tsickle_googReflect = goog.require("goog.reflect");
119
const tslib_1 = goog.require('tslib');
10+
const __tsickle_googReflect = goog.require("goog.reflect");
1211
const tsickle_default_export_1 = goog.requireType("test_files.decorator.default_export");
1312
const tsickle_external_2 = goog.requireType("test_files.decorator.external");
1413
const tsickle_external2_3 = goog.requireType("test_files.decorator.external2");

test_files/decorator/default_export.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.decorator.default_export');
77
var module = module || { id: 'test_files/decorator/default_export.ts' };
8-
module = module;
98
goog.require('tslib');
109
// tslint:disable-next-line:no-default-export
1110
class DefaultExport {

test_files/decorator/external.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.decorator.external');
77
var module = module || { id: 'test_files/decorator/external.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_external2_1 = goog.requireType("test_files.decorator.external2");
1110
const external2_1 = goog.require('test_files.decorator.external2');

test_files/decorator/external2.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.decorator.external2');
77
var module = module || { id: 'test_files/decorator/external2.ts' };
8-
module = module;
98
goog.require('tslib');
109
class OtherClass {
1110
}

test_files/decorator/only_types.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99
goog.module('test_files.decorator.only_types');
1010
var module = module || { id: 'test_files/decorator/only_types.ts' };
11-
module = module;
1211
goog.require('tslib');
1312
/**
1413
* @record

test_files/decorator_nested_scope/decorator_nested_scope.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.decorator_nested_scope.decorator_nested_scope');
77
var module = module || { id: 'test_files/decorator_nested_scope/decorator_nested_scope.ts' };
8-
module = module;
98
goog.require('tslib');
109
class SomeService {
1110
}

test_files/default/default.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.default.default');
77
var module = module || { id: 'test_files/default/default.ts' };
8-
module = module;
98
goog.require('tslib');
109
/**
1110
* @param {number} x

test_files/doc_params/doc_params.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.doc_params.doc_params');
77
var module = module || { id: 'test_files/doc_params/doc_params.ts' };
8-
module = module;
98
goog.require('tslib');
109
class Foo {
1110
/**

test_files/docs_on_ctor_param_properties/docs_on_ctor_param_properties.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.docs_on_ctor_param_properties.docs_on_ctor_param_properties');
77
var module = module || { id: 'test_files/docs_on_ctor_param_properties/docs_on_ctor_param_properties.ts' };
8-
module = module;
98
goog.require('tslib');
109
class Clazz {
1110
/**

test_files/enum.untyped/enum.untyped.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.enum.untyped.enum.untyped');
77
var module = module || { id: 'test_files/enum.untyped/enum.untyped.ts' };
8-
module = module;
98
goog.require('tslib');
109
/** @enum {number} */
1110
const EnumUntypedTest1 = {

test_files/enum/enum.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Line with a missing semicolon should not break the following enum.
88
goog.module('test_files.enum.enum');
99
var module = module || { id: 'test_files/enum/enum.ts' };
10-
module = module;
1110
goog.require('tslib');
1211
/** @type {!Array<?>} */
1312
const EnumTestMissingSemi = [];

test_files/enum/enum_user.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.enum.enum_user');
77
var module = module || { id: 'test_files/enum/enum_user.ts' };
8-
module = module;
98
goog.require('tslib');
109
const tsickle_enum_1 = goog.requireType("test_files.enum.enum");
1110
/**

test_files/enum_ref_import/enum_ref_import.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
goog.module('test_files.enum_ref_import.enum_ref_import');
1717
var module = module || { id: 'test_files/enum_ref_import/enum_ref_import.ts' };
18-
module = module;
1918
goog.require('tslib');
2019
const tsickle_exporter_1 = goog.requireType("test_files.enum_ref_import.exporter");
2120
/** @enum {string} */

test_files/enum_ref_import/exporter.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
goog.module('test_files.enum_ref_import.exporter');
77
var module = module || { id: 'test_files/enum_ref_import/exporter.ts' };
8-
module = module;
98
goog.require('tslib');
109
/** @enum {string} */
1110
const Enum = {

test_files/enum_value_literal_type/enum_value_literal_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// exporting an enum's value, not that.
1010
goog.module('test_files.enum_value_literal_type.enum_value_literal_type');
1111
var module = module || { id: 'test_files/enum_value_literal_type/enum_value_literal_type.ts' };
12-
module = module;
1312
goog.require('tslib');
1413
/** @enum {number} */
1514
const ExportedEnum = {

0 commit comments

Comments
 (0)