Merge branch 'topic/npm' into 'master'

Use new npm dependency provisioning features

See merge request eng/ide/ada_language_server!2018

Author: eliericha

.gitlab-ci.plan

@@ -1,7 +1,14 @@
+vscode_qual = {
+    "mono-plat": True,
+    "npm-online": True,
+    "npm-package": True,
+}
+
+
 def build_(qualifier={}):
     with defaults(qualifier=qualifier):
         anod_build("als")
-        anod_build("vscode-extension", qualifier={"mono-plat": True} | qualifier)
+        anod_build("vscode-extension", qualifier=vscode_qual | qualifier)
 
 
 def test_als_(qualifier={}):
@@ -19,7 +26,7 @@ def test_als_cov_(qualifier={}):
 
 
 def test_vscode_extension_(qualifier={}):
-    component_qual = qualifier | {"mono-plat": True}
+    component_qual = qualifier | vscode_qual
     # Install the component built in the preceding CI build job
     anod_install("vscode-extension", qualifier=component_qual)
     anod_test("vscode-extension", qualifier=component_qual | {"coverage": True})
@@ -61,11 +68,18 @@ def build_test_gs_edge():
 # Integration testsuite (no edge version)
 
 
-def test_integration_testsuite():
+def test_integration_testsuite(local_vscode_qual=None):
+    if local_vscode_qual is None:
+        local_vscode_qual = vscode_qual
+
     # These two components have been built by the build job of the CI, install them.
     anod_install("als")
-    anod_install("vscode-extension", qualifier={"mono-plat": True})
+    anod_install("vscode-extension", qualifier=local_vscode_qual)
 
+    test_int_ts(local_vscode_qual)
+
+
+def test_int_ts(local_vscode_qual):
     # For the following components, we'd like to install with latest=True to be
     # resilient to failures in nightly builds.
     #
@@ -86,5 +100,24 @@ def test_integration_testsuite():
     # Run the subset of integration-testsuite that uses VS Code
     anod_test(
         "integration-testsuite",
-        qualifier={"run-tools": "vscode", "cleanup-mode": "none", "mono-plat": True},
+        qualifier={
+            "run-tools": "vscode",
+            "cleanup-mode": "none",
+        }
+        | local_vscode_qual,
     )
+
+
+# Offline sentinel
+
+
+def offline_sentinel():
+    offline_qual = vscode_qual | {
+        "npm-online": False,
+        "npm-package": False,
+    }
+
+    anod_install("als")
+    anod_build("vscode-extension", qualifier=offline_qual)
+    anod_test("vscode-extension", qualifier=offline_qual)
+    test_int_ts(offline_qual)

.gitlab-ci.yml

@@ -18,6 +18,7 @@ include:
   - component: $CI_SERVER_FQDN/eng/gitlab-templates/build@~latest
     inputs:
       anod-args: run build_$ACI_TRACK
+      artifacts: [vscode-extension-npm-deps-*-*.tar.gz]
       cpus: 16
       disk: 80
       image: systemgtk
@@ -26,6 +27,18 @@ include:
       # 8GB of memory leads to heap exhaustion during compilation. We need more.
       windows-mem: 16
       save-component: true
+      save-anod-logs: true
+
+  # Offline sentinel build/test of vscode-extension
+  - component: $CI_SERVER_FQDN/eng/gitlab-templates/build@~latest
+    inputs:
+      job-name: offline-sentinel
+      anod-args: run offline_sentinel
+      needs: [build:linux]
+      cpus: 4
+      disk: 80
+      image: systemgtk
+      save-anod-logs: true
 
   # Testing of the ALS
   - component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest
@@ -68,6 +81,7 @@ include:
       # components, but we can't because it breaks the transfer of built
       # components between jobs using anod-copy-components.
       anod-args: run test_integration_testsuite
+      artifacts: [integration-testsuite-npm-deps-*-*.tar.gz]
       image: systemgtk
       cpus: 4
       disk: 80
@@ -93,6 +107,22 @@ include:
           when: manual
           allow_failure: true
 
+.build:common:
+  after_script:
+    - . /tmp/ci_env.sh
+    # Copy the NPM artifacts archive
+    - bs=$(anod info vscode-extension --show working_dir -Q mono-plat,npm-online,npm-package)
+    - |
+      cp "$bs/tmp"/vscode-extension-npm-deps-*-*.tar.gz "$CI_PROJECT_DIR"
+
+.integration-testsuite:common:
+  after_script:
+    - . /tmp/ci_env.sh
+    # Copy the NPM artifacts archive
+    - bs=$(anod info test integration-testsuite --show working_dir -Q run-tools=vscode,cleanup-mode=none,mono-plat,npm-online,npm-package)
+    - |
+      cp "$bs/tmp"/integration-testsuite-npm-deps-*-*.tar.gz "$CI_PROJECT_DIR"
+
 als-cov:linux:
   variables:
     RUNNER_AFTER_SCRIPT_TIMEOUT: 10m

integration/vscode/ada/.vscodeignore

@@ -17,3 +17,4 @@ tsconfig.json
 xfail.yaml
 vscode-test-win-workaround.py
 convert-mocha-junit-report.py
+unresolve.js

integration/vscode/ada/package.json

@@ -1422,7 +1422,8 @@
         "cilint": "eslint \"./src/**/*.{js,ts,tsx}\" \"./test/**/*.{js,ts,tsx}\"",
         "test": "vscode-test",
         "resolve-backtrace": "npx stacktracify",
-        "clean": "node -e \"fs.rmSync('out',{force:true,recursive:true})\""
+        "clean": "node -e \"fs.rmSync('out',{force:true,recursive:true})\"",
+        "unresolve": "node unresolve.js"
     },
     "dependencies": {
         "command-exists": "1.2.9",

integration/vscode/ada/unresolve.js

@@ -0,0 +1,22 @@
+/**
+ * This tool processes the nearby 'package-lock.json' file by removing the
+ * "resolved" field of packages so that it becomes possible to resolve them in
+ * a different registry than the one they were first resolved.
+ */
+const { writeFileSync } = require('fs');
+const { join } = require('path');
+
+lockPath = join(__dirname, 'package-lock.json');
+
+lockData = require(lockPath);
+const packages = lockData['packages'];
+const keys = Object.keys(packages);
+for (let index = 0; index < keys.length; index++) {
+    const key = keys[index];
+    const object = packages[key];
+    if ('resolved' in object) {
+        delete object['resolved'];
+    }
+}
+
+writeFileSync(lockPath, JSON.stringify(lockData, null, 4) + '\n');