build: run bazel tests on CI and generate bazel build dist/npm_bazel folder

Next steps after this are testing of all local workflows and cut-over to a bazel built release. Will co-ordinate with Angular team on this.

Author: gregmagolan

.circleci/config.yml

@@ -27,25 +27,12 @@ jobs:
       - run: scripts/format.sh
       - run: scripts/build.sh << parameters.dependency_type >>
       - run: scripts/test.sh
-  bazel-build-and-test:
-    docker:
-      - image: cimg/node:14.18.3@sha256:30583ce79b08d318b1fc5e17a613d21ef960091e5442b06eb49c56fa180a3b30
-    steps:
-      - checkout
-      - node/install-packages:
-          pkg-manager: yarn
-      # Disable bazel build & test temporarily
-      - run: yarn bazel info
 workflows:
     build-and-test:
       jobs:
         - build-and-test:
             name: build-and-test
             dependency_type: "package.json"
-    bazel-build-and-test:
-      jobs:
-        - bazel-build-and-test:
-            name: bazel-build-and-test
     buid-and-test-against-builds:
       jobs:
         - build-and-test:

.gitignore

@@ -1,4 +1,3 @@
-.npmrc
 .vscode-test
 .DS_Store
 node_modules

.npmrc

@@ -0,0 +1,8 @@
+# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
+# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
+# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
+hoist=false
+
+# Allow for missing peer dependencies on pnpm import.
+# See https://github.com/aspect-build/rules_js/pull/445 for more context.
+strict-peer-dependencies=false

BUILD.bazel

@@ -1,8 +1,10 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
+load("@aspect_rules_js//js/private:expand_template.bzl", "expand_template")
 load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@npm//:vsce/package_json.bzl", vsce_bin = "bin")
+load(":version.bzl", "VERSION")
 
 npm_link_all_packages(name = "node_modules")
 
@@ -18,10 +20,20 @@ ts_config(
     visibility = ["//visibility:public"]
 )
 
+expand_template(
+    name = "package_json_expanded",
+    template = "package.json",
+    out = "package_expanded.json",
+    substitutions = {
+        "0.0.0-PLACEHOLDER": VERSION,
+        "./dist/client/src/extension": "./index",
+    }
+)
+
 npm_package(
-    name = "npm",
+    name = "vsix_sandbox",
     srcs = [
-        "package.json",
+        "package_expanded.json",
         "angular.png",
         "CHANGELOG.md",
         "README.md",
@@ -57,22 +69,34 @@ npm_package(
         "**/*.map",
     ],
     replace_prefixes = {
+        "package_expanded.json": "package.json",
         "client/": "",
         "syntaxes/src/": "syntaxes/",
     },
-    visibility = ["//integration:__subpackages__"],
 )
 
 vsce_bin.vsce(
     name = "vsix",
     srcs = [
-        ":npm",
+        ":vsix_sandbox",
     ],
-    outs = ["ng-template.vsix"],
-    chdir = "npm",
+    outs = ["ng-template-{}.vsix".format(VERSION)],
+    chdir = "vsix_sandbox",
     args = [
         "package",
         "-o",
-        "../ng-template.vsix"
+        "../ng-template-{}.vsix".format(VERSION)
+    ],
+)
+
+npm_package(
+    name = "npm",
+    srcs = [
+        ":vsix_sandbox",
+        ":vsix",
+    ],
+    root_paths = [
+        "vsix_sandbox"
     ],
+    visibility = ["//integration:__subpackages__"],
 )

WORKSPACE

@@ -2,9 +2,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "aspect_rules_js",
-    sha256 = "538049993bec3ee1ae9b1c3cd669156bca04eb67027b222883e47b0a2aed2e67",
-    strip_prefix = "rules_js-1.0.0",
-    url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v1.0.0.tar.gz",
+    sha256 = "fbfcfb5a1e4bccd8030b64522e561046731bdacd4a9ff8fa3334fed0e6c61af1",
+    # 1.2.0 pre-release
+    strip_prefix = "rules_js-9f6f33c72ac49dd829de7a622bd8fd81ec9d03e1",
+    url = "https://github.com/aspect-build/rules_js/archive/9f6f33c72ac49dd829de7a622bd8fd81ec9d03e1.tar.gz",
 )
 
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
@@ -13,9 +14,9 @@ rules_js_dependencies()
 
 http_archive(
     name = "aspect_rules_ts",
-    sha256 = "1945d5a356d0ec85359dea411467dec0f98502503a53798ead7f54aef849598b",
-    strip_prefix = "rules_ts-1.0.0-rc1",
-    url = "https://github.com/aspect-build/rules_ts/archive/refs/tags/v1.0.0-rc1.tar.gz",
+    sha256 = "3eb3171c26eb5d0951d51ae594695397218fb829e3798eea5557814723a1b3da",
+    strip_prefix = "rules_ts-1.0.0-rc3",
+    url = "https://github.com/aspect-build/rules_ts/archive/refs/tags/v1.0.0-rc3.tar.gz",
 )
 
 load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
@@ -24,9 +25,9 @@ rules_ts_dependencies(ts_version_from = "//:package.json",)
 
 http_archive(
     name = "aspect_rules_jasmine",
-    sha256 = "741d3376fdbf0c0c742e3bac0f854b1d49dbe1998d3530ef6f22f467675ca177",
-    strip_prefix = "rules_jasmine-0.0.1",
-    url = "https://github.com/aspect-build/rules_jasmine/archive/refs/tags/v0.0.1.tar.gz",
+    sha256 = "938a2818100fd89e7600a45b7ba4fcd4114c11c5b5741db30ff7c6e0dcb2ea4b",
+    strip_prefix = "rules_jasmine-0.1.0",
+    url = "https://github.com/aspect-build/rules_jasmine/archive/refs/tags/v0.1.0.tar.gz",
 )
 
 load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
@@ -35,9 +36,9 @@ rules_jasmine_dependencies()
 
 http_archive(
     name = "aspect_rules_esbuild",
-    sha256 = "6446a784e72b04c33bc48debd84c5a54db4727f0a4a61a0da9faa64bededd7c2",
-    strip_prefix = "rules_esbuild-0909898c1344569f59fa83f70a1db7548563c274",
-    url = "https://github.com/aspect-build/rules_esbuild/archive/0909898c1344569f59fa83f70a1db7548563c274.tar.gz",
+    sha256 = "1e365451341ffb2490193292dfd9953f2ca009586c2381cb4dc08d01e48866b7",
+    strip_prefix = "rules_esbuild-0.12.0",
+    url = "https://github.com/aspect-build/rules_esbuild/archive/refs/tags/v0.12.0.tar.gz",
 )
 
 load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependencies")
@@ -58,11 +59,11 @@ esbuild_register_toolchains(
     esbuild_version = ESBUILD_LATEST_VERSION,
 )
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
 nodejs_register_toolchains(
     name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
+    node_version = "14.20.0",
 )
 
 load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
@@ -71,6 +72,7 @@ npm_translate_lock(
     name = "npm",
     yarn_lock = "//:yarn.lock",
     package_json = "//:package.json",
+    npmrc = "//:.npmrc",
     verify_node_modules_ignored = "//:.bazelignore",
     public_hoist_packages = {
         # Hoist transitive closure of npm deps needed for vsce; this set was determined manually by
@@ -96,6 +98,7 @@ npm_translate_lock(
     name = "npm_integration_workspace",
     yarn_lock = "//integration/workspace:yarn.lock",
     package_json = "//integration/workspace:package.json",
+    npmrc = "//:.npmrc",
     verify_node_modules_ignored = "//:.bazelignore",
 )
 
@@ -107,6 +110,7 @@ npm_translate_lock(
     name = "npm_integration_pre_apf_project",
     yarn_lock = "//integration/pre_apf_project:yarn.lock",
     package_json = "//integration/pre_apf_project:package.json",
+    npmrc = "//:.npmrc",
     verify_node_modules_ignored = "//:.bazelignore",
 )
 
@@ -118,6 +122,7 @@ npm_translate_lock(
     name = "npm_integration_project",
     yarn_lock = "//integration/project:yarn.lock",
     package_json = "//integration/project:package.json",
+    npmrc = "//:.npmrc",
     verify_node_modules_ignored = "//:.bazelignore",
 )
 

integration/e2e/BUILD.bazel

@@ -26,7 +26,6 @@ js_test(
         "//:npm",
         "//integration",
         "//integration/project",
-        "//server:index",
         # Depend on //:node_modules/jasmine as a temporary work-around for jasmine escaping its
         # runfiles likely due to esm import issue in rules_js https://github.com/aspect-build/rules_js/issues/362
         "//:node_modules/jasmine",

integration/e2e/completion_spec.ts

@@ -1,4 +1,3 @@
-
 import * as vscode from 'vscode';
 
 import {activate, COMPLETION_COMMAND, FOO_TEMPLATE_URI} from './helper';

integration/e2e/jasmine.ts

@@ -33,6 +33,8 @@ export async function run(): Promise<void> {
 
   console.log(`Expecting to run ${jasmine.specFiles.length} specs.`);
 
+  console.log(JSON.stringify(jasmine.specFiles, null, 2))
+
   if (jasmine.specFiles.length === 0) {
     throw new Error('No specs found');
   }

package.json

@@ -212,9 +212,9 @@
     "test": "yarn compile:test && jasmine --config=jasmine.json",
     "test:inspect": "yarn compile:test && node --inspect-brk node_modules/jasmine/bin/jasmine.js --config=jasmine.json",
     "test:lsp": "yarn compile:integration && jasmine --config=integration/lsp/jasmine.json",
-    "test:lsp-bazel": "yarn bazel test --test_output=streamed //integration:lsp_test",
+    "test:lsp-bazel": "yarn bazel test --test_output=streamed //integration/lsp:test",
     "test:e2e": "yarn compile:integration && node dist/integration/e2e",
-    "test:e2e-bazel": "yarn bazel test --test_output=streamed //integration/e2e:e2e_test",
+    "test:e2e-bazel": "yarn bazel test --test_output=streamed //integration/e2e:test",
     "test:syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js",
     "test:bazel": "yarn bazel test --test_tag_filters=unit_test //...",
     "test:bazel-watch": "yarn ibazel test --test_tag_filters=unit_test //..."

scripts/build.sh

@@ -30,16 +30,32 @@ fi
 
 set -ex -o pipefail
 
+# Clean up from last build
+rm -rf dist
+
+# Run legacy yarn install to update the lock file since we may have modified the package.json above
+# and so that we can call bazel via yarn bazel
+yarn install
+
+# Build the npm package with bazel
+yarn bazel build //:npm
+
+# Copy the bazel built package to dist/npm_bazel
+# TODO: copy to dist/npm when ready to cut-over
+mkdir -p dist/npm_bazel
+cp -r bazel-bin/npm/ dist/npm_bazel
+chmod -R +w dist/npm_bazel
+
+################################################################################
+#### LEGACY PRE-BAZEL BUILD --- can be removed after cut-over
+################################################################################
+
 # Enable extended pattern matching features
 shopt -s extglob
 
 # Clean up from last build
-rm -rf dist
 rm -rf **/*.tsbuildinfo
 
-
-yarn install;
-
 # Build the client and server
 yarn run compile
 

scripts/test.sh

@@ -2,6 +2,16 @@
 
 set -ex -o pipefail
 
+yarn bazel test //...
+
+# E2E test that brings up full vscode
+# TODO: Disabled for now because it cannot be run on CircleCI
+# bazel test --test_output=streamed //integration/e2e:test
+
+################################################################################
+#### LEGACY PRE-BAZEL BUILD --- can be removed after cut-over
+################################################################################
+
 # Install test project dependencies
 if [[ -z "${CI}" ]]; then
   (cd integration/project && yarn)

version.bzl

@@ -0,0 +1,2 @@
+# This version is used by Bazel to generate the release artifacts
+VERSION="14.2.0"