Build: Remove package-lock.json

Per https://timotijhof.net/posts/2024/lockfiles-for-apps-not-packages-still/
qunitjs · Sep 13, 2024 · 92306e1 · 92306e1
1 parent bf42d2b
commit 92306e1
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 10,609 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -51,7 +51,7 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
       FORCE_COLOR: "1"
     steps:
       - uses: actions/checkout@v4
@@ -62,14 +62,14 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
-      - run: npm ci
+      - run: npm install
 
       - name: Tests
         run: ${{ matrix.script }}
@@ -89,23 +89,23 @@ jobs:
     name: SpiderMonkey 68
     runs-on: ubuntu-20.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-fast install -y libmozjs-68-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js68 test/mozjs.js
@@ -127,23 +127,23 @@ jobs:
     name: SpiderMonkey 102
     runs-on: ubuntu-24.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-get install -y libmozjs-102-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js102 test/mozjs.js
@@ -165,23 +165,23 @@ jobs:
     name: SpiderMonkey 115
     runs-on: ubuntu-24.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
         with:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Install mozjs
         run: |
           sudo apt-get install -y libmozjs-115-dev
-      - run: npm ci
+      - run: npm install
       - run: npm run build
       - name: Test mozjs.js
         run: js115 test/mozjs.js

diff --git a/.github/workflows/browsers-full.yaml b/.github/workflows/browsers-full.yaml
@@ -17,7 +17,7 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-latest
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
 
@@ -26,7 +26,7 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
 
       - name: Prepare
         run: |
-          npm ci
+          npm install
           npm run build
 
       - name: Tests

diff --git a/.github/workflows/browsers-quick.yaml b/.github/workflows/browsers-quick.yaml
@@ -8,7 +8,7 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-latest
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
 
@@ -17,7 +17,7 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
@@ -26,7 +26,7 @@ jobs:
 
       - name: Prepare
         run: |
-          npm ci
+          npm install
           npm run build
 
       # To debug locally:

diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -8,7 +8,7 @@ jobs:
     if: ${{ github.repository == 'qunitjs/qunit' }} # skip on forks, needs secret
     runs-on: ubuntu-20.04
     env:
-      PUPPETEER_DOWNLOAD_PATH: "${{ github.workspace }}/.puppeteer_download"
+      PUPPETEER_CACHE_DIR: "${{ github.workspace }}/.puppeteer_download"
     steps:
       - uses: actions/checkout@v4
 
@@ -17,14 +17,14 @@ jobs:
           path: |
             ~/.npm
             ${{ github.workspace }}/.puppeteer_download
-          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
 
       - name: Use Node.js 18
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
 
-      - run: npm ci
+      - run: npm install
 
       - name: Tests
         run: npm run coverage

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 /qunit/
 /temp/
 /.eslintcache
+/package-lock.json
diff --git a/build/reproducible-builds.js b/build/reproducible-builds.js
@@ -54,7 +54,7 @@ async function buildRelease (version, cacheDir = null) {
     npm_config_update_notifier: 'false',
     PATH: process.env.PATH,
     QUNIT_BUILD_RELEASE: '1',
-    PUPPETEER_DOWNLOAD_PATH: path.join(cacheDir, 'puppeteer_download')
+    PUPPETEER_CACHE_DIR: path.join(cacheDir, 'puppeteer_download')
   };
   // Use sync for npm-ci to avoid concurrency bugs with shared cache
   cp.execFileSync('npm', ['ci'], {

diff --git a/demos/bundlers.mjs b/demos/bundlers.mjs
@@ -152,10 +152,14 @@ Testing http://localhost:8000/tmp/test-require-sub.webpack.html .OK
 
 Done.`;
 
-  const actual = cp.execSync('node_modules/.bin/grunt test', {
-    cwd: DIR,
-    env: { PATH: process.env.PATH },
-    encoding: 'utf8'
-  });
-  assert.equal(normalize(actual).trim(), expected);
+  try {
+    const actual = cp.execSync('node_modules/.bin/grunt test', {
+      cwd: DIR,
+      env: { PATH: process.env.PATH },
+      encoding: 'utf8'
+    });
+    assert.equal(normalize(actual).trim(), expected);
+  } catch (e) {
+    assert.equal(e.stdout || e.stderr, '', 'error');
+  }
 });
diff --git a/demos/grunt-contrib-qunit.js b/demos/grunt-contrib-qunit.js
@@ -33,7 +33,7 @@ QUnit.test.each('failing tests', {
 >>     at file:fail-uncaught.html:16`]
 }, (assert, [command, expected]) => {
   try {
-    // This will use env CI, CHROMIUM_FLAGS, and PUPPETEER_DOWNLOAD_PATH
+    // This will use env CI, CHROMIUM_FLAGS, and PUPPETEER_CACHE_DIR
     const ret = cp.execSync('node_modules/.bin/grunt qunit:' + command, {
       cwd: DIR,
       encoding: 'utf8'