Merge branch 'master' into dependabot/npm_and_yarn/hapi/subtext-7.1.0

.github/workflows/check-docs.yml

@@ -24,9 +24,9 @@ jobs:
 
       - name: Generate Extensions API Reference using typedocs
         run: |
-          yarn install
-          yarn run build:docs
+          npm install
+          npm run build:docs
 
       - name: Verify that the markdown is valid
         run: |
-          yarn run mkdocs:verify
+          npm run mkdocs:verify

.github/workflows/daily-alpha.yml

@@ -21,9 +21,9 @@ jobs:
 
       - name: Install deps
         run: |
-          yarn install
+          npm install
           sudo apt-get install -y ripgrep
-          cd packages/bump-version-for-cron && yarn build
+          cd packages/bump-version-for-cron && npm run build
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Bump version
@@ -85,14 +85,14 @@ jobs:
       - name: Build package
         shell: bash
         run: |
-          yarn install --frozen-lockfile
-          yarn run build
+          npm ci
+          npm run build
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Release to GitHub NPM registry
         run: |
           npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-          yarn lerna \
+          npx lerna \
             publish from-package \
             --no-push \
             --no-git-tag-version \

.github/workflows/linter.yml

@@ -20,7 +20,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install deps
-        run: yarn install
+        run: npm install
 
       - name: Lint
-        run: yarn run lint
+        run: npm run lint

.github/workflows/main.yml

@@ -34,12 +34,12 @@ jobs:
 
       - name: Generate Extensions API Reference using typedocs
         run: |
-          yarn install
-          yarn run build:docs
+          npm install
+          npm run build:docs
 
       - name: Verify that the markdown is valid
         run: |
-          yarn run mkdocs:verify
+          npm run mkdocs:verify
 
   build:
     name: Deploy docs
@@ -77,8 +77,8 @@ jobs:
 
       - name: Generate Extensions API Reference using typedocs
         run: |
-          yarn install --frozen-lockfile
-          yarn build:docs
+          npm ci
+          npm run build:docs
 
       - name: mkdocs deploy master
         if: contains(github.ref, 'refs/heads/master')

.github/workflows/mkdocs-manual.yml

@@ -37,8 +37,8 @@ jobs:
 
       - name: Generate Extensions API Reference using typedocs
         run: |
-          yarn install
-          yarn typedocs-extensions-api
+          npm install
+          npm run typedocs-extensions-api
 
       - name: Checkout master branch from lens
         uses: actions/checkout@v3

.github/workflows/publish-release-npm.yml

@@ -32,16 +32,16 @@ jobs:
 
       - name: Generate NPM packages
         run: |
-          yarn install --frozen-lockfile
-          yarn run build
+          npm ci
+          npm run build
 
       - name: Publish NPM packages
         run: |
           npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
           VERSION=$(cat lerna.json | jq '.version' --raw-output)
           echo ${VERSION}
           DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION})
-          yarn lerna \
+          npx lerna \
             publish from-package \
             --no-push \
             --no-git-tag-version \

.github/workflows/test.yml

@@ -32,28 +32,30 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
+      - name: Get npm cache directory path
+        if: ${{ runner.os != 'Windows' }}
+        id: npm-cache-dir-path
         shell: bash
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        if: ${{ runner.os != 'Windows' }}
+        id: npm-cache # use this to check for `cache-hit` (`steps.npm-cache.outputs.cache-hit != 'true'`)
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.npm-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-
+            ${{ runner.os }}-npm-
 
       - uses: nick-fields/retry@v2
         name: Install dependencies
         with:
           timeout_minutes: 20
           max_attempts: 3
           retry_on: error
-          command: yarn install --frozen-lockfile
+          command: npm ci
 
-      - run: yarn run test:unit
+      - run: npm run test:unit
         name: Run tests
         if: ${{ matrix.type == 'unit' }}
 
@@ -64,15 +66,15 @@ jobs:
           minikube-version: latest
         if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
-      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' yarn run test:integration
+      - run: xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' npm run test:integration
         name: Run Linux integration tests
         if: ${{ runner.os == 'Linux' && matrix.type == 'smoke' }}
 
-      - run: yarn run test:integration
+      - run: npm run test:integration
         name: Run macOS integration tests
         shell: bash
         if: ${{ runner.os == 'macOS' && matrix.type == 'smoke' }}
 
-      - run: yarn run test:integration
+      - run: npm run test:integration
         name: Run Windows integration tests
         if: ${{ runner.os == 'Windows' && matrix.type == 'smoke' }}

.npmrc

@@ -1 +1,3 @@
-engine-strict=true
+disturl "https://electronjs.org/headers"
+target "19.0.4"
+runtime "electron"

RELEASE_GUIDE.md

@@ -5,15 +5,15 @@ All releases will be made by creating a PR which bumps the version field in the
 
 ## Prerequisites
 
-- `yarn`
-- Running `yarn` (to install all dependencies)
+- `npm`
+- Running `npm install`
 - `gh` (Github's CLI) with a version at least 2.15.0
 
 ## Steps
 
 1. If you are making a minor or major release (or prereleases for one) make sure you are on the `master` branch.
 1. If you are making a patch release (or a prerelease for one) make sure you are on the `release/v<MAJOR>.<MINOR>` branch.
-1. Run `yarn create-release-pr <release-type>`. If you are making a subsequent prerelease release, provide the `--check-commits` flag.
+1. Run `npm run create-release-pr <release-type>`. If you are making a subsequent prerelease release, provide the `--check-commits` flag.
 1. If you are checking the commits, type `y<ENTER>` to pick a commit, and `n<ENTER>` to skip it. You will want to skip the commits that were part of previous prerelease releases.
 1. Once the PR is created, approved, and then merged the `Release Open Lens` workflow will create a tag and release for you.
 1. If you are making a major or minor release, create a `release/v<MAJOR>.<MINOR>` branch and push it to `origin` so that future patch releases can be made from it.

lerna.json

@@ -1,11 +1,8 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "useWorkspaces": false,
-  "packages": [
-    "packages/*"
-  ],
+  "useWorkspaces": true,
   "version": "6.4.0-beta.13",
-  "npmClient": "yarn",
+  "npmClient": "npm",
   "npmClientArgs": [
     "--network-timeout=100000"
   ]