Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(builtin): add js_library JSEcmaScriptModuleInfo support #2658

Merged
merged 1 commit into from
May 11, 2021
+18 −43
Merged

feat(builtin): add js_library JSEcmaScriptModuleInfo support #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions internal/js_library/js_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ load(
"//:providers.bzl",
"DeclarationInfo",
"ExternalNpmPackageInfo",
"JSEcmaScriptModuleInfo",
"JSModuleInfo",
"JSNamedModuleInfo",
"LinkablePackageInfo",
"declaration_info",
"js_ecma_script_module_info",
"js_module_info",
"js_named_module_info",
)
Expand Down Expand Up @@ -164,6 +166,7 @@ def _impl(ctx):

files_depsets = [files_depset]
npm_sources_depsets = [files_depset]
direct_ecma_script_module_depsets = [files_depset]
direct_sources_depsets = [files_depset]
direct_named_module_sources_depsets = [named_module_files_depset]
typings_depsets = [typings_depset]
Expand All @@ -173,6 +176,9 @@ def _impl(ctx):
if ExternalNpmPackageInfo in dep:
npm_sources_depsets.append(dep[ExternalNpmPackageInfo].sources)
else:
if JSEcmaScriptModuleInfo in dep:
direct_ecma_script_module_depsets.append(dep[JSEcmaScriptModuleInfo].direct_sources)
direct_sources_depsets.append(dep[JSEcmaScriptModuleInfo].direct_sources)
if JSModuleInfo in dep:
js_files_depsets.append(dep[JSModuleInfo].direct_sources)
direct_sources_depsets.append(dep[JSModuleInfo].direct_sources)
Expand All @@ -196,6 +202,10 @@ def _impl(ctx):
),
),
AmdNamesInfo(names = ctx.attr.amd_names),
js_ecma_script_module_info(
sources = depset(transitive = direct_ecma_script_module_depsets),
deps = ctx.attr.deps,
),
js_module_info(
sources = depset(transitive = js_files_depsets),
deps = ctx.attr.deps,
Expand Down
48 changes: 6 additions & 42 deletions packages/esbuild/test/typescript/bundle.golden.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,23 @@
var __create = Object.create;
var __defProp = Object.defineProperty;
var __getProtoOf = Object.getPrototypeOf;
var __hasOwnProp = Object.prototype.hasOwnProperty;
var __getOwnPropNames = Object.getOwnPropertyNames;
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
var __name = (target, value) => __defProp(target, "name", {value, configurable: true});
var __commonJS = (cb, mod) => () => (mod || cb((mod = {exports: {}}).exports, mod), mod.exports);
var __reExport = (target, module, desc) => {
if (module && typeof module === "object" || typeof module === "function") {
for (let key of __getOwnPropNames(module))
if (!__hasOwnProp.call(target, key) && key !== "default")
__defProp(target, key, {get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable});
}
return target;
};
var __toModule = (module) => {
return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? {get: () => module.default, enumerable: true} : {value: module, enumerable: true})), module);
};


var require_module_dynamic = __commonJS((exports, module) => {
(function(factory) {
if (typeof module === "object" && typeof module.exports === "object") {
var v = factory(require, exports);
if (v !== void 0)
module.exports = v;
} else if (typeof define === "function" && define.amd) {
define("build_bazel_rules_nodejs/packages/esbuild/test/typescript/module-dynamic/index", ["require", "exports"], factory);
}
})(function(require2, exports2) {
"use strict";
Object.defineProperty(exports2, "__esModule", {value: true});
exports2.getId = void 0;
exports2.getId = () => "dynamic-id";
});
});


var import_module_dynamic = __toModule(require_module_dynamic());
var getId = /* @__PURE__ */ __name(() => "dynamic-id", "getId");


var getId = /* @__PURE__ */ __name(() => "module-one", "getId");
var getId2 = /* @__PURE__ */ __name(() => "module-one", "getId");


var getId2 = /* @__PURE__ */ __name(() => "module-two", "getId");
var getId3 = /* @__PURE__ */ __name(() => "module-two", "getId");


var getId3 = /* @__PURE__ */ __name(() => `generated-module`, "getId");
var getId4 = /* @__PURE__ */ __name(() => `generated-module`, "getId");


var getId4 = /* @__PURE__ */ __name(() => "relative-module", "getId");
var getId5 = /* @__PURE__ */ __name(() => "relative-module", "getId");


var ID = `Full ID: ${getId()} - ${getId2()} - ${(0, import_module_dynamic.getId)()} - ${getId4()} - ${getId3()}`;
var ID = `Full ID: ${getId2()} - ${getId3()} - ${getId()} - ${getId5()} - ${getId4()}`;
console.log(ID);
export {
ID
Expand Down
3 changes: 2 additions & 1 deletion packages/rollup/rollup_bundle.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ def _rollup_bundle(ctx):
for dep in ctx.attr.deps:
if JSEcmaScriptModuleInfo in dep:
deps_depsets.append(dep[JSEcmaScriptModuleInfo].sources)
elif JSModuleInfo in dep:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to fix the internal/pkg_npm/test:test_pkg test, and I don't understand why..?

Why is the esbuild dep collection so different from the rollup version? Without this change pkg_npm/test:test_pkg fails because the outputted files have slight changes (a single exports.X = undefined (or void?) and the sourcemap change).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other failing before this change was packages/rollup/test/integration. Somehow this only failed on CI and not locally though!? The error was

Compilation failed Error: '@far/a' is imported by packages/rollup/test/integration/foo.js, but could not be resolved – treating it as an external dependency

I also don't understand this one, both why it only failed on CI (not locally) and why this change fixes it?


if JSModuleInfo in dep:
deps_depsets.append(dep[JSModuleInfo].sources)
elif hasattr(dep, "files"):
deps_depsets.append(dep.files)
Expand Down