TypeScript improvements

170 files changed, 655 insertions, 815 deletions

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index fbe9ff6cf76..b95e0623ce4 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -16,10 +16,6 @@
 #include <cstring>
 #include <iterator>
 
-#ifdef _WIN32
-#   include <io.h>
-#endif
-
 // TODO: fix this warning once we no longer support VS2013 and earlier
 #if defined(_MSC_VER) && (_MSC_VER >= 1900)
 #    pragma warning(disable:4589) // Constructor of abstract class 'Slice::Type' ignores initializer...
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index 93d461b9ec7..a59ced63bc9 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -633,15 +633,15 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st
         _fileBase = base.substr(pos + 1);
     }
 
-    string file = _fileBase + (typeScript ? ".d.ts" : ".js");
+    string file = _fileBase + ".js";
 
     if(!dir.empty())
     {
         file = dir + '/' + file;
     }
 
-    _out.open(file.c_str());
-    if(!_out)
+    _jsout.open(file.c_str());
+    if(!_jsout)
     {
         ostringstream os;
         os << "cannot open `" << file << "': " << IceUtilInternal::errorToString(errno);
@@ -649,13 +649,30 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st
     }
     FileTracker::instance()->addFile(file);
 
-    printHeader(_out);
-    printGeneratedHeader(_out, _fileBase + ".ice");
+    if(typeScript)
+    {
+        file = _fileBase + ".d.ts";
+
+        if(!dir.empty())
+        {
+            file = dir + '/' + file;
+        }
+
+        _tsout.open(file.c_str());
+        if(!_tsout)
+        {
+            ostringstream os;
+            os << "cannot open `" << file << "': " << IceUtilInternal::errorToString(errno);
+            throw FileException(__FILE__, __LINE__, os.str());
+        }
+        FileTracker::instance()->addFile(file);
+    }
 }
 
 Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const string& /*dir*/, bool typeScript,
                 ostream& out) :
-    _out(out),
+    _jsout(out),
+    _tsout(out),
     _includePaths(includePaths),
     _useStdout(true),
     _typeScript(typeScript)
@@ -666,49 +683,133 @@ Slice::Gen::Gen(const string& base, const vector<string>& includePaths, const st
     {
         _fileBase = base.substr(pos + 1);
     }
-
-    printHeader(_out);
-    printGeneratedHeader(_out, _fileBase + ".ice");
 }
 
 Slice::Gen::~Gen()
 {
-    if(_out.isOpen() || _useStdout)
+    if(_jsout.isOpen() || _useStdout)
+    {
+        _jsout << '\n';
+    }
+
+    if(_tsout.isOpen() || _useStdout)
     {
-        _out << '\n';
+        _tsout << '\n';
     }
 }
 
 void
 Slice::Gen::generate(const UnitPtr& p)
 {
+    string module;
+    DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
+    assert(dc);
+
+    {
+        const string prefix = "js:module:";
+        const string m = dc->findMetaData(prefix);
+        if(!m.empty())
+        {
+            module = m.substr(prefix.size());
+        }
+    }
+
+    if(_useStdout)
+    {
+        _jsout << "\n";
+        _jsout << "/** slice2js: " << _fileBase << ".js generated begin module:\"" << module << "\" **/";
+        _jsout << "\n";
+    }
+    printHeader(_jsout);
+    printGeneratedHeader(_jsout, _fileBase + ".ice");
+
+    //
+    // Check for global "js:module:ice" metadata. If this is set then we are building Ice.
     //
-    // Check for "js:module:ice" metadata. If this
-    // is set then we are building Ice.
+    bool icejs = module == "ice";
+
+    //
+    // Check for global "js:es6-module" metadata. If this is set we are using es6 module mapping
     //
-    ModuleList modules = p->modules();
-    bool icejs = false;
-    for(ModuleList::const_iterator i = modules.begin(); i != modules.end(); i++)
+    bool es6module = dc->findMetaData("js:es6-module") == "js:es6-module";
+
+    _jsout << nl << "/* eslint-disable */";
+    _jsout << nl << "/* jshint ignore: start */";
+    _jsout << nl;
+
+    if(!es6module)
     {
-        if(p->topLevelFile() == (*i)->definitionContext()->filename() &&
-           getModuleMetadata(ContainedPtr::dynamicCast(*i)) == "ice")
+        if(icejs)
         {
-            icejs = true;
-            break;
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip */";
+            _jsout.restoreIndent();
+        }
+        _jsout << nl << "(function(module, require, exports)";
+        _jsout << sb;
+        if(icejs)
+        {
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip-end */";
+            _jsout.restoreIndent();
         }
     }
+    RequireVisitor requireVisitor(_jsout, _includePaths, icejs, es6module);
+    p->visit(&requireVisitor, false);
+    vector<string> seenModules = requireVisitor.writeRequires(p);
+
+    TypesVisitor typesVisitor(_jsout, seenModules, icejs);
+    p->visit(&typesVisitor, false);
 
     //
-    // Check for global "js:es6-module" metadata.
+    // Export the top-level modules.
     //
-    DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
-    assert(dc);
-    StringList globalMetaData = dc->getMetaData();
-    bool es6module = find(globalMetaData.begin(), globalMetaData.end(), "js:es6-module") != globalMetaData.end();
+    ExportVisitor exportVisitor(_jsout, icejs, es6module);
+    p->visit(&exportVisitor, false);
+
+    if(!es6module)
+    {
+        if(icejs)
+        {
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip */";
+            _jsout.restoreIndent();
+        }
+
+        _jsout << eb;
+        _jsout << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined,"
+               << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require :"
+               << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,"
+               << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports :"
+               << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self : window));";
+
+        if(icejs)
+        {
+            _jsout.zeroIndent();
+            _jsout << nl << "/* slice2js browser-bundle-skip-end */";
+            _jsout.restoreIndent();
+        }
+    }
+
+    if(_useStdout)
+    {
+        _jsout << "\n";
+        _jsout << "/** slice2js: generated end **/";
+        _jsout << "\n";
+    }
 
     if(_typeScript)
     {
-        TypeScriptRequireVisitor requireVisitor(_out);
+        if(_useStdout)
+        {
+            _tsout << "\n";
+            _tsout << "/** slice2js: " << _fileBase << ".d.ts generated begin module:\"" << module << "\" **/";
+            _tsout << "\n";
+        }
+        printHeader(_tsout);
+        printGeneratedHeader(_tsout, _fileBase + ".ice");
+
+        TypeScriptRequireVisitor requireVisitor(_tsout, icejs);
         p->visit(&requireVisitor, false);
 
         //
@@ -717,71 +818,18 @@ Slice::Gen::generate(const UnitPtr& p)
         // a type alias when there is an abiguity.
         // see: https://github.com/Microsoft/TypeScript/issues/983
         //
-        TypeScriptAliasVisitor aliasVisitor(_out);
+        TypeScriptAliasVisitor aliasVisitor(_tsout);
         p->visit(&aliasVisitor, false);
         aliasVisitor.writeAlias(p);
 
-        TypeScriptVisitor typeScriptVisitor(_out, requireVisitor.imports());
+        TypeScriptVisitor typeScriptVisitor(_tsout, requireVisitor.imports());
         p->visit(&typeScriptVisitor, false);
-    }
-    else
-    {
-        _out << nl << "/* eslint-disable */";
-        _out << nl << "/* jshint ignore: start */";
-        _out << nl;
-
-        if(!es6module)
-        {
-            if(icejs)
-            {
-                _out.zeroIndent();
-                _out << nl << "/* slice2js browser-bundle-skip */";
-                _out.restoreIndent();
-            }
-            _out << nl << "(function(module, require, exports)";
-            _out << sb;
-            if(icejs)
-            {
-                _out.zeroIndent();
-                _out << nl << "/* slice2js browser-bundle-skip-end */";
-                _out.restoreIndent();
-            }
-        }
-        RequireVisitor requireVisitor(_out, _includePaths, icejs, es6module);
-        p->visit(&requireVisitor, false);
-        vector<string> seenModules = requireVisitor.writeRequires(p);
-
-        TypesVisitor typesVisitor(_out, seenModules, icejs);
-        p->visit(&typesVisitor, false);
 
-        //
-        // Export the top-level modules.
-        //
-        ExportVisitor exportVisitor(_out, icejs, es6module);
-        p->visit(&exportVisitor, false);
-
-        if(!es6module)
+        if(_useStdout)
         {
-            if(icejs)
-            {
-                _out.zeroIndent();
-                _out << nl << "/* slice2js browser-bundle-skip */";
-                _out.restoreIndent();
-            }
-
-            _out << eb;
-            _out << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined,"
-                 << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require :"
-                 << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self.Ice._require : window.Ice._require,"
-                 << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports :"
-                 << nl << " (typeof WorkerGlobalScope !== \"undefined\" && self instanceof WorkerGlobalScope) ? self : window));";
-
-            if(icejs)
-            {
-                _out.zeroIndent();
-                _out << nl << "/* slice2js browser-bundle-skip-end */";
-                _out.restoreIndent();
-            }
+            _tsout << "\n";
+            _tsout << "/** slice2js: generated end **/";
+            _tsout << "\n";
         }
     }
 }
@@ -789,7 +837,15 @@ Slice::Gen::generate(const UnitPtr& p)
 void
 Slice::Gen::closeOutput()
 {
-    _out.close();
+    if(_jsout.isOpen())
+    {
+        _jsout.close();
+    }
+
+    if(_tsout.isOpen())
+    {
+        _tsout.close();
+    }
 }
 
 Slice::Gen::RequireVisitor::RequireVisitor(IceUtilInternal::Output& out, vector<string> includePaths,
@@ -2173,8 +2229,9 @@ Slice::Gen::ExportVisitor::visitModuleStart(const ModulePtr& p)
     return false;
 }
 
-Slice::Gen::TypeScriptRequireVisitor::TypeScriptRequireVisitor(IceUtilInternal::Output& out) :
+Slice::Gen::TypeScriptRequireVisitor::TypeScriptRequireVisitor(IceUtilInternal::Output& out, bool icejs) :
     JsVisitor(out),
+    _icejs(icejs),
     _nextImport(0)
 {
 }
@@ -2264,15 +2321,9 @@ Slice::Gen::TypeScriptRequireVisitor::visitModuleStart(const ModulePtr& p)
     //
     // Import ice module if not building Ice
     //
-    if(UnitPtr::dynamicCast(p->container()))
+    if(UnitPtr::dynamicCast(p->container()) && !_icejs && _imports.empty())
     {
-        const string prefix = "js:module:";
-        string m;
-        findMetaData(prefix, p->getMetaData(), m);
-        if(_imports.empty() && m != "ice")
-        {
-            _imports.push_back(make_pair("ice", nextImportPrefix()));
-        }
+        _imports.push_back(make_pair("ice", nextImportPrefix()));
     }
     return true;
 }
@@ -2592,20 +2643,9 @@ Slice::Gen::TypeScriptVisitor::visitModuleStart(const ModulePtr& p)
     UnitPtr unit = UnitPtr::dynamicCast(p->container());
     if(unit)
     {
-        string module = getModuleMetadata(ContainedPtr::dynamicCast(p));
-
         _out << sp;
-        if(module.empty())
-        {
-            writeImports();
-            _out << nl << "export namespace " << fixId(p->name()) << sb;
-        }
-        else
-        {
-            _out << nl << "declare module \"" << fixId(module) << "\"" << sb;
-            writeImports();
-            _out << nl << "namespace " << fixId(p->name()) << sb;
-        }
+        writeImports();
+        _out << nl << "export namespace " << fixId(p->name()) << sb;
     }
     else
     {
@@ -2615,18 +2655,9 @@ Slice::Gen::TypeScriptVisitor::visitModuleStart(const ModulePtr& p)
 }
 
 void
-Slice::Gen::TypeScriptVisitor::visitModuleEnd(const ModulePtr& p)
+Slice::Gen::TypeScriptVisitor::visitModuleEnd(const ModulePtr&)
 {
     _out << eb; // namespace end
-
-    if(UnitPtr::dynamicCast(p->container()))
-    {
-        string module = getModuleMetadata(ContainedPtr::dynamicCast(p));
-        if(!module.empty())
-        {
-            _out << eb; // module end
-        }
-    }
 }
 
 bool
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h
index bc6a4d132c7..7c588740e39 100644
--- a/cpp/src/slice2js/Gen.h
+++ b/cpp/src/slice2js/Gen.h
@@ -66,7 +66,8 @@ public:
 
 private:
 
-    IceUtilInternal::Output _out;
+    IceUtilInternal::Output _jsout;
+    IceUtilInternal::Output _tsout;
 
     std::vector<std::string> _includePaths;
     std::string _fileBase;
@@ -150,7 +151,7 @@ private:
     {
     public:
 
-        TypeScriptRequireVisitor(::IceUtilInternal::Output&);
+        TypeScriptRequireVisitor(::IceUtilInternal::Output&, bool);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual bool visitClassDefStart(const ClassDefPtr&);
@@ -167,6 +168,7 @@ private:
 
         std::string nextImportPrefix();
 
+        bool _icejs;
         int _nextImport;
         std::map<std::string, std::string> _modulePrefix;
     };
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 002919087f0..b368e7f05e6 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -200,32 +200,16 @@ Slice::JsGenerator::getModuleMetadata(const TypePtr& type)
 }
 
 string
-Slice::JsGenerator::getModuleMetadata(const ContainedPtr& cont)
+Slice::JsGenerator::getModuleMetadata(const ContainedPtr& p)
 {
     //
-    // Traverse to the top-level module.
+    // Check if the file contains the python:pkgdir global metadata.
     //
-    ModulePtr m;
-    ContainedPtr p = cont;
-    while (true)
-    {
-        if(ModulePtr::dynamicCast(p))
-        {
-            m = ModulePtr::dynamicCast(p);
-        }
-
-        ContainerPtr c = p->container();
-        p = ContainedPtr::dynamicCast(c); // This cast fails for Unit.
-        if(!p)
-        {
-            break;
-        }
-    }
-
+    DefinitionContextPtr dc = p->definitionContext();
+    assert(dc);
     const string prefix = "js:module:";
-    string value;
-    findMetaData(prefix, m->getMetaData(), value);
-    return value;
+    const string value = dc->findMetaData(prefix);
+    return value.empty() ? value : value.substr(prefix.size());
 }
 
 bool
diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp
index 062abe2083f..d7cd236135f 100644
--- a/cpp/src/slice2js/Main.cpp
+++ b/cpp/src/slice2js/Main.cpp
@@ -75,7 +75,7 @@ usage(const string& n)
         "--depend-file FILE       Write dependencies to FILE instead of standard output.\n"
         "--validate               Validate command line options.\n"
         "--stdout                 Print generated code to stdout.\n"
-        "--typescript             Generate TypeScript declaration file\n"
+        "--typescript             Generate TypeScript declarations.\n"
         "--depend-json            Generate dependency information in JSON format.\n"
         "--ice                    Allow reserved Ice prefix in Slice identifiers\n"
         "                         deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
@@ -249,6 +249,8 @@ compile(const vector<string>& argv)
         }
     }
 
+    map<string, vector<string> > moduleInfo;
+
     for(vector<string>::const_iterator i = sources.begin(); i != sources.end();)
     {
         PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
@@ -273,7 +275,8 @@ compile(const vector<string>& argv)
             bool last = (++i == sources.end());
 
             if(!icecpp->printMakefileDependencies(os,
-                    depend ? Preprocessor::JavaScript : (dependJSON ? Preprocessor::JavaScriptJSON : Preprocessor::SliceXML),
+                    depend ? Preprocessor::JavaScript : (dependJSON ? Preprocessor::JavaScriptJSON :
+                                                                      Preprocessor::SliceXML),
                     includePaths,
                     "-D__SLICE2JS__"))
             {
@@ -328,6 +331,26 @@ compile(const vector<string>& argv)
                 }
                 else
                 {
+                    DefinitionContextPtr dc = p->findDefinitionContext(p->topLevelFile());
+                    assert(dc);
+                    const string prefix = "js:module:";
+                    string m = dc->findMetaData(prefix);
+                    if(!m.empty())
+                    {
+                        m = m.substr(prefix.size());
+                    }
+
+                    if(moduleInfo.find(m) == moduleInfo.end())
+                    {
+                        vector<string> files;
+                        files.push_back(*i);
+                        moduleInfo[m] = files;
+                    }
+                    else
+                    {
+                        moduleInfo[m].push_back(*i);
+                    }
+
                     try
                     {
                         if(useStdout)
diff --git a/js/.eslintignore b/js/.eslintignore
index d489a5a2b99..227c326be5f 100644
--- a/js/.eslintignore
+++ b/js/.eslintignore
@@ -4,3 +4,4 @@ assets
 gulp/bundle.js
 bin/HttpServer.js
 test/Ice/import/bundle.js
+test/typescript/**/*.js
diff --git a/js/.gitignore b/js/.gitignore
index 4657e5c0156..e0821b4c836 100644
--- a/js/.gitignore
+++ b/js/.gitignore
@@ -6,6 +6,8 @@ server-languages.json
 ICE_LICENSE
 LICENSE
 
+src/index.d.ts
+
 #
 # Babel generated files
 #
@@ -22,3 +24,4 @@ test/es5
 #
 test/typescript/**/*.js
 test/typescript/**/*.d.ts
+test/typescript/**/*.js.map
diff --git a/js/gulp/ts-bundle.js b/js/gulp/ts-bundle.js
deleted file mode 100644
index 44bf2073894..00000000000
--- a/js/gulp/ts-bundle.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-const fs = require("fs");
-const ts = require("typescript");
-const path = require("path");
-const os = require("os");
-const PluginError = require("plugin-error");
-const PLUGIN_NAME = "gulp-ts-bundle";
-const through = require("through2");
-
-const namespaces = [""];
-const definitions = new Map();
-definitions.set("", "");
-let namespace = "";
-
-const copyrightHeader = `// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************`;
-
-function visitFile(file, data)
-{
-    visitNode(ts.createSourceFile(file, data, ts.ScriptTarget.ES7, true));
-}
-
-function exportDefinition(node)
-{
-    let out = definitions.get(namespace);
-    const data = node.getText().trim();
-    if(data != "")
-    {
-        out += os.EOL;
-        if(node.jsDoc)
-        {
-            out += "/**" + os.EOL;
-            for(const l of node.jsDoc[0].comment.split(os.EOL))
-            {
-                out += " * " + l + os.EOL;
-            }
-            out += " */" + os.EOL;
-        }
-        if(data.indexOf("export ") == -1)
-        {
-            out += "export ";
-        }
-        out += data;
-        out += os.EOL;
-        definitions.set(namespace, out);
-    }
-}
-
-function visitNode(node, parent)
-{
-    switch(node.kind)
-    {
-        case ts.SyntaxKind.SourceFile:
-        {
-
-            for(const s of node.referencedFiles)
-            {
-                const f = path.normalize(path.join(path.dirname(node.fileName), s.fileName));
-                visitFile(f, fs.readFileSync(f).toString());
-            }
-            if(node.referencedFiles == 0)
-            {
-                ts.forEachChild(node, child =>
-                                {
-                                    visitNode(child, node);
-                                });
-            }
-            break;
-        }
-        case ts.SyntaxKind.ModuleDeclaration:
-        {
-            if(node.modifiers && node.modifiers.some(n => n.kind == ts.SyntaxKind.DeclareKeyword))
-            {
-                if(node.name.text == "ice")
-                {
-                    ts.forEachChild(node.body, child =>
-                                    {
-                                        visitNode(child, node);
-                                    });
-                }
-            }
-            else if((parent.modifiers && parent.modifiers.some(n => n.kind == ts.SyntaxKind.DeclareKeyword)))
-            {
-                namespace = node.name.text;
-                if(namespaces.indexOf(namespace) == -1)
-                {
-                    namespaces.push(namespace);
-                    definitions.set(namespace, "");
-                }
-                ts.forEachChild(node.body, child =>
-                {
-                    visitNode(child, node);
-                });
-                namespace = "";
-            }
-            else
-            {
-                exportDefinition(node);
-            }
-            break;
-        }
-        case ts.SyntaxKind.ClassDeclaration:
-        {
-            exportDefinition(node);
-            break;
-        }
-        default:
-        {
-            exportDefinition(node);
-            break;
-        }
-    }
-}
-
-class StringBuffer
-{
-    constructor()
-    {
-        // Use new Buffer.alloc(string, encoding) if available, Buffer constructor are deprecated.
-        this.buffer = typeof Buffer.alloc === 'function' ? Buffer.alloc(0) : new Buffer(0);
-    }
-
-    writeLine(data)
-    {
-        data += os.EOL;
-        // Use new Buffer.from(string, encoding) if Buffer.from is avilable, Buffer constructors are deprecated.
-        // NOTE: we don't check for Buffer.from which already exists but only accepts array.
-        this.buffer = Buffer.concat([this.buffer,
-                                     typeof Buffer.from === 'function' ? Buffer.from(data, "utf8") :
-                                     new Buffer(data, "utf8")]);
-    }
-}
-
-function bundle(args)
-{
-    return through.obj(
-        function(file, enc, cb)
-        {
-            if(file.isNull())
-            {
-                return;
-            }
-
-            if(file.isStream())
-            {
-                return this.emit('error', new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-            }
-
-            visitFile(file.path, file.contents.toString());
-            const b = new StringBuffer();
-            b.writeLine(copyrightHeader);
-            b.writeLine("");
-            b.writeLine(`export as namespace ice;`);
-            for(const name of namespaces)
-            {
-                if(name == "")
-                {
-                    b.writeLine(definitions.get(name));
-                }
-                else
-                {
-                    b.writeLine(`export namespace ${name}`);
-                    b.writeLine("{");
-                    b.writeLine(definitions.get(name));
-                    b.writeLine("}");
-                }
-            }
-            file.contents = b.buffer;
-            cb(null, file);
-        });
-}
-
-module.exports = bundle;
diff --git a/js/gulp/ts-formatter.js b/js/gulp/ts-formatter.js
deleted file mode 100644
index f3f67118986..00000000000
--- a/js/gulp/ts-formatter.js
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Base on https://github.com/plgregoire/gulp-typescript-formatter/blob/master/index.js
-//
-
-const PluginError = require("plugin-error");
-const PLUGIN_NAME = "ts-formatter";
-const through = require("through2");
-const formatter = require('typescript-formatter');
-
-function createBuffer(data)
-{
-    return typeof Buffer.from === 'function' ? Buffer.from(data, "utf8") : new Buffer(data, "utf8");
-}
-
-function format(options)
-{
-    return through.obj((file, enc, cb) =>
-                       {
-
-                           if(file.isNull())
-                           {
-                               return cb(null, file);
-                           }
-
-                           if(file.isBuffer())
-                           {
-                               formatter.processString(file.path, String(file.contents), options).then(
-                                   result =>
-                                       {
-                                           file.contents = createBuffer(result.dest);
-                                           cb(null, file);
-                                       });
-                           }
-
-                           if(file.isStream())
-                           {
-                               return cb(new PluginError(PLUGIN_NAME, 'Streaming not supported'));
-                           }
-                       });
-
-}
-
-module.exports = format;
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 30d985764e4..bf83483d784 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -13,7 +13,7 @@
 
 const babel = require("gulp-babel");
 const bundle = require("./gulp/bundle");
-const tsbundle = require("./gulp/ts-bundle");
+
 const concat = require('gulp-concat');
 const del = require("del");
 const extreplace = require("gulp-ext-replace");
@@ -21,6 +21,7 @@ const fs = require("fs");
 const gulp = require("gulp");
 const gzip = require('gulp-gzip');
 const iceBuilder = require('gulp-ice-builder');
+const tsbundle = require("gulp-ice-builder").tsbundle;
 const newer = require('gulp-newer');
 const path = require('path');
 const paths = require('vinyl-paths');
@@ -29,7 +30,7 @@ const rollup = require('rollup');
 const sourcemaps = require('gulp-sourcemaps');
 const terser = require('gulp-terser');
 const tsc = require('gulp-typescript');
-const tsformat = require('./gulp/ts-formatter');
+const rename = require('gulp-rename');
 
 const sliceDir = path.resolve(__dirname, '..', 'slice');
 
@@ -76,7 +77,7 @@ function slice2js(options)
             }
             defaults.iceToolsPath = path.resolve("../cpp/bin", platform, configuration);
         }
-        defaults.iceHome = path.resolve("..");
+        defaults.iceHome = path.resolve(__dirname, '..');
     }
     else if(process.env.ICE_HOME)
     {
@@ -84,16 +85,18 @@ function slice2js(options)
     }
     defaults.include = opts.include || [];
     defaults.args = opts.args || [];
-    return iceBuilder.compile(defaults);
+    defaults.jsbundle = opts.jsbundle;
+    defaults.tsbundle = opts.tsbundle;
+    defaults.jsbundleFormat = opts.jsbundleFormat;
+    return iceBuilder(defaults);
 }
 
 //
 // Tasks to build IceJS Distribution
 //
-const root = path.resolve(path.join('__dirname', '..'));
+const root = path.resolve(__dirname);
 const libs = ["Ice", "Glacier2", "IceStorm", "IceGrid"];
 
-const generateTypeScriptTask = name => name.toLowerCase() + ":generate-typescript";
 const generateTask = name => name.toLowerCase() + ":generate";
 const libTask = name => name.toLowerCase() + ":lib";
 const minLibTask = name => name.toLowerCase() + ":lib-min";
@@ -174,20 +177,16 @@ for(const lib of libs)
 {
     const sources = JSON.parse(fs.readFileSync(path.join(srcDir(lib), "sources.json"), {encoding: "utf8"}));
 
-    gulp.task(generateTypeScriptTask(lib),
-              cb =>
-              {
-                  const sliceSources = sources.typescriptSlice || sources.slice;
-                  pump([gulp.src(sliceSources.map(sliceFile)),
-                        slice2js({dest: srcDir(lib), args: ["--typescript"]}),
-                        gulp.dest(srcDir(lib))], cb);
-              });
-
     gulp.task(generateTask(lib),
               cb =>
               {
                   pump([gulp.src(sources.slice.map(sliceFile)),
-                        slice2js({dest: srcDir(lib)}),
+                        slice2js(
+                            {
+                                jsbundle: false,
+                                tsbundle: false,
+                                args: ["--typescript"]
+                            }),
                         gulp.dest(srcDir(lib))], cb);
               });
 
@@ -266,22 +265,23 @@ for(const lib of libs)
 
     gulp.task(libDistTask(lib),
               gulp.series(
-                  gulp.parallel(generateTypeScriptTask(lib), generateTask(lib)),
+                  generateTask(lib),
                   libTask(lib),
                   gulp.parallel(babelTask(lib), babelLibTask(lib), minLibTask(lib)),
                   babelMinLibTask(lib)));
 }
 
+console.log(path.join(root, "src", "Ice", "*.d.ts"));
 gulp.task("ts:bundle",
           cb =>
           {
-              pump([gulp.src("./src/index.d.ts"),
+              pump([gulp.src(libs.map(lib => path.join(root, "src", lib, "*.d.ts"))),
                     tsbundle(),
-                    tsformat({}),
-                    gulp.dest("lib")], cb);
+                    rename("index.d.ts"),
+                    gulp.dest("src")], cb);
           });
 
-gulp.task("ts:bundle:clean", () => del("./lib/index.d.ts"));
+gulp.task("ts:bundle:clean", () => del("./src/index.d.ts"));
 
 if(useBinDist)
 {
@@ -357,7 +357,7 @@ gulp.task("test:common:generate",
           cb =>
           {
               pump([gulp.src(["../scripts/Controller.ice"]),
-                    slice2js({dest: "test/Common"}),
+                    slice2js(),
                     gulp.dest("test/Common")], cb);
           });
 
@@ -401,7 +401,10 @@ gulp.task("test:import:generate",
                               "test/Ice/import/Demo/Circle.ice",
                               "test/Ice/import/Demo/Square.ice",
                               "test/Ice/import/Demo/Canvas.ice"]),
-                    slice2js({dest: "test/Ice/import/Demo", include: ["test/Ice/import"]}),
+                    slice2js(
+                        {
+                            include: ["test/Ice/import"]
+                        }),
                     gulp.dest("test/Ice/import/Demo")], cb);
           });
 
@@ -443,7 +446,10 @@ for(const name of tests)
               {
                   const outdir = path.join(root, name);
                   pump([gulp.src(path.join(outdir, "*.ice")),
-                        slice2js({include: [outdir], dest: outdir}),
+                        slice2js(
+                            {
+                                include: [outdir]
+                            }),
                         gulp.dest(outdir)], cb);
               });
 
@@ -517,7 +523,6 @@ const tstests = [
 ];
 
 const testTypeScriptSliceCompileJsTask = name => testTask(name) + ":ts:slice-compile-js";
-const testTypeScriptSliceCompileTsTask = name => testTask(name) + ":ts:slice-compile-ts";
 const testTypeScriptCompileTask = name => testTask(name) + ":ts:compile";
 const testTypeScriptBuildTask = name => testTask(name) + ":ts:build";
 const testTypeScriptCleanTask = name => testTask(name) + ":ts:clean";
@@ -529,16 +534,12 @@ for(const name of tstests)
               {
                   const outdir = path.join(root, name);
                   pump([gulp.src(path.join(outdir, "*.ice")),
-                        slice2js({include: [outdir], dest: outdir}),
-                        gulp.dest(outdir)], cb);
-              });
-
-    gulp.task(testTypeScriptSliceCompileTsTask(name),
-              cb =>
-              {
-                  const outdir = path.join(root, name);
-                  pump([gulp.src(path.join(outdir, "*.ice")),
-                        slice2js({include: [outdir], dest: outdir, args: ["--typescript"]}),
+                        slice2js(
+                            {
+                                include: [outdir],
+                                args: ["--typescript"],
+                                jsbundleFormat: "cjs"
+                            }),
                         gulp.dest(outdir)], cb);
               });
 
@@ -559,14 +560,15 @@ for(const name of tstests)
 
     gulp.task(testTypeScriptBuildTask(name),
               gulp.series(
-                  gulp.parallel(testTypeScriptSliceCompileJsTask(name), testTypeScriptSliceCompileTsTask(name)),
+                  testTypeScriptSliceCompileJsTask(name),
                   testTypeScriptCompileTask(name)));
 
     gulp.task(testTypeScriptCleanTask(name),
               cb =>
               {
                   pump([gulp.src([path.join(root, name, "**/*.js"),
-                                  path.join(root, name, "**/*.d.ts")]),
+                                  path.join(root, name, "**/*.d.ts"),
+                                  path.join(root, name, "**/*.js.map")]),
                         paths(del)], cb);
               });
 }
diff --git a/js/package-lock.json b/js/package-lock.json
index 1e24409e1f1..a4a06e8454f 100644
--- a/js/package-lock.json
+++ b/js/package-lock.json
@@ -1913,6 +1913,12 @@
         "domelementtype": "1"
       }
     },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
     "duplexify": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
@@ -2501,12 +2507,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2521,17 +2529,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2648,7 +2659,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2660,6 +2672,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2674,6 +2687,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2681,12 +2695,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -2705,6 +2721,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2785,7 +2802,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2797,6 +2815,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2918,6 +2937,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3235,15 +3255,39 @@
       }
     },
     "gulp-ice-builder": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/gulp-ice-builder/-/gulp-ice-builder-2.0.3.tgz",
-      "integrity": "sha512-AikaBcc1l3aYnNQXBAKXkWQzak0EWoJYnG7DDSpuCH7/6csRrGPO8TxCExCHKLiqOm3QG2umIhGDKVVWqwD+ng==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-ice-builder/-/gulp-ice-builder-3.0.0.tgz",
+      "integrity": "sha512-J0ChNURH/sHcyFdJr21HQEXOfd4TbouoqGEf2ND2g0OYHAf4aVLBpXH7dnKRcDW4lSLqLvmELXWDP3HDYi1zpQ==",
       "dev": true,
       "requires": {
         "fancy-log": "^1.3.2",
         "plugin-error": "^1.0.1",
         "replace-ext": "^1.0.0",
-        "through2": "^2.0.3"
+        "rollup": "^0.67.3",
+        "semver": "^5.6.0",
+        "stream-combiner": "^0.2.2",
+        "through2": "^2.0.3",
+        "typescript": "^3.2.1",
+        "typescript-formatter": "^7.2.2",
+        "vinyl": "^2.2.0"
+      },
+      "dependencies": {
+        "rollup": {
+          "version": "0.67.4",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.4.tgz",
+          "integrity": "sha512-AVuP73mkb4BBMUmksQ3Jw0jTrBTU1i7rLiUYjFxLZGb3xiFmtVEg40oByphkZAsiL0bJC3hRAJUQos/e5EBd+w==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "0.0.39",
+            "@types/node": "*"
+          }
+        },
+        "typescript": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz",
+          "integrity": "sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==",
+          "dev": true
+        }
       }
     },
     "gulp-newer": {
@@ -3309,6 +3353,12 @@
         }
       }
     },
+    "gulp-rename": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
+      "dev": true
+    },
     "gulp-sourcemaps": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz",
@@ -5425,6 +5475,16 @@
         }
       }
     },
+    "stream-combiner": {
+      "version": "0.2.2",
+      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
+      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
+      "dev": true,
+      "requires": {
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4"
+      }
+    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -5551,8 +5611,7 @@
       "version": "2.3.8",
       "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "through2": {
       "version": "2.0.3",
diff --git a/js/package.json b/js/package.json
index fecdeb94fdf..fbd1615671f 100644
--- a/js/package.json
+++ b/js/package.json
@@ -30,8 +30,9 @@
     "gulp-concat": "^2.6.1",
     "gulp-ext-replace": "^0.3.0",
     "gulp-gzip": "^1.4.2",
-    "gulp-ice-builder": "^2.0.3",
+    "gulp-ice-builder": "^3.0.0",
     "gulp-newer": "^1.4.0",
+    "gulp-rename": "^1.4.0",
     "gulp-sourcemaps": "^2.6.4",
     "gulp-terser": "^1.1.5",
     "gulp-typescript": "^5.0.0-alpha.3",
diff --git a/js/src/Glacier2/index.d.ts b/js/src/Glacier2/index.d.ts
deleted file mode 100644
index 3987c582165..00000000000
--- a/js/src/Glacier2/index.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./PermissionsVerifier.d.ts"/>
-/// <reference path="./PermissionsVerifierF.d.ts"/>
-/// <reference path="./Router.d.ts"/>
-/// <reference path="./RouterF.d.ts"/>
-/// <reference path="./Session.d.ts"/>
-/// <reference path="./SSLInfo.d.ts"/>
-
-export namespace Glacier2 {}
-export namespace IceMX {}
-
-declare module "ice" {}
diff --git a/js/src/Ice/.gitignore b/js/src/Ice/.gitignore
index d016235a5fb..7055973191e 100644
--- a/js/src/Ice/.gitignore
+++ b/js/src/Ice/.gitignore
@@ -1,50 +1,79 @@
 # Ignore generated files
-BuiltinSequences.js
 BuiltinSequences.d.ts
+BuiltinSequences.js
 Communicator.d.ts
-Connection.js
+Communicator.js
+CommunicatorF.d.ts
+CommunicatorF.js
 Connection.d.ts
-ConnectionInfo.js
+Connection.js
+ConnectionF.d.ts
+ConnectionF.js
 ConnectionInfo.d.ts
-Current.js
+ConnectionInfo.js
 Current.d.ts
-Endpoint.js
+Current.js
 Endpoint.d.ts
+Endpoint.js
 EndpointF.d.ts
-EndpointInfo.js
+EndpointF.js
 EndpointInfo.d.ts
-EndpointTypes.js
+EndpointInfo.js
 EndpointTypes.d.ts
+EndpointTypes.js
 FacetMap.d.ts
-Identity.js
+FacetMap.js
 Identity.d.ts
+Identity.js
 ImplicitContext.d.ts
-LocalException.js
+ImplicitContext.js
+ImplicitContextF.d.ts
+ImplicitContextF.js
+InstrumentationF.d.ts
+InstrumentationF.js
 LocalException.d.ts
-Locator.js
+LocalException.js
 Locator.d.ts
+Locator.js
+LocatorF.d.ts
+LocatorF.js
 Logger.d.ts
-Metrics.js
+Logger.js
+LoggerF.d.ts
+LoggerF.js
 Metrics.d.ts
+Metrics.js
 ObjectAdapter.d.ts
+ObjectAdapter.js
+ObjectAdapterF.d.ts
+ObjectAdapterF.js
 ObjectFactory.d.ts
-Process.js
+ObjectFactory.js
+PluginF.d.ts
+PluginF.js
 Process.d.ts
+Process.js
+ProcessF.d.ts
+ProcessF.js
 Properties.d.ts
-PropertiesAdmin.js
+Properties.js
 PropertiesAdmin.d.ts
-RemoteLogger.js
+PropertiesAdmin.js
+PropertiesF.d.ts
+PropertiesF.js
 RemoteLogger.d.ts
-Router.js
+RemoteLogger.js
 Router.d.ts
-ServantLocator.js
+Router.js
+RouterF.d.ts
+RouterF.js
 ServantLocator.d.ts
-SliceChecksumDict.js
+ServantLocator.js
+ServantLocatorF.d.ts
+ServantLocatorF.js
 SliceChecksumDict.d.ts
+SliceChecksumDict.js
 ValueFactory.d.ts
-Version.js
+ValueFactory.js
 Version.d.ts
-ConnectionF.js
-EndpointF.js
-ObjectAdapterF.js
-ProcessF.js
+Version.js
diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/CommunicatorI.js
index afc9fe8670e..afc9fe8670e 100644
--- a/js/src/Ice/Communicator.js
+++ b/js/src/Ice/CommunicatorI.js
diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js
index 04049df7d96..84cbc3c5be6 100644
--- a/js/src/Ice/Ice.js
+++ b/js/src/Ice/Ice.js
@@ -13,14 +13,17 @@ module.exports.Ice = _ModuleRegistry.require(module,
     [
         "../Ice/Initialize",
         "../Ice/Communicator",
+        "../Ice/CommunicatorI",
         "../Ice/HashMap",
         "../Ice/Object",
         "../Ice/Value",
         "../Ice/Long",
         "../Ice/Logger",
+        "../Ice/LoggerI",
         "../Ice/ObjectPrx",
         "../Ice/BatchRequestQueue",
         "../Ice/Properties",
+        "../Ice/PropertiesI",
         "../Ice/IdentityUtil",
         "../Ice/ProcessLogger",
         "../Ice/Protocol",
diff --git a/js/src/Ice/Logger.js b/js/src/Ice/LoggerI.js
index 03264b73e57..03264b73e57 100644
--- a/js/src/Ice/Logger.js
+++ b/js/src/Ice/LoggerI.js
diff --git a/js/src/Ice/ProcessLogger.js b/js/src/Ice/ProcessLogger.js
index 2a6b2cae2b0..e1c4dc67eca 100644
--- a/js/src/Ice/ProcessLogger.js
+++ b/js/src/Ice/ProcessLogger.js
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-const Ice = require("../Ice/Logger").Ice;
+const Ice = require("../Ice/LoggerI").Ice;
 const Logger = Ice.Logger;
 
 let processLogger = null;
diff --git a/js/src/Ice/Properties.js b/js/src/Ice/PropertiesI.js
index 098d144beca..098d144beca 100644
--- a/js/src/Ice/Properties.js
+++ b/js/src/Ice/PropertiesI.js
diff --git a/js/src/Ice/index.d.ts b/js/src/Ice/index.d.ts
deleted file mode 100644
index 77dff580102..00000000000
--- a/js/src/Ice/index.d.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Address.d.ts"/>
-/// <reference path="./ArrayUtil.d.ts"/>
-/// <reference path="./AsyncResult.d.ts"/>
-/// <reference path="./AsyncResultBase.d.ts"/>
-/// <reference path="./BuiltinSequences.d.ts"/>
-/// <reference path="./Communicator.d.ts"/>
-/// <reference path="./Connection.d.ts"/>
-/// <reference path="./ConnectionInfo.d.ts"/>
-/// <reference path="./Current.d.ts"/>
-/// <reference path="./Debug.d.ts"/>
-/// <reference path="./Endpoint.d.ts"/>
-/// <reference path="./EndpointF.d.ts"/>
-/// <reference path="./EndpointInfo.d.ts"/>
-/// <reference path="./EndpointTypes.d.ts"/>
-/// <reference path="./Exception.d.ts"/>
-/// <reference path="./FacetMap.d.ts"/>
-/// <reference path="./FormatType.d.ts"/>
-/// <reference path="./HashMap.d.ts"/>
-/// <reference path="./Holder.d.ts"/>
-/// <reference path="./Identity.d.ts"/>
-/// <reference path="./IdentityUtil.d.ts"/>
-/// <reference path="./ImplicitContext.d.ts"/>
-/// <reference path="./Initialize.d.ts"/>
-/// <reference path="./LocalException.d.ts"/>
-/// <reference path="./Locator.d.ts"/>
-/// <reference path="./Logger.d.ts"/>
-/// <reference path="./Long.d.ts"/>
-/// <reference path="./MapUtil.d.ts"/>
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./Object.d.ts"/>
-/// <reference path="./ObjectAdapter.d.ts"/>
-/// <reference path="./ObjectFactory.d.ts"/>
-/// <reference path="./ObjectPrx.d.ts"/>
-/// <reference path="./OptionalFormat.d.ts"/>
-/// <reference path="./Process.d.ts"/>
-/// <reference path="./Promise.d.ts"/>
-/// <reference path="./Properties.d.ts"/>
-/// <reference path="./PropertiesAdmin.d.ts"/>
-/// <reference path="./Protocol.d.ts"/>
-/// <reference path="./RemoteLogger.d.ts"/>
-/// <reference path="./Router.d.ts"/>
-/// <reference path="./ServantLocator.d.ts"/>
-/// <reference path="./SliceChecksumDict.d.ts"/>
-/// <reference path="./Stream.d.ts"/>
-/// <reference path="./UnknownSlicedValue.d.ts"/>
-/// <reference path="./UUID.d.ts"/>
-/// <reference path="./Value.d.ts"/>
-/// <reference path="./ValueFactory.d.ts"/>
-/// <reference path="./Version.d.ts"/>
-
-export namespace Ice {}
-export namespace IceMX {}
-export namespace IceSSL {}
-
-declare module "ice" {}
diff --git a/js/src/Ice/sources.json b/js/src/Ice/sources.json
index 0f6ea95349c..fea3eda4f95 100644
--- a/js/src/Ice/sources.json
+++ b/js/src/Ice/sources.json
@@ -4,31 +4,10 @@
 
     "slice":[
         "Ice/BuiltinSequences.ice",
-        "Ice/Connection.ice",
-        "Ice/ConnectionF.ice",
-        "Ice/Current.ice",
-        "Ice/Endpoint.ice",
-        "Ice/EndpointF.ice",
-        "Ice/EndpointTypes.ice",
-        "Ice/Identity.ice",
-        "Ice/LocalException.ice",
-        "Ice/Locator.ice",
-        "Ice/Metrics.ice",
-        "Ice/ObjectAdapterF.ice",
-        "Ice/Process.ice",
-        "Ice/ProcessF.ice",
-        "Ice/PropertiesAdmin.ice",
-        "Ice/RemoteLogger.ice",
-        "Ice/Router.ice",
-        "Ice/SliceChecksumDict.ice",
-        "Ice/Version.ice",
-        "IceSSL/EndpointInfo.ice",
-        "IceSSL/ConnectionInfo.ice"],
-
-    "typescriptSlice":[
-        "Ice/BuiltinSequences.ice",
         "Ice/Communicator.ice",
+        "Ice/CommunicatorF.ice",
         "Ice/Connection.ice",
+        "Ice/ConnectionF.ice",
         "Ice/Current.ice",
         "Ice/Endpoint.ice",
         "Ice/EndpointF.ice",
@@ -36,23 +15,34 @@
         "Ice/FacetMap.ice",
         "Ice/Identity.ice",
         "Ice/ImplicitContext.ice",
+        "Ice/ImplicitContextF.ice",
+        "Ice/InstrumentationF.ice",
         "Ice/LocalException.ice",
         "Ice/Locator.ice",
+        "Ice/LocatorF.ice",
         "Ice/Logger.ice",
+        "Ice/LoggerF.ice",
         "Ice/Metrics.ice",
         "Ice/ObjectAdapter.ice",
+        "Ice/ObjectAdapterF.ice",
         "Ice/ObjectFactory.ice",
+        "Ice/PluginF.ice",
         "Ice/Process.ice",
+        "Ice/ProcessF.ice",
         "Ice/Properties.ice",
         "Ice/PropertiesAdmin.ice",
+        "Ice/PropertiesF.ice",
         "Ice/RemoteLogger.ice",
         "Ice/Router.ice",
+        "Ice/RouterF.ice",
         "Ice/ServantLocator.ice",
+        "Ice/ServantLocatorF.ice",
         "Ice/SliceChecksumDict.ice",
         "Ice/ValueFactory.ice",
         "Ice/Version.ice",
-        "IceSSL/EndpointInfo.ice",
-        "IceSSL/ConnectionInfo.ice"],
+        "IceSSL/ConnectionInfo.ice",
+        "IceSSL/EndpointInfo.ice"
+    ],
 
     "common": [
         "ACM.js",
@@ -65,29 +55,33 @@
         "BatchRequestQueue.js",
         "Buffer.js",
         "Communicator.js",
+        "CommunicatorI.js",
         "CompactIdRegistry.js",
+        "ConnectRequestHandler.js",
+        "ConnectionF.js",
         "ConnectionI.js",
         "ConnectionRequestHandler.js",
-        "ConnectRequestHandler.js",
         "DefaultsAndOverrides.js",
-        "EndpointI.js",
         "EndpointFactoryManager.js",
+        "EndpointI.js",
         "EnumBase.js",
-        "Exception.js",
         "ExUtil.js",
+        "Exception.js",
         "FormatType.js",
         "HashMap.js",
         "HashUtil.js",
+        "IPEndpointI.js",
         "IdentityUtil.js",
         "ImplicitContextI.js",
         "IncomingAsync.js",
         "Initialize.js",
         "Instance.js",
-        "IPEndpointI.js",
+        "InstrumentationF.js",
         "LocatorInfo.js",
         "LocatorManager.js",
         "LocatorTable.js",
         "Logger.js",
+        "LoggerI.js",
         "Long.js",
         "MapUtil.js",
         "Object.js",
@@ -99,9 +93,11 @@
         "OptionalFormat.js",
         "OutgoingAsync.js",
         "OutgoingConnectionFactory.js",
+        "PluginF.js",
         "ProcessLogger.js",
         "Promise.js",
         "Properties.js",
+        "PropertiesI.js",
         "Property.js",
         "PropertyNames.js",
         "Protocol.js",
@@ -126,23 +122,26 @@
         "ToStringMode.js",
         "TraceLevels.js",
         "TraceUtil.js",
-        "UnknownSlicedValue.js",
         "UUID.js",
+        "UnknownSlicedValue.js",
         "Value.js",
         "ValueFactoryManagerI.js",
         "WSEndpoint.js",
-        "WSEndpointFactory.js"],
+        "WSEndpointFactory.js"
+    ],
 
     "node":[
         "Debug.js",
         "Ice.js",
         "ModuleRegistry.js",
         "TcpTransceiver.js",
-        "TimerUtil.js"],
+        "TimerUtil.js"
+    ],
 
     "browser":[
         "browser/Debug.js",
         "browser/ModuleRegistry.js",
         "browser/TimerUtil.js",
-        "browser/WSTransceiver.js"]
+        "browser/WSTransceiver.js"
+    ]
 }
diff --git a/js/src/IceStorm/index.d.ts b/js/src/IceStorm/index.d.ts
deleted file mode 100644
index 5e6aca0fce9..00000000000
--- a/js/src/IceStorm/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-//
-// Ice version 3.7.1
-//
-
-/// <reference path="./Metrics.d.ts"/>
-/// <reference path="./IceStorm.d.ts"/>
-
-export namespace IceStorm {}
-export namespace IceMX {}
-
-declare module "ice" {}
diff --git a/js/src/index.d.ts b/js/src/index.d.ts
deleted file mode 100644
index 59e42f73c32..00000000000
--- a/js/src/index.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-/// <reference path="./Ice/index.d.ts"/>
-/// <reference path="./Glacier2/index.d.ts"/>
-/// <reference path="./IceStorm/index.d.ts"/>
-/// <reference path="./IceGrid/index.d.ts"/>
-
-export namespace Ice {}
-export namespace IceMX {}
-export namespace IceSSL {}
-export namespace Glacier2 {}
-export namespace IceStorm {}
-export namespace IceGrid {}
-
-declare module "ice" {}
diff --git a/js/test/Common/TestHelper.js b/js/test/Common/TestHelper.js
index b7a7718f38c..f90ecb9e1ee 100644
--- a/js/test/Common/TestHelper.js
+++ b/js/test/Common/TestHelper.js
@@ -10,7 +10,6 @@
 (function(module, require, exports)
 {
     const Ice = require("ice").Ice;
-
     class TestHelper
     {
         getTestEndpoint(...args)
diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js
index f0673d0eaf6..72f85368d30 100644
--- a/js/test/Ice/binding/Client.js
+++ b/js/test/Ice/binding/Client.js
@@ -225,7 +225,7 @@
                 let adapterCount = adapters.length;
                 while(--count > 0)
                 {
-                    let proxies = [];
+                    const proxies = [];
                     if(count == 1)
                     {
                         await com.deactivateObjectAdapter(adapters[4]);
diff --git a/js/test/typescript/Glacier2/router/Callback.ice b/js/test/typescript/Glacier2/router/Callback.ice
index ffa9fa4d225..de76694242b 100644
--- a/js/test/typescript/Glacier2/router/Callback.ice
+++ b/js/test/typescript/Glacier2/router/Callback.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Glacier2/router/Client.ts b/js/test/typescript/Glacier2/router/Client.ts
index 199361e8655..f718d89bb89 100644
--- a/js/test/typescript/Glacier2/router/Client.ts
+++ b/js/test/typescript/Glacier2/router/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice, Glacier2} from "ice";
-import {Test} from "./Callback";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/acm/Client.ts b/js/test/typescript/Ice/acm/Client.ts
index d9a401ce1b8..b45e6621fb4 100644
--- a/js/test/typescript/Ice/acm/Client.ts
+++ b/js/test/typescript/Ice/acm/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/acm/Test.ice b/js/test/typescript/Ice/acm/Test.ice
index ebb38ff166b..21209f8abf8 100644
--- a/js/test/typescript/Ice/acm/Test.ice
+++ b/js/test/typescript/Ice/acm/Test.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["java:package:test.Ice.acm"]]
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/adapterDeactivation/Client.ts b/js/test/typescript/Ice/adapterDeactivation/Client.ts
index 7b1faec40e9..b0f9b4dfcb5 100644
--- a/js/test/typescript/Ice/adapterDeactivation/Client.ts
+++ b/js/test/typescript/Ice/adapterDeactivation/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/adapterDeactivation/Test.ice b/js/test/typescript/Ice/adapterDeactivation/Test.ice
index 16b6ba44592..f334c353921 100644
--- a/js/test/typescript/Ice/adapterDeactivation/Test.ice
+++ b/js/test/typescript/Ice/adapterDeactivation/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/ami/Client.ts b/js/test/typescript/Ice/ami/Client.ts
index f41db630d73..ac9ab1d19b4 100644
--- a/js/test/typescript/Ice/ami/Client.ts
+++ b/js/test/typescript/Ice/ami/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/ami/Test.ice b/js/test/typescript/Ice/ami/Test.ice
index 27785cea8b9..4b3ec7a7e40 100644
--- a/js/test/typescript/Ice/ami/Test.ice
+++ b/js/test/typescript/Ice/ami/Test.ice
@@ -12,6 +12,8 @@
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/Identity.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/binding/Client.ts b/js/test/typescript/Ice/binding/Client.ts
index 8a5838a5dc8..e688b645b99 100644
--- a/js/test/typescript/Ice/binding/Client.ts
+++ b/js/test/typescript/Ice/binding/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/binding/Test.ice b/js/test/typescript/Ice/binding/Test.ice
index b103ed272c5..aff2bc50840 100644
--- a/js/test/typescript/Ice/binding/Test.ice
+++ b/js/test/typescript/Ice/binding/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/defaultValue/Client.ts b/js/test/typescript/Ice/defaultValue/Client.ts
index 4998f670618..d62450298f0 100644
--- a/js/test/typescript/Ice/defaultValue/Client.ts
+++ b/js/test/typescript/Ice/defaultValue/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/defaultValue/Test.ice b/js/test/typescript/Ice/defaultValue/Test.ice
index fb4004d85b9..7af52d11868 100644
--- a/js/test/typescript/Ice/defaultValue/Test.ice
+++ b/js/test/typescript/Ice/defaultValue/Test.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["suppress-warning:deprecated"]] // For enumerator references
+[["suppress-warning:deprecated", "js:es6-module"]] // For enumerator references
 
 module Test
 {
diff --git a/js/test/typescript/Ice/enums/Client.ts b/js/test/typescript/Ice/enums/Client.ts
index 5ac3eef79c7..4330216c32e 100644
--- a/js/test/typescript/Ice/enums/Client.ts
+++ b/js/test/typescript/Ice/enums/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/enums/Test.ice b/js/test/typescript/Ice/enums/Test.ice
index f4395aff480..297b4110e51 100644
--- a/js/test/typescript/Ice/enums/Test.ice
+++ b/js/test/typescript/Ice/enums/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/exceptions/AMDThrowerI.ts b/js/test/typescript/Ice/exceptions/AMDThrowerI.ts
index 588689635fe..abb1f1828f0 100644
--- a/js/test/typescript/Ice/exceptions/AMDThrowerI.ts
+++ b/js/test/typescript/Ice/exceptions/AMDThrowerI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/exceptions/Client.ts b/js/test/typescript/Ice/exceptions/Client.ts
index eeb7339f559..b00e52b69b2 100644
--- a/js/test/typescript/Ice/exceptions/Client.ts
+++ b/js/test/typescript/Ice/exceptions/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/exceptions/Server.ts b/js/test/typescript/Ice/exceptions/Server.ts
index 0d0f844a8bf..0bb3348cc6f 100644
--- a/js/test/typescript/Ice/exceptions/Server.ts
+++ b/js/test/typescript/Ice/exceptions/Server.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 import {ThrowerI} from "./ThrowerI";
 
diff --git a/js/test/typescript/Ice/exceptions/ServerAMD.ts b/js/test/typescript/Ice/exceptions/ServerAMD.ts
index 34e3f6e6a59..a2a00509df5 100644
--- a/js/test/typescript/Ice/exceptions/ServerAMD.ts
+++ b/js/test/typescript/Ice/exceptions/ServerAMD.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 import {AMDThrowerI} from "./AMDThrowerI";
 
diff --git a/js/test/typescript/Ice/exceptions/Test.ice b/js/test/typescript/Ice/exceptions/Test.ice
index 674cb697d1e..308b7da9a8d 100644
--- a/js/test/typescript/Ice/exceptions/Test.ice
+++ b/js/test/typescript/Ice/exceptions/Test.ice
@@ -11,6 +11,8 @@
 
 #include <Ice/BuiltinSequences.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/exceptions/ThrowerI.ts b/js/test/typescript/Ice/exceptions/ThrowerI.ts
index 7f891cfd5bc..c29679f2d8c 100644
--- a/js/test/typescript/Ice/exceptions/ThrowerI.ts
+++ b/js/test/typescript/Ice/exceptions/ThrowerI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/facets/Client.ts b/js/test/typescript/Ice/facets/Client.ts
index b4323beeec0..f10f2bc4a90 100644
--- a/js/test/typescript/Ice/facets/Client.ts
+++ b/js/test/typescript/Ice/facets/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/facets/Server.ts b/js/test/typescript/Ice/facets/Server.ts
index 16ff1221c64..e8a1a47cd1c 100644
--- a/js/test/typescript/Ice/facets/Server.ts
+++ b/js/test/typescript/Ice/facets/Server.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 import {DI, FI, HI, EmptyI} from "./TestI"
 
diff --git a/js/test/typescript/Ice/facets/Test.ice b/js/test/typescript/Ice/facets/Test.ice
index 703499890b2..9b505620f9a 100644
--- a/js/test/typescript/Ice/facets/Test.ice
+++ b/js/test/typescript/Ice/facets/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/facets/TestI.ts b/js/test/typescript/Ice/facets/TestI.ts
index 173c23a2779..f39bc2d4490 100644
--- a/js/test/typescript/Ice/facets/TestI.ts
+++ b/js/test/typescript/Ice/facets/TestI.ts
@@ -8,8 +8,9 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
 const test = TestHelper.test;
 
 export class DI extends Test.D
diff --git a/js/test/typescript/Ice/hold/Client.ts b/js/test/typescript/Ice/hold/Client.ts
index 7e6c3a28c9b..6f8c7965268 100644
--- a/js/test/typescript/Ice/hold/Client.ts
+++ b/js/test/typescript/Ice/hold/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/hold/Test.ice b/js/test/typescript/Ice/hold/Test.ice
index 9d38fed4504..4e80c0c497a 100644
--- a/js/test/typescript/Ice/hold/Test.ice
+++ b/js/test/typescript/Ice/hold/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/info/Client.ts b/js/test/typescript/Ice/info/Client.ts
index 4964517712a..a2454667fdf 100644
--- a/js/test/typescript/Ice/info/Client.ts
+++ b/js/test/typescript/Ice/info/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/info/Test.ice b/js/test/typescript/Ice/info/Test.ice
index 06d4d4d10e6..2fc193ec9c7 100644
--- a/js/test/typescript/Ice/info/Test.ice
+++ b/js/test/typescript/Ice/info/Test.ice
@@ -11,6 +11,8 @@
 
 #include <Ice/Current.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/inheritance/Client.ts b/js/test/typescript/Ice/inheritance/Client.ts
index a758c000c18..09f52ef6b64 100644
--- a/js/test/typescript/Ice/inheritance/Client.ts
+++ b/js/test/typescript/Ice/inheritance/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 import {TestHelper} from "../../../Common/TestHelper"
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/inheritance/InitialI.ts b/js/test/typescript/Ice/inheritance/InitialI.ts
index 05dbd082928..a654226bc5c 100644
--- a/js/test/typescript/Ice/inheritance/InitialI.ts
+++ b/js/test/typescript/Ice/inheritance/InitialI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated";
 
 export class CAI extends Test.MA.CADisp
 {
diff --git a/js/test/typescript/Ice/inheritance/Server.ts b/js/test/typescript/Ice/inheritance/Server.ts
index b1964826bf1..9c8c52629dd 100644
--- a/js/test/typescript/Ice/inheritance/Server.ts
+++ b/js/test/typescript/Ice/inheritance/Server.ts
@@ -8,8 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
 import {InitialI} from "./InitialI";
 
 export class Server extends TestHelper
diff --git a/js/test/typescript/Ice/inheritance/Test.ice b/js/test/typescript/Ice/inheritance/Test.ice
index 073813dfa21..4d02e462a94 100644
--- a/js/test/typescript/Ice/inheritance/Test.ice
+++ b/js/test/typescript/Ice/inheritance/Test.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["suppress-warning:deprecated"]] // For classes with operations
+[["suppress-warning:deprecated", "js:es6-module"]] // For classes with operations
 
 module Test
 {
diff --git a/js/test/typescript/Ice/location/Client.ts b/js/test/typescript/Ice/location/Client.ts
index 177bc2f2aad..d189494971c 100644
--- a/js/test/typescript/Ice/location/Client.ts
+++ b/js/test/typescript/Ice/location/Client.ts
@@ -8,8 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
 const test = TestHelper.test;
 
 export class Client extends TestHelper
diff --git a/js/test/typescript/Ice/location/Test.ice b/js/test/typescript/Ice/location/Test.ice
index 0240e2a8380..3008d4bfae2 100644
--- a/js/test/typescript/Ice/location/Test.ice
+++ b/js/test/typescript/Ice/location/Test.ice
@@ -11,6 +11,8 @@
 
 #include <Ice/Locator.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/number/Client.ts b/js/test/typescript/Ice/number/Client.ts
index af0fd05b4c5..b4b9b31527b 100644
--- a/js/test/typescript/Ice/number/Client.ts
+++ b/js/test/typescript/Ice/number/Client.ts
@@ -8,7 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {TestHelper} from "../../../Common/TestHelper"
+import {TestHelper} from "../../../Common/TestHelper";
+
 const test = TestHelper.test;
 
 export class Client extends TestHelper
diff --git a/js/test/typescript/Ice/objects/Client.ts b/js/test/typescript/Ice/objects/Client.ts
index 5acd9488a22..4995b60e200 100644
--- a/js/test/typescript/Ice/objects/Client.ts
+++ b/js/test/typescript/Ice/objects/Client.ts
@@ -8,8 +8,9 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
+
 const test = TestHelper.test;
 
 export class BI extends Test.B
diff --git a/js/test/typescript/Ice/objects/InitialI.ts b/js/test/typescript/Ice/objects/InitialI.ts
index 8ea6dd4796f..7d6e6f59569 100644
--- a/js/test/typescript/Ice/objects/InitialI.ts
+++ b/js/test/typescript/Ice/objects/InitialI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
+import {Test} from "./generated"
 
 export class BI extends Test.B
 {
diff --git a/js/test/typescript/Ice/objects/Server.ts b/js/test/typescript/Ice/objects/Server.ts
index fba711fa13b..6e7be730cfc 100644
--- a/js/test/typescript/Ice/objects/Server.ts
+++ b/js/test/typescript/Ice/objects/Server.ts
@@ -8,8 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
 import {InitialI} from "./InitialI";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/objects/Test.ice b/js/test/typescript/Ice/objects/Test.ice
index b7b6183b629..12caa1a8a41 100644
--- a/js/test/typescript/Ice/objects/Test.ice
+++ b/js/test/typescript/Ice/objects/Test.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["suppress-warning:deprecated"]] // For classes with operations
+[["suppress-warning:deprecated", "js:es6-module"]] // For classes with operations
 
 module Test
 {
diff --git a/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts b/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts
index d63f9a55e04..e260dab286d 100644
--- a/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts
+++ b/js/test/typescript/Ice/operations/AMDMyDerivedClassI.ts
@@ -6,9 +6,10 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-import {Ice} from "ice";;
-import {Test} from "./Test";
+import {Ice} from "ice";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
+
 const test = TestHelper.test;
 
 export class AMDMyDerivedClassI extends Test.MyDerivedClass
diff --git a/js/test/typescript/Ice/operations/BatchOneways.ts b/js/test/typescript/Ice/operations/BatchOneways.ts
index 8f1b22cb8b1..44178fb0569 100644
--- a/js/test/typescript/Ice/operations/BatchOneways.ts
+++ b/js/test/typescript/Ice/operations/BatchOneways.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/operations/Client.ts b/js/test/typescript/Ice/operations/Client.ts
index 72a9df26e63..96da32b85af 100644
--- a/js/test/typescript/Ice/operations/Client.ts
+++ b/js/test/typescript/Ice/operations/Client.ts
@@ -8,8 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test"
-import {TestHelper} from "../../../Common/TestHelper"
+import {Test} from "./generated";
+import {TestHelper} from "../../../Common/TestHelper";
 import * as Twoways from "./Twoways";
 import * as Oneways from "./Oneways";
 import * as BatchOneways from "./BatchOneways";
diff --git a/js/test/typescript/Ice/operations/MyDerivedClassI.ts b/js/test/typescript/Ice/operations/MyDerivedClassI.ts
index fb50f2be795..9674912996a 100644
--- a/js/test/typescript/Ice/operations/MyDerivedClassI.ts
+++ b/js/test/typescript/Ice/operations/MyDerivedClassI.ts
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 import {Ice} from "ice";;
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/operations/Oneways.ts b/js/test/typescript/Ice/operations/Oneways.ts
index 8fc1ff7e8ef..6b73d585727 100644
--- a/js/test/typescript/Ice/operations/Oneways.ts
+++ b/js/test/typescript/Ice/operations/Oneways.ts
@@ -7,9 +7,10 @@
 //
 // **********************************************************************
 
-import {Ice} from "ice";;
-import {Test} from "./Test";
+import {Ice} from "ice";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
+
 const test = TestHelper.test;
 
 export async function run(communicator:Ice.Communicator, prx:Test.MyClassPrx, bidir:boolean)
diff --git a/js/test/typescript/Ice/operations/Server.ts b/js/test/typescript/Ice/operations/Server.ts
index 8e8c8e52136..c7885f62b03 100644
--- a/js/test/typescript/Ice/operations/Server.ts
+++ b/js/test/typescript/Ice/operations/Server.ts
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-import {Ice} from "ice";;
-import {Test} from "./Test";
+import {Ice} from "ice";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 import {MyDerivedClassI} from "./MyDerivedClassI";
 
diff --git a/js/test/typescript/Ice/operations/ServerAMD.ts b/js/test/typescript/Ice/operations/ServerAMD.ts
index c58a6bc7d14..267fe0a91e5 100644
--- a/js/test/typescript/Ice/operations/ServerAMD.ts
+++ b/js/test/typescript/Ice/operations/ServerAMD.ts
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-import {Ice} from "ice";;
-import {Test} from "./Test";
+import {Ice} from "ice";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 import {AMDMyDerivedClassI} from "./AMDMyDerivedClassI";
 
diff --git a/js/test/typescript/Ice/operations/Test.ice b/js/test/typescript/Ice/operations/Test.ice
index bd6b3d157ab..ad2e87189f9 100644
--- a/js/test/typescript/Ice/operations/Test.ice
+++ b/js/test/typescript/Ice/operations/Test.ice
@@ -11,6 +11,8 @@
 
 #include <Ice/Current.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/operations/Twoways.ts b/js/test/typescript/Ice/operations/Twoways.ts
index c9b707410ae..aec904c83e6 100644
--- a/js/test/typescript/Ice/operations/Twoways.ts
+++ b/js/test/typescript/Ice/operations/Twoways.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 const test = TestHelper.test;
 
diff --git a/js/test/typescript/Ice/optional/AMDInitialI.ts b/js/test/typescript/Ice/optional/AMDInitialI.ts
index f7eb1a4ed0f..3d571499d8c 100644
--- a/js/test/typescript/Ice/optional/AMDInitialI.ts
+++ b/js/test/typescript/Ice/optional/AMDInitialI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 
 export class AMDInitialI extends Test.Initial
 {
diff --git a/js/test/typescript/Ice/optional/Client.ts b/js/test/typescript/Ice/optional/Client.ts
index 198981b5d9c..3f6cd96ba79 100644
--- a/js/test/typescript/Ice/optional/Client.ts
+++ b/js/test/typescript/Ice/optional/Client.ts
@@ -8,9 +8,8 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
-import {Test as ClientPrivate} from "./ClientPrivate";
 
 const test = TestHelper.test;
 const ArrayUtil = Ice.ArrayUtil;
@@ -295,7 +294,7 @@ export class Client extends TestHelper
         test(g.gg2Opt.a.equals(new Ice.Long(0, 20)));
         test(g.gg1.a == "gg1");
 
-        const init2 = ClientPrivate.Initial2Prx.uncheckedCast(initial);
+        const init2 = Test.Initial2Prx.uncheckedCast(initial);
         await init2.opVoid(5, "test");
         out.writeLine("ok");
 
diff --git a/js/test/typescript/Ice/optional/ClientPrivate.ice b/js/test/typescript/Ice/optional/ClientPrivate.ice
index 63f984e1ba8..6127221a038 100644
--- a/js/test/typescript/Ice/optional/ClientPrivate.ice
+++ b/js/test/typescript/Ice/optional/ClientPrivate.ice
@@ -11,6 +11,8 @@
 
 #include <Test.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/optional/InitialI.ts b/js/test/typescript/Ice/optional/InitialI.ts
index cd3cd220526..34cceac8e1d 100644
--- a/js/test/typescript/Ice/optional/InitialI.ts
+++ b/js/test/typescript/Ice/optional/InitialI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 
 export class InitialI extends Test.Initial
 {
diff --git a/js/test/typescript/Ice/optional/Server.ts b/js/test/typescript/Ice/optional/Server.ts
index 813a6468a5e..dd8f9a09b74 100644
--- a/js/test/typescript/Ice/optional/Server.ts
+++ b/js/test/typescript/Ice/optional/Server.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 import {InitialI} from "./InitialI";
 
diff --git a/js/test/typescript/Ice/optional/ServerAMD.ts b/js/test/typescript/Ice/optional/ServerAMD.ts
index dde7e5b1d55..1f2fc1b77e9 100644
--- a/js/test/typescript/Ice/optional/ServerAMD.ts
+++ b/js/test/typescript/Ice/optional/ServerAMD.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 import {AMDInitialI} from "./AMDInitialI";
 
diff --git a/js/test/typescript/Ice/optional/Test.ice b/js/test/typescript/Ice/optional/Test.ice
index f6b5dd5eff2..4ba04424919 100644
--- a/js/test/typescript/Ice/optional/Test.ice
+++ b/js/test/typescript/Ice/optional/Test.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["suppress-warning:deprecated"]]
+[["suppress-warning:deprecated", "js:es6-module"]]
 
 module Test
 {
diff --git a/js/test/typescript/Ice/proxy/Client.ts b/js/test/typescript/Ice/proxy/Client.ts
index 5733241d51a..7bac973c63e 100644
--- a/js/test/typescript/Ice/proxy/Client.ts
+++ b/js/test/typescript/Ice/proxy/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/proxy/Test.ice b/js/test/typescript/Ice/proxy/Test.ice
index f6a3233d3cf..a8eb3cf30c4 100644
--- a/js/test/typescript/Ice/proxy/Test.ice
+++ b/js/test/typescript/Ice/proxy/Test.ice
@@ -11,6 +11,8 @@
 
 #include <Ice/Current.ice>
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/retry/Client.ts b/js/test/typescript/Ice/retry/Client.ts
index ab29719b1ed..f0ddef4d39a 100644
--- a/js/test/typescript/Ice/retry/Client.ts
+++ b/js/test/typescript/Ice/retry/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/retry/Test.ice b/js/test/typescript/Ice/retry/Test.ice
index 25059836e84..24d1b522099 100644
--- a/js/test/typescript/Ice/retry/Test.ice
+++ b/js/test/typescript/Ice/retry/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/scope/Client.ts b/js/test/typescript/Ice/scope/Client.ts
index d733301e57c..95159641296 100644
--- a/js/test/typescript/Ice/scope/Client.ts
+++ b/js/test/typescript/Ice/scope/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test, Inner} from "./Test";
+import {Test, Inner} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/scope/Test.ice b/js/test/typescript/Ice/scope/Test.ice
index e40116886d3..721e051ab5e 100644
--- a/js/test/typescript/Ice/scope/Test.ice
+++ b/js/test/typescript/Ice/scope/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
     struct S
diff --git a/js/test/typescript/Ice/servantLocator/Client.ts b/js/test/typescript/Ice/servantLocator/Client.ts
index cafd33e0ef3..a600223a3eb 100644
--- a/js/test/typescript/Ice/servantLocator/Client.ts
+++ b/js/test/typescript/Ice/servantLocator/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts b/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts
index 0a21a765016..a6f4db898c4 100644
--- a/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts
+++ b/js/test/typescript/Ice/servantLocator/ServantLocatorI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestI} from "./TestI";
 import {TestHelper} from "../../../Common/TestHelper";
 
diff --git a/js/test/typescript/Ice/servantLocator/Server.ts b/js/test/typescript/Ice/servantLocator/Server.ts
index 16ca611fd5a..4da4173020c 100644
--- a/js/test/typescript/Ice/servantLocator/Server.ts
+++ b/js/test/typescript/Ice/servantLocator/Server.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 import {TestI} from "./TestI";
 import {TestActivationI} from "./TestActivationI";
diff --git a/js/test/typescript/Ice/servantLocator/Test.ice b/js/test/typescript/Ice/servantLocator/Test.ice
index 8b79c510ab6..1125eb7ae68 100644
--- a/js/test/typescript/Ice/servantLocator/Test.ice
+++ b/js/test/typescript/Ice/servantLocator/Test.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["java:package:test.Ice.servantLocator"]]
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/servantLocator/TestActivationI.ts b/js/test/typescript/Ice/servantLocator/TestActivationI.ts
index a7f4f11426d..092d2b2f31b 100644
--- a/js/test/typescript/Ice/servantLocator/TestActivationI.ts
+++ b/js/test/typescript/Ice/servantLocator/TestActivationI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {ServantLocatorI} from "./ServantLocatorI";
 
 export class TestActivationI extends Test.TestActivation
diff --git a/js/test/typescript/Ice/servantLocator/TestI.ts b/js/test/typescript/Ice/servantLocator/TestI.ts
index 1b33b3043ff..a0b6605d4bb 100644
--- a/js/test/typescript/Ice/servantLocator/TestI.ts
+++ b/js/test/typescript/Ice/servantLocator/TestI.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 
 export class TestI extends Test.TestIntf
 {
diff --git a/js/test/typescript/Ice/slicing/exceptions/Client.ts b/js/test/typescript/Ice/slicing/exceptions/Client.ts
index 985e9bdc34d..47ebaa69cb5 100644
--- a/js/test/typescript/Ice/slicing/exceptions/Client.ts
+++ b/js/test/typescript/Ice/slicing/exceptions/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/slicing/exceptions/Test.ice b/js/test/typescript/Ice/slicing/exceptions/Test.ice
index c6d5710bd49..8ab33febdd1 100644
--- a/js/test/typescript/Ice/slicing/exceptions/Test.ice
+++ b/js/test/typescript/Ice/slicing/exceptions/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/slicing/objects/Client.ts b/js/test/typescript/Ice/slicing/objects/Client.ts
index 7acdeede413..3b202d668de 100644
--- a/js/test/typescript/Ice/slicing/objects/Client.ts
+++ b/js/test/typescript/Ice/slicing/objects/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/slicing/objects/Test.ice b/js/test/typescript/Ice/slicing/objects/Test.ice
index 031a0ef2034..ec0d0c025d6 100644
--- a/js/test/typescript/Ice/slicing/objects/Test.ice
+++ b/js/test/typescript/Ice/slicing/objects/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Ice/stream/Client.ts b/js/test/typescript/Ice/stream/Client.ts
index 130c13778da..8606b637af3 100644
--- a/js/test/typescript/Ice/stream/Client.ts
+++ b/js/test/typescript/Ice/stream/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/stream/Test.ice b/js/test/typescript/Ice/stream/Test.ice
index b7e11d87a36..fe1b9823b08 100644
--- a/js/test/typescript/Ice/stream/Test.ice
+++ b/js/test/typescript/Ice/stream/Test.ice
@@ -12,7 +12,7 @@
 //
 // Suppress invalid metadata warnings
 //
-[["suppress-warning:invalid-metadata, deprecated"]]
+[["suppress-warning:invalid-metadata, deprecated", "js:es6-module"]]
 
 #include <Ice/BuiltinSequences.ice>
 
diff --git a/js/test/typescript/Ice/timeout/Client.ts b/js/test/typescript/Ice/timeout/Client.ts
index 3a920293f9b..d1bd3a41790 100644
--- a/js/test/typescript/Ice/timeout/Client.ts
+++ b/js/test/typescript/Ice/timeout/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Ice/timeout/Test.ice b/js/test/typescript/Ice/timeout/Test.ice
index 87655462f50..81587d8a95c 100644
--- a/js/test/typescript/Ice/timeout/Test.ice
+++ b/js/test/typescript/Ice/timeout/Test.ice
@@ -9,6 +9,8 @@
 
 #pragma once
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/js/test/typescript/Slice/macros/Client.ts b/js/test/typescript/Slice/macros/Client.ts
index f50de29f293..f369ad9eb44 100644
--- a/js/test/typescript/Slice/macros/Client.ts
+++ b/js/test/typescript/Slice/macros/Client.ts
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 import {Ice} from "ice";
-import {Test} from "./Test";
+import {Test} from "./generated";
 import {TestHelper} from "../../../Common/TestHelper";
 
 const test = TestHelper.test;
diff --git a/js/test/typescript/Slice/macros/Test.ice b/js/test/typescript/Slice/macros/Test.ice
index d3ebc7f181d..9f6f1b70853 100644
--- a/js/test/typescript/Slice/macros/Test.ice
+++ b/js/test/typescript/Slice/macros/Test.ice
@@ -25,6 +25,8 @@
 #   define NODEFAULT(X) /**/
 #endif
 
+[["js:es6-module"]]
+
 module Test
 {
 
diff --git a/slice/Glacier2/Metrics.ice b/slice/Glacier2/Metrics.ice
index a20f462257f..a00dfcbbe11 100644
--- a/slice/Glacier2/Metrics.ice
+++ b/slice/Glacier2/Metrics.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",  "python:pkgdir:Glacier2"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Metrics.ice>
@@ -18,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX", "js:module:ice"]
+["objc:prefix:ICEMX"]
 module IceMX
 {
 
diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice
index 18521b620d1..c1a8d78a7bd 100644
--- a/slice/Glacier2/PermissionsVerifier.ice
+++ b/slice/Glacier2/PermissionsVerifier.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Glacier2/SSLInfo.ice>
@@ -18,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Glacier2/PermissionsVerifierF.ice b/slice/Glacier2/PermissionsVerifierF.ice
index 46695f5d937..698b857815e 100644
--- a/slice/Glacier2/PermissionsVerifierF.ice
+++ b/slice/Glacier2/PermissionsVerifierF.ice
@@ -9,13 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice
index d1f2a0c0066..bfe11a9ded9 100644
--- a/slice/Glacier2/Router.ice
+++ b/slice/Glacier2/Router.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/Router.ice>
@@ -28,7 +29,7 @@
  * security solution that is both non-intrusive and easy to configure.
  *
  **/
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Glacier2/RouterF.ice b/slice/Glacier2/RouterF.ice
index 7e261550daa..3eb6d547b57 100644
--- a/slice/Glacier2/RouterF.ice
+++ b/slice/Glacier2/RouterF.ice
@@ -9,13 +9,14 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice
index 3a131c49ecd..bf35b4cb8ac 100644
--- a/slice/Glacier2/SSLInfo.ice
+++ b/slice/Glacier2/SSLInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -18,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice
index 708d7d7ba85..3aa2ac5c953 100644
--- a/slice/Glacier2/Session.ice
+++ b/slice/Glacier2/Session.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API", "python:pkgdir:Glacier2"]]
+[["cpp:header-ext:h", "cpp:dll-export:GLACIER2_API", "cpp:doxygen:include:Glacier2/Glacier2.h", "objc:header-dir:objc", "objc:dll-export:GLACIER2_API",
+  "python:pkgdir:Glacier2", "js:module:ice"]]
 [["cpp:include:Glacier2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -20,7 +21,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:GLACIER2", "js:module:ice"]
+["objc:prefix:GLACIER2"]
 module Glacier2
 {
 
diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice
index 8beb033540d..399c712d99d 100644
--- a/slice/Ice/BuiltinSequences.ice
+++ b/slice/Ice/BuiltinSequences.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice
index 84adde8dc9a..f3e33e91ebc 100644
--- a/slice/Ice/Communicator.ice
+++ b/slice/Ice/Communicator.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/InstrumentationF.ice>
@@ -38,7 +38,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/CommunicatorF.ice b/slice/Ice/CommunicatorF.ice
index c02a81ab534..5be2f5b5f6c 100644
--- a/slice/Ice/CommunicatorF.ice
+++ b/slice/Ice/CommunicatorF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice
index e526446416c..6a7d4ee984a 100644
--- a/slice/Ice/Connection.ice
+++ b/slice/Ice/Connection.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Identity.ice>
@@ -19,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice
index c9970429981..796c65e645b 100644
--- a/slice/Ice/ConnectionF.ice
+++ b/slice/Ice/ConnectionF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice
index 93ef9093220..553b3b4d705 100644
--- a/slice/Ice/Current.ice
+++ b/slice/Ice/Current.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/ConnectionF.ice>
@@ -20,7 +20,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice
index 05d0a57c45f..f24bc442d31 100644
--- a/slice/Ice/Endpoint.ice
+++ b/slice/Ice/Endpoint.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/Version.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -19,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice
index 1b87a257ffd..5c4797fee28 100644
--- a/slice/Ice/EndpointF.ice
+++ b/slice/Ice/EndpointF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice
index 661c5c9efe0..a4a8c2affeb 100644
--- a/slice/Ice/EndpointTypes.ice
+++ b/slice/Ice/EndpointTypes.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/FacetMap.ice b/slice/Ice/FacetMap.ice
index 6280cae1723..e2989257155 100644
--- a/slice/Ice/FacetMap.ice
+++ b/slice/Ice/FacetMap.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice
index 1723b9a545c..07426cca3e5 100644
--- a/slice/Ice/Identity.ice
+++ b/slice/Ice/Identity.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ImplicitContext.ice b/slice/Ice/ImplicitContext.ice
index a24c323bdc3..7327c96b63e 100644
--- a/slice/Ice/ImplicitContext.ice
+++ b/slice/Ice/ImplicitContext.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/LocalException.ice>
 #include <Ice/Current.ice>
@@ -18,7 +18,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ImplicitContextF.ice b/slice/Ice/ImplicitContextF.ice
index 5be5b367036..06a4a12e6be 100644
--- a/slice/Ice/ImplicitContextF.ice
+++ b/slice/Ice/ImplicitContextF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Instrumentation.ice b/slice/Ice/Instrumentation.ice
index ac9533048f8..9a80f1013b0 100644
--- a/slice/Ice/Instrumentation.ice
+++ b/slice/Ice/Instrumentation.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/EndpointF.ice>
 #include <Ice/ConnectionF.ice>
@@ -19,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/InstrumentationF.ice b/slice/Ice/InstrumentationF.ice
index 2c3596a10d0..dd909909cd8 100644
--- a/slice/Ice/InstrumentationF.ice
+++ b/slice/Ice/InstrumentationF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice
index 7b67c1efbd2..22a3ae46a34 100644
--- a/slice/Ice/LocalException.ice
+++ b/slice/Ice/LocalException.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Version.ice>
@@ -19,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice
index 00cb45acf93..581d6145e73 100644
--- a/slice/Ice/Locator.ice
+++ b/slice/Ice/Locator.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/Identity.ice>
 #include <Ice/Process.ice>
@@ -18,7 +18,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/LocatorF.ice b/slice/Ice/LocatorF.ice
index 1d349f4dc85..c9fd596d97f 100644
--- a/slice/Ice/LocatorF.ice
+++ b/slice/Ice/LocatorF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Logger.ice b/slice/Ice/Logger.ice
index 84e8021ddb1..c851c3c1cb6 100644
--- a/slice/Ice/Logger.ice
+++ b/slice/Ice/Logger.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/LoggerF.ice b/slice/Ice/LoggerF.ice
index 1ddbbb874ef..71ff781d04f 100644
--- a/slice/Ice/LoggerF.ice
+++ b/slice/Ice/LoggerF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice
index ae039219c3f..0b4f1395648 100644
--- a/slice/Ice/Metrics.ice
+++ b/slice/Ice/Metrics.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -24,7 +24,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEMX", "js:module:ice"]
+["objc:prefix:ICEMX"]
 module IceMX
 {
 
diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice
index af02273c9be..2c5a8f32027 100644
--- a/slice/Ice/ObjectAdapter.ice
+++ b/slice/Ice/ObjectAdapter.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/CommunicatorF.ice>
 #include <Ice/ServantLocatorF.ice>
@@ -22,7 +22,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice
index 41a6bf42ea7..dba742387bb 100644
--- a/slice/Ice/ObjectAdapterF.ice
+++ b/slice/Ice/ObjectAdapterF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ObjectFactory.ice b/slice/Ice/ObjectFactory.ice
index b15a1cdbdde..c9df2286ad0 100644
--- a/slice/Ice/ObjectFactory.ice
+++ b/slice/Ice/ObjectFactory.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Plugin.ice b/slice/Ice/Plugin.ice
index a4d4c1eb940..e5687ae8e07 100644
--- a/slice/Ice/Plugin.ice
+++ b/slice/Ice/Plugin.ice
@@ -10,7 +10,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/LoggerF.ice>
 #include <Ice/BuiltinSequences.ice>
@@ -19,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/PluginF.ice b/slice/Ice/PluginF.ice
index 65f27ad3d90..73f0ce1e718 100644
--- a/slice/Ice/PluginF.ice
+++ b/slice/Ice/PluginF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice
index bcb87364610..084689832d8 100644
--- a/slice/Ice/Process.ice
+++ b/slice/Ice/Process.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice
index 395340da35a..83825c00daf 100644
--- a/slice/Ice/ProcessF.ice
+++ b/slice/Ice/ProcessF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice
index 215ee7191ad..237e68a2251 100644
--- a/slice/Ice/Properties.ice
+++ b/slice/Ice/Properties.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/PropertiesAdmin.ice>
 
@@ -17,7 +17,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/PropertiesAdmin.ice b/slice/Ice/PropertiesAdmin.ice
index 4153a3693d8..c4e925cd3cb 100644
--- a/slice/Ice/PropertiesAdmin.ice
+++ b/slice/Ice/PropertiesAdmin.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -17,7 +17,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/PropertiesF.ice b/slice/Ice/PropertiesF.ice
index edbb2051cda..5a1c9d05fd3 100644
--- a/slice/Ice/PropertiesF.ice
+++ b/slice/Ice/PropertiesF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/RemoteLogger.ice b/slice/Ice/RemoteLogger.ice
index 1f2c9a6b497..adaeb823ce4 100644
--- a/slice/Ice/RemoteLogger.ice
+++ b/slice/Ice/RemoteLogger.ice
@@ -11,14 +11,14 @@
 
 #include <Ice/BuiltinSequences.ice>
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 [["cpp:include:list"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice
index 731a4b79536..61a8242f84a 100644
--- a/slice/Ice/Router.ice
+++ b/slice/Ice/Router.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/BuiltinSequences.ice>
 
@@ -17,7 +17,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/RouterF.ice b/slice/Ice/RouterF.ice
index 3801ab05ad7..668a55b953a 100644
--- a/slice/Ice/RouterF.ice
+++ b/slice/Ice/RouterF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ServantLocator.ice b/slice/Ice/ServantLocator.ice
index 13ef696c708..fb4a9cef42e 100644
--- a/slice/Ice/ServantLocator.ice
+++ b/slice/Ice/ServantLocator.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #include <Ice/ObjectAdapterF.ice>
 #include <Ice/Current.ice>
@@ -18,7 +18,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ServantLocatorF.ice b/slice/Ice/ServantLocatorF.ice
index 342a00d6159..b7ec1ea7363 100644
--- a/slice/Ice/ServantLocatorF.ice
+++ b/slice/Ice/ServantLocatorF.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice
index 365cfa16dbc..290357d042c 100644
--- a/slice/Ice/SliceChecksumDict.ice
+++ b/slice/Ice/SliceChecksumDict.ice
@@ -9,13 +9,14 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API",
+  "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/ValueFactory.ice b/slice/Ice/ValueFactory.ice
index d44f4a21983..ea93f41a634 100644
--- a/slice/Ice/ValueFactory.ice
+++ b/slice/Ice/ValueFactory.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/Ice/Version.ice b/slice/Ice/Version.ice
index 2f012161536..a6b6e528592 100644
--- a/slice/Ice/Version.ice
+++ b/slice/Ice/Version.ice
@@ -9,13 +9,13 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICE_API", "cpp:doxygen:include:Ice/Ice.h", "objc:header-dir:objc", "objc:dll-export:ICE_API", "python:pkgdir:Ice", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICE", "js:module:ice"]
+["objc:prefix:ICE"]
 module Ice
 {
 
diff --git a/slice/IceBT/ConnectionInfo.ice b/slice/IceBT/ConnectionInfo.ice
index c319deec837..1f945421683 100644
--- a/slice/IceBT/ConnectionInfo.ice
+++ b/slice/IceBT/ConnectionInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT",
+  "js:module:ice"]]
 
 #include <Ice/Connection.ice>
 
diff --git a/slice/IceBT/EndpointInfo.ice b/slice/IceBT/EndpointInfo.ice
index d59bde1aada..f458e1847a3 100644
--- a/slice/IceBT/EndpointInfo.ice
+++ b/slice/IceBT/EndpointInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT",
+  "js:module:ice"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IceBT/Types.ice b/slice/IceBT/Types.ice
index 120a3548e34..9b0b5e1dd5e 100644
--- a/slice/IceBT/Types.ice
+++ b/slice/IceBT/Types.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBT_API", "cpp:doxygen:include:IceBT/IceBT.h", "objc:header-dir:objc", "python:pkgdir:IceBT",
+  "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice
index 1892a8d37a9..294db8f659e 100644
--- a/slice/IceBox/IceBox.ice
+++ b/slice/IceBox/IceBox.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBOX_API", "cpp:doxygen:include:IceBox/IceBox.h", "objc:header-dir:objc", "python:pkgdir:IceBox"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEBOX_API", "cpp:doxygen:include:IceBox/IceBox.h", "objc:header-dir:objc",
+  "python:pkgdir:IceBox", "js:module:ice"]]
 [["cpp:include:IceBox/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
diff --git a/slice/IceDiscovery/IceDiscovery.ice b/slice/IceDiscovery/IceDiscovery.ice
index b04f2f280d2..db0b6b5f23c 100644
--- a/slice/IceDiscovery/IceDiscovery.ice
+++ b/slice/IceDiscovery/IceDiscovery.ice
@@ -8,7 +8,8 @@
 // **********************************************************************
 
 #pragma once
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceDiscovery/IceDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceDiscovery"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceDiscovery/IceDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceDiscovery",
+  "js:module:ice"]]
 
 #include <Ice/Identity.ice>
 
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index de6ae3556a5..ef987c6950f 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -24,7 +25,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
index a8878bba345..6a1bf3625c0 100644
--- a/slice/IceGrid/Descriptor.ice
+++ b/slice/IceGrid/Descriptor.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "python:pkgdir:IceGrid", "js:module:ice"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
 [["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
@@ -24,7 +24,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
index 696da6fcd78..8632e458e82 100644
--- a/slice/IceGrid/Exception.ice
+++ b/slice/IceGrid/Exception.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "python:pkgdir:IceGrid", "js:module:ice"]]
 
 #ifndef ICE_BUILDING_ICEGRIDDB
 [["cpp:dll-export:ICEGRID_API", "objc:dll-export:ICEGRID_API"]]
@@ -24,7 +24,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index ca808cfebab..16f4ccf777b 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Admin.ice>
@@ -18,7 +19,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/PluginFacade.ice b/slice/IceGrid/PluginFacade.ice
index 51917db5872..fc65fc70329 100644
--- a/slice/IceGrid/PluginFacade.ice
+++ b/slice/IceGrid/PluginFacade.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
@@ -21,7 +22,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice
index dae186d65a4..adf302d4583 100644
--- a/slice/IceGrid/Registry.ice
+++ b/slice/IceGrid/Registry.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <IceGrid/Exception.ice>
@@ -21,7 +22,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index 3d2bd911657..bf75b1244ab 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #include <Glacier2/Session.ice>
@@ -19,7 +20,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index 53740e93185..99beabd7bea 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -9,14 +9,15 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API", "python:pkgdir:IceGrid"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEGRID_API", "cpp:doxygen:include:IceGrid/IceGrid.h", "objc:header-dir:objc", "objc:dll-export:ICEGRID_API",
+  "python:pkgdir:IceGrid", "js:module:ice"]]
 [["cpp:include:IceGrid/Config.h"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICEGRID", "js:module:ice"]
+["objc:prefix:ICEGRID"]
 module IceGrid
 {
 
diff --git a/slice/IceIAP/ConnectionInfo.ice b/slice/IceIAP/ConnectionInfo.ice
index fd4935410a4..1567116d96c 100644
--- a/slice/IceIAP/ConnectionInfo.ice
+++ b/slice/IceIAP/ConnectionInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:module:ice"]]
 
 #include <Ice/Connection.ice>
 
diff --git a/slice/IceIAP/EndpointInfo.ice b/slice/IceIAP/EndpointInfo.ice
index 026838ca945..7d44c8a21aa 100644
--- a/slice/IceIAP/EndpointInfo.ice
+++ b/slice/IceIAP/EndpointInfo.ice
@@ -9,7 +9,7 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:ice-build"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEIAP_API", "cpp:doxygen:include:IceIAP/IceIAP.h", "objc:header-dir:objc", "js:module:ice"]]
 
 #include <Ice/Endpoint.ice>
 
diff --git a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
index 9086668a762..9fb1508b993 100644
--- a/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
+++ b/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
@@ -8,7 +8,8 @@
 // **********************************************************************
 
 #pragma once
-[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceLocatorDiscovery/IceLocatorDiscovery.h", "objc:header-dir:objc", "python:pkgdir:IceLocatorDiscovery"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:doxygen:include:IceLocatorDiscovery/IceLocatorDiscovery.h", "objc:header-dir:objc",
+  "python:pkgdir:IceLocatorDiscovery", "js:module:ice"]]
 
 #include <Ice/Locator.ice>
 
diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice
index 88521338db4..602bbf06641 100644
--- a/slice/IcePatch2/FileInfo.ice
+++ b/slice/IcePatch2/FileInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc",
+  "python:pkgdir:IcePatch2", "js:module:ice"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <Ice/BuiltinSequences.ice>
diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice
index 30a6e0769eb..b26f333f99c 100644
--- a/slice/IcePatch2/FileServer.ice
+++ b/slice/IcePatch2/FileServer.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc", "python:pkgdir:IcePatch2"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICEPATCH2_API", "cpp:doxygen:include:IcePatch2/IcePatch2.h", "objc:header-dir:objc",
+  "python:pkgdir:IcePatch2", "js:module:ice"]]
 [["cpp:include:IcePatch2/Config.h"]]
 
 #include <IcePatch2/FileInfo.ice>
diff --git a/slice/IceSSL/ConnectionInfo.ice b/slice/IceSSL/ConnectionInfo.ice
index 12a335217d0..48a9c590d5e 100644
--- a/slice/IceSSL/ConnectionInfo.ice
+++ b/slice/IceSSL/ConnectionInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "python:pkgdir:IceSSL"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API",
+  "python:pkgdir:IceSSL", "js:module:ice"]]
 
 [["cpp:include:IceSSL/Plugin.h"]]
 
@@ -19,7 +20,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICESSL", "js:module:ice"]
+["objc:prefix:ICESSL"]
 module IceSSL
 {
 
diff --git a/slice/IceSSL/ConnectionInfoF.ice b/slice/IceSSL/ConnectionInfoF.ice
index dddd4d5d17c..1130df56438 100644
--- a/slice/IceSSL/ConnectionInfoF.ice
+++ b/slice/IceSSL/ConnectionInfoF.ice
@@ -9,13 +9,14 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "python:pkgdir:IceSSL"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API",
+  "python:pkgdir:IceSSL", "js:module:ice"]]
 
 #ifndef __SLICE2JAVA_COMPAT__
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICESSL", "js:module:ice"]
+["objc:prefix:ICESSL"]
 module IceSSL
 {
 
diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice
index 426ee808848..296332171c3 100644
--- a/slice/IceSSL/EndpointInfo.ice
+++ b/slice/IceSSL/EndpointInfo.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API", "python:pkgdir:IceSSL"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESSL_API", "cpp:doxygen:include:IceSSL/IceSSL.h", "objc:header-dir:objc", "objc:dll-export:ICESSL_API",
+  "python:pkgdir:IceSSL", "js:module:ice"]]
 
 #include <Ice/Endpoint.ice>
 
@@ -22,7 +23,7 @@
 [["java:package:com.zeroc"]]
 #endif
 
-["objc:prefix:ICESSL", "js:module:ice"]
+["objc:prefix:ICESSL"]
 module IceSSL
 {
 
diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice
index 49845b3147c..43e5caecfdd 100644
--- a/slice/IceStorm/IceStorm.ice
+++ b/slice/IceStorm/IceStorm.ice
@@ -9,7 +9,8 @@
 
 #pragma once
 
-[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "cpp:doxygen:include:IceStorm/IceStorm.h", "objc:header-dir:objc", "objc:dll-export:ICESTORM_API", "python:pkgdir:IceStorm"]]
+[["ice-prefix", "cpp:header-ext:h", "cpp:dll-export:ICESTORM_API", "cpp:doxygen:include:IceStorm/IceStorm.h", "objc:header-dir:objc",
+  "objc:dll-export:ICESTORM_API", "python:pkgdir:IceStorm", "js:module:ice"]]
 [["cpp:include:IceStorm/Config.h"]]
 
 #include <Ice/Identity.ice>
@@ -29,7 +30,7 @@
  * easy as invoking a method on an interface.
  *
  **/
-["objc:prefix:ICESTORM", "js:module:ice"]
+["objc:prefix:ICESTORM"]
 module IceStorm
 {