chore(NA): moving @elastic/safer-lodash-set into bazel (elastic#98187)

madirey · May 11, 2021 · 6374053 · 6374053
1 parent 011641c
commit 6374053
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 8 deletions.
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -62,6 +62,7 @@ yarn kbn watch-bazel
 === List of Already Migrated Packages to Bazel
 
 - @elastic/datemath
+- @elastic/safer-lodash-set
 - @kbn/apm-utils
 - @kbn/babel-code-parser
 - @kbn/babel-preset

diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "@elastic/numeral": "^2.5.0",
     "@elastic/react-search-ui": "^1.5.1",
     "@elastic/request-crypto": "1.1.4",
-    "@elastic/safer-lodash-set": "link:packages/elastic-safer-lodash-set",
+    "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set/npm_module",
     "@elastic/search-ui-app-search-connector": "^1.5.0",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/boom": "^9.1.1",

diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
@@ -4,6 +4,7 @@ filegroup(
   name = "build",
   srcs = [
       "//packages/elastic-datemath:build",
+      "//packages/elastic-safer-lodash-set:build",
       "//packages/kbn-apm-utils:build",
       "//packages/kbn-babel-code-parser:build",
       "//packages/kbn-babel-preset:build",

diff --git a/packages/elastic-safer-lodash-set/BUILD.bazel b/packages/elastic-safer-lodash-set/BUILD.bazel
@@ -0,0 +1,65 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+
+PKG_BASE_NAME = "elastic-safer-lodash-set"
+PKG_REQUIRE_NAME = "@elastic/safer-lodash-set"
+
+SOURCE_FILES = glob(
+  [
+    "fp/**/*",
+    "lodash/**/*",
+    "index.js",
+    "set.js",
+    "setWith.js",
+  ],
+  exclude = [
+    "**/*.d.ts"
+  ],
+)
+
+TYPE_FILES = glob([
+  "fp/**/*.d.ts",
+  "index.d.ts",
+  "set.d.ts",
+  "setWith.d.ts",
+])
+
+SRCS = SOURCE_FILES + TYPE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+  "README.md",
+]
+
+DEPS = [
+  "@npm//lodash",
+]
+
+js_library(
+  name = PKG_BASE_NAME,
+  srcs = NPM_MODULE_EXTRA_FILES + [
+    ":srcs",
+  ],
+  deps = DEPS,
+  package_name = PKG_REQUIRE_NAME,
+  visibility = ["//visibility:public"],
+)
+
+pkg_npm(
+  name = "npm_module",
+  deps = [
+    ":%s" % PKG_BASE_NAME,
+  ]
+)
+
+filegroup(
+  name = "build",
+  srcs = [
+    ":npm_module",
+  ],
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/elastic-safer-lodash-set/tsconfig.json b/packages/elastic-safer-lodash-set/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/elastic-safer-lodash-set"
+    "incremental": false,
   },
   "include": [
     "**/*",

diff --git a/packages/kbn-apm-config-loader/package.json b/packages/kbn-apm-config-loader/package.json
@@ -9,8 +9,5 @@
     "build": "../../node_modules/.bin/tsc",
     "kbn:bootstrap": "yarn build",
     "kbn:watch": "yarn build --watch"
-  },
-  "dependencies": {
-    "@elastic/safer-lodash-set": "link:../elastic-safer-lodash-set"
   }
 }
diff --git a/packages/kbn-config/package.json b/packages/kbn-config/package.json
@@ -10,7 +10,6 @@
     "kbn:bootstrap": "yarn build"
   },
   "dependencies": {
-    "@elastic/safer-lodash-set": "link:../elastic-safer-lodash-set",
     "@kbn/logging": "link:../kbn-logging"
   },
   "devDependencies": {

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -35,7 +35,6 @@
     "@kbn/test": "link:../packages/kbn-test"
   },
   "dependencies": {
-    "@elastic/safer-lodash-set": "link:../packages/elastic-safer-lodash-set",
     "@kbn/i18n": "link:../packages/kbn-i18n",
     "@kbn/interpreter": "link:../packages/kbn-interpreter",
     "@kbn/ui-framework": "link:../packages/kbn-ui-framework"

diff --git a/yarn.lock b/yarn.lock
@@ -1550,7 +1550,7 @@
     "@types/node-jose" "1.1.0"
     node-jose "1.1.0"
 
-"@elastic/safer-lodash-set@link:packages/elastic-safer-lodash-set":
+"@elastic/safer-lodash-set@link:bazel-bin/packages/elastic-safer-lodash-set/npm_module":
   version "0.0.0"
   uid ""