Skip to content

Commit

Permalink
Merge pull request #862 from adrianhall/issues/684
Browse files Browse the repository at this point in the history
(#684) Move to ESM, Fix for CVE audit failures
  • Loading branch information
Timothyw0 authored Jul 16, 2024
2 parents 9eb3720 + e5165ca commit 81adcab
Show file tree
Hide file tree
Showing 134 changed files with 12,300 additions and 12,477 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/azuresdkdrop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
strategy:
matrix:
os: [macos-12, windows-latest, ubuntu-latest]
node-version: [14.x, 16.x, 18.x]
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: main
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
Expand All @@ -32,11 +32,11 @@ jobs:
name: Package / tag / release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: main
- name: Use Node.js 18.x
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
uses: actions/download-artifact@v2
with:
name: package

# Login via OIDC to permit uploading to azure drops blob store
- name: 'Az login'
uses: azure/login@v2
Expand All @@ -115,4 +115,4 @@ jobs:
ls -la
PACKAGE_ID=`echo $(ls *.tgz) | sed -e 's/\.tgz$//'`
echo $PACKAGE_ID
az storage blob upload -n azure-staticwebapps/npm/$PACKAGE_ID/$(ls *.tgz) -c drops -f $(ls *.tgz) --account-name azuresdkpartnerdrops --auth-mode login
az storage blob upload -n azure-staticwebapps/npm/$PACKAGE_ID/$(ls *.tgz) -c drops -f $(ls *.tgz) --account-name azuresdkpartnerdrops --auth-mode login
58 changes: 29 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
format:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -28,18 +28,18 @@ jobs:
strategy:
matrix:
os: [macos-12]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "test: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -59,18 +59,18 @@ jobs:
strategy:
matrix:
os: [macos-12]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "deploy: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -92,18 +92,18 @@ jobs:
strategy:
matrix:
os: [windows-latest]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "test: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -115,26 +115,26 @@ jobs:
- name: "npm test"
run: |
npm ci
npm test -- --maxWorkers=1
npm test
e2e-deploy-windows:
needs: [test-windows]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "deploy: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -156,18 +156,18 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "test: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -187,18 +187,18 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
node-version: [14.x, 15.x, 16.x, 17.x, 18.x]
node-version: [18.x, 20.x]

name: "deploy: use node ${{ matrix.node-version }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-node-modules-${{ matrix.os }}-${{ matrix.node-version }}
with:
Expand All @@ -219,8 +219,8 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: git config --global user.email "[email protected]"
- run: git config --global user.name "Wassim Chegham"
- name: Setup Node.js environment
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/detection-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
detection-e2e-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 14.x
- name: Test framework detection
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
fail-fast: false
matrix:
os: [macos-12, windows-latest, ubuntu-20.04]
node-version: [14.x, 15.x, 16.x, 17.x]
node-version: [18.x, 20.x]

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Cypress run
uses: cypress-io/github-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
9 changes: 1 addition & 8 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"eg2.vscode-npm-script",
"visualstudioexptteam.vscodeintellicode",
"tht13.html-preview-vscode"
]
"recommendations": ["dbaeumer.vscode-eslint", "editorconfig.editorconfig", "esbenp.prettier-vscode", "visualstudioexptteam.vscodeintellicode"]
}
18 changes: 1 addition & 17 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
{
"configurations": [
{
"command": "npm start",
"name": "Run npm start",
"request": "launch",
"type": "node-terminal"
},
{
"type": "node-terminal",
"request": "launch",
"name": "Jest Tests",
"command": "node ${workspaceRoot}/node_modules/jest/bin/jest.js -i",
// "args": ["-i"],
"preLaunchTask": "build",
"internalConsoleOptions": "openOnSessionStart"
}
]
"configurations": []
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib"
}
Loading

0 comments on commit 81adcab

Please sign in to comment.