Update package.json, pipelines, and actions

.github/actions/setup-node-npm-ci/action.yaml

@@ -1,4 +1,4 @@
-name: Setup Node and run `npm ci`
+name: Setup Node and run `npm install --no-package-lock`
 description: Uses specified Node version and runs npm commands to set up the environment for REST API CI
 
 inputs:
@@ -14,7 +14,7 @@ runs:
       with:
         node-version: ${{ inputs.node-version }}
 
-    - run: npm ci
+    - run: npm install --no-package-lock
       shell: bash
 
     - run: npm ls -a

.github/workflows/typespec-validation-all.yaml

@@ -64,6 +64,11 @@ jobs:
         with:
           # Convert placeholder string 'default' to '', which tells the action to checkout the default ref.
           ref: ${{ matrix.ref == 'next' && 'typespec-next' || '' }}
+          # Checkout all history for all branches.  Required to merge origin/main.
+          fetch-depth: 0
+
+      - name: git merge origin/main
+        run: git -c user.name="azure-sdk" -c user.email="[email protected]" merge -Xours origin/main
 
       - name: Setup Node and run `npm ci`
         uses: ./.github/actions/setup-node-npm-ci

.github/workflows/typespec-validation.yaml

@@ -10,7 +10,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 2
+        # Checkout all history for all branches.  Required to merge origin/main.
+        fetch-depth: 0
+
+    - name: git merge origin/main
+      run: git -c user.name="azure-sdk" -c user.email="[email protected]" merge -Xours origin/main
 
     - name: Setup Node and run `npm ci`
       uses: ./.github/actions/setup-node-npm-ci

eng/pipelines/templates/steps/npm-install.yml

@@ -11,8 +11,8 @@ steps:
   - script: npm --version --loglevel info
     displayName: npm --version
 
-  - script: npm ci
-    displayName: npm ci
+  - script: npm install --no-package-lock
+    displayName: npm install --no-package-lock
 
   - script: npm ls -a
     displayName: npm ls -a

package.json

@@ -1,24 +1,20 @@
 {
   "name": "azure-rest-api-specs",
   "devDependencies": {
-    "@azure-tools/typespec-apiview": "0.4.9",
-    "@azure-tools/typespec-autorest": "0.48.0",
-    "@azure-tools/typespec-azure-core": "0.48.0",
-    "@azure-tools/typespec-azure-portal-core": "0.48.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.48.0",
-    "@azure-tools/typespec-azure-rulesets": "0.48.0",
-    "@azure-tools/typespec-client-generator-cli": "0.13.3",
-    "@azure-tools/typespec-client-generator-core": "0.48.1",
+    "@azure-tools/typespec-autorest": "next",
+    "@azure-tools/typespec-azure-core": "next",
+    "@azure-tools/typespec-azure-portal-core": "next",
+    "@azure-tools/typespec-azure-resource-manager": "next",
+    "@azure-tools/typespec-azure-rulesets": "next",
+    "@azure-tools/typespec-client-generator-core": "next",
     "@azure-tools/typespec-liftr-base": "0.4.0",
     "@azure/avocado": "^0.9.1",
-    "@typespec/compiler": "0.62.0",
-    "@typespec/http": "0.62.0",
-    "@typespec/openapi": "0.62.0",
-    "@typespec/openapi3": "0.62.0",
-    "@typespec/prettier-plugin-typespec": "0.62.0",
-    "@typespec/rest": "0.62.0",
-    "@typespec/streams": "0.62.0",
-    "@typespec/versioning": "0.62.0",
+    "@typespec/compiler": "next",
+    "@typespec/http": "next",
+    "@typespec/openapi": "next",
+    "@typespec/openapi3": "next",
+    "@typespec/rest": "next",
+    "@typespec/versioning": "next",
     "azure-rest-api-specs-eng-tools": "file:eng/tools",
     "oav": "^3.5.1",
     "prettier": "~3.3.3",