From 04e6ce8054c111bd93b5b70d3f2c8d6248a43232 Mon Sep 17 00:00:00 2001 From: jorenbroekema Date: Thu, 21 Dec 2023 14:25:36 +0100 Subject: [PATCH] chore: upgrade glob to latest, verify windows --- .github/workflows/release.yml | 5 ++-- .github/workflows/verify.yml | 16 +++++++--- package-lock.json | 56 +++++++++++++++-------------------- package.json | 2 +- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1060aa97b..f7a7b5b2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.x + # use lts, bump this if new major becomes lts + node-version: 20.x registry-url: 'https://registry.npmjs.org' - name: Install Dependencies diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index f9c9b2907..c95cf610f 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -5,17 +5,25 @@ on: pull_request jobs: verify: name: Verify changes - runs-on: ubuntu-latest strategy: matrix: - node-version: [18.x, 20.x] + # latest node & minimum node according to pkg.json engines + node-version: [18.0, 21.x] + os: [ubuntu-latest, windows-latest] + runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v2 + - name: Set git to use LF + run: | + git config --global core.autocrlf false + git config --global core.eol lf + + - uses: actions/checkout@v4 - name: Setup Node ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + cache: 'npm' - name: Install Dependencies run: npm ci diff --git a/package-lock.json b/package-lock.json index 2802a2ebd..dfbf7f762 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@bundled-es-modules/deepmerge": "^4.3.1", - "@bundled-es-modules/glob": "^10.3.5", + "@bundled-es-modules/glob": "^10.3.10", "@bundled-es-modules/memfs": "^4.2.3", "@bundled-es-modules/path-browserify": "^1.0.2", "chalk": "^5.3.0", @@ -2264,14 +2264,14 @@ } }, "node_modules/@bundled-es-modules/glob": { - "version": "10.3.5", - "resolved": "https://registry.npmjs.org/@bundled-es-modules/glob/-/glob-10.3.5.tgz", - "integrity": "sha512-Jn0WAgPKHfOm81mmF9RpzjTr/rdsOESoW9MVvaBBkXDhPhmeeqBugzfXlF0y56atlicKERqrXvW3D6jTQHU7Dw==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/@bundled-es-modules/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-s4vaIyGcYmEApZd1LUpiP+pocFh+yW4t11yEdS/R0PnSHvsEqNzsjQ2N1VIjwek43VRt62YcZAlGIQ7FCOVINg==", "hasInstallScript": true, "dependencies": { "buffer": "^6.0.3", "events": "^3.3.0", - "glob": "^10.3.3", + "glob": "^10.3.10", "patch-package": "^8.0.0", "path": "^0.12.7", "stream": "^0.0.2", @@ -2288,18 +2288,18 @@ } }, "node_modules/@bundled-es-modules/glob/node_modules/glob": { - "version": "10.3.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz", - "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -2322,14 +2322,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@bundled-es-modules/glob/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/@bundled-es-modules/glob/node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -10871,9 +10863,9 @@ } }, "node_modules/jackspeak": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz", - "integrity": "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -12260,6 +12252,14 @@ "node": ">=0.10.0" } }, + "node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/mitt": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", @@ -13652,21 +13652,13 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", - "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", "engines": { "node": "14 || >=16.14" } }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", diff --git a/package.json b/package.json index 047fabae6..e36702ec9 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "homepage": "https://github.com/amzn/style-dictionary", "dependencies": { "@bundled-es-modules/deepmerge": "^4.3.1", - "@bundled-es-modules/glob": "^10.3.5", + "@bundled-es-modules/glob": "^10.3.10", "@bundled-es-modules/memfs": "^4.2.3", "@bundled-es-modules/path-browserify": "^1.0.2", "chalk": "^5.3.0",