Test npm tarball in integration tests

GitOrigin-RevId: 5ca81f417a8aa5732cc4394a530066b20b80cf0a

Author: stepankuzmin

.github/workflows/ci.yml

@@ -44,35 +44,25 @@ jobs:
         cache-dependency-path: 'package-lock.json'
     - run: npm ci --no-audit --no-fund
     - run: npx playwright install chromium --with-deps --no-shell
+    - run: npm run build-token
     - run: npm run build-dev
     - run: npm run build-prod-min
     - run: npm run build-esm-prod-min
     - run: npm run build-style-spec
     - run: npm run build-csp
     - run: npm run build-css
     - run: npm run test-build
-    - run: xvfb-run -a npm run test-csp
     - run: xvfb-run -a npm run test-esm
-    - run: npm run build-token
+    - run: xvfb-run -a npm run test-csp
+    - run: npm run build-dts
     - run: npm run build -w vite-build-test
     - run: npm run build -w webpack-build-test
-    - run: npm run size
+    - run: npm run test -w typescript-build-test
     - run: npm run build-pmtiles
+    - run: npm run size
     - run: npm run prepare-release-pages
       if: ${{ always() }}
 
-  test-typings:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        cache: npm
-        node-version-file: '.nvmrc'
-        cache-dependency-path: 'package-lock.json'
-    - run: npm ci --no-audit --no-fund
-    - run: npm test --workspace test/build/typings
-
   test-unit:
     runs-on: ubuntu-latest
     timeout-minutes: 5
@@ -97,7 +87,6 @@ jobs:
     needs: [
       check,
       test-build,
-      test-typings,
       test-unit
     ]
     steps:
@@ -127,6 +116,5 @@ jobs:
         |-----|--------|
         | check | $(status_emoji "${{ needs.check.result }}") |
         | test-build | $(status_emoji "${{ needs.test-build.result }}") |
-        | test-typings | $(status_emoji "${{ needs.test-typings.result }}") |
         | test-unit | $(status_emoji "${{ needs.test-unit.result }}") |
         EOF

.gitignore

@@ -35,6 +35,7 @@ tests-to-run.txt
 **/test/integration/dist/**/*.json
 **/test/build/vite/dist/dist/*
 **/test/build/webpack/dist/*
+test/build/*.tgz
 .eslintcache
 src/style-spec/dist/index.cjs
 src/style-spec/dist/index.d.ts

package-lock.json

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+DEST="$(cd "$(dirname "$0")" && pwd)"
+cd "$DEST/../.."
+
+if [ ! -f dist/mapbox-gl.js ] || [ ! -d dist/esm ] || [ ! -d dist/style-spec ]; then
+  echo "pack.sh: dist/ artifacts missing. Run build-dev, build-prod, build-esm-prod, build-csp, build-css, build-style-spec, build-dts first." >&2
+  exit 1
+fi
+
+if [ -f "$DEST/mapbox-gl.tgz" ] && [ -f "$DEST/mapbox-gl-style-spec.tgz" ] \
+   && [ "$DEST/mapbox-gl.tgz" -nt dist/mapbox-gl.js ] \
+   && [ "$DEST/mapbox-gl-style-spec.tgz" -nt dist/style-spec/index.cjs ]; then
+  exit 0
+fi
+
+rm -f "$DEST"/mapbox-gl-*.tgz "$DEST"/mapbox-mapbox-gl-style-spec-*.tgz
+
+npm pack --pack-destination "$DEST"
+npm pack --pack-destination "$DEST" --workspace src/style-spec
+
+mv -f "$DEST"/mapbox-gl-[0-9]*.tgz "$DEST/mapbox-gl.tgz"
+mv -f "$DEST"/mapbox-mapbox-gl-style-spec-*.tgz "$DEST/mapbox-gl-style-spec.tgz"

test/build/pack.sh

@@ -1,5 +1,5 @@
 {
-  "name": "mapbox-gl-ts",
+  "name": "typescript-build-test",
   "scripts": {
     "pretest": "./pretest.sh",
     "tsc": "tsc --project tsconfig.json",

test/build/typings/package.json

@@ -1,17 +1,6 @@
 #!/bin/bash
-
 set -e
 
-pushd ../../../
-npm run build-dts
-npm run build-style-spec
-
-npm pack --pack-destination test/build/typings
-npm pack --pack-destination test/build/typings --workspace src/style-spec
-
-popd
-mv mapbox-gl-*.tgz mapbox-gl.tgz
-mv mapbox-mapbox-gl-style-spec-*.tgz mapbox-gl-style-spec.tgz
-
-npm install --no-save mapbox-gl.tgz mapbox-gl-style-spec.tgz
-rm *.tgz
+../pack.sh
+rm -rf node_modules/mapbox-gl node_modules/@mapbox/mapbox-gl-style-spec
+npm install --no-save ../mapbox-gl.tgz ../mapbox-gl-style-spec.tgz

test/build/typings/pretest.sh

@@ -1,5 +1,5 @@
-import mapbox from 'mapbox-gl/dist/esm/mapbox-gl.js';
-import 'mapbox-gl/dist/mapbox-gl.css';
+import mapbox from 'mapbox-gl/esm';
+import 'mapbox-gl/mapbox-gl.css';
 
 mapbox.accessToken = import.meta.env.VITE_MAPBOX_ACCESS_TOKEN;
 

test/build/vite/esm.js

@@ -4,12 +4,12 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "prebuild": "./pretest.sh",
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "devDependencies": {
-    "mapbox-gl": "file:../../../",
     "vite": "^8.0.8"
   }
 }

test/build/vite/package.json

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+../pack.sh
+rm -rf node_modules/mapbox-gl
+npm install --no-save ../mapbox-gl.tgz

test/build/vite/pretest.sh

@@ -1,7 +1,7 @@
 /* eslint-disable */
 
-import mapboxgl from '../../../dist/mapbox-gl-csp.js';
-import MapboxGLWorker from '../../../dist/mapbox-gl-csp-worker.js';
+import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp.js';
+import MapboxGLWorker from 'mapbox-gl/dist/mapbox-gl-csp-worker.js';
 
 mapboxgl.accessToken = window.prompt("Enter access token");
 mapboxgl.workerClass = MapboxGLWorker;