Check for 'development' env var in postinstall script

maplibre · Feb 12, 2022 · 5eb6793 · 5eb6793
1 parent 45ea581
commit 5eb6793
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 2 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -24,6 +24,7 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - name: Download branch artifact
         uses: dawidd6/action-download-artifact@v2
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,6 +17,7 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run generate-typings
       - run: npm run build-prod-min
       - run: npm run build-prod

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -30,6 +30,7 @@ jobs:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run lint
       - run: npm run lint-docs
       - run: npm run lint-css
diff --git a/.github/workflows/publish-style-spec.yml b/.github/workflows/publish-style-spec.yml
@@ -21,6 +21,8 @@ jobs:
 
       - name: Install GL JS
         run: npm ci
+
+      - run: npm run dev-postinstall
 
       - name: Build GL JS
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,6 +40,8 @@ jobs:
       - name: Install
         run: npm ci
 
+      - run: npm run dev-postinstall
+
       - name: Prepare release
         id: prepare_release
         run: |

diff --git a/.github/workflows/test-browser.yml b/.github/workflows/test-browser.yml
@@ -18,5 +18,6 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run build-dev
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-browser
diff --git a/.github/workflows/test-expression.yml b/.github/workflows/test-expression.yml
@@ -18,4 +18,5 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run test-expression
diff --git a/.github/workflows/test-query.yml b/.github/workflows/test-query.yml
@@ -18,5 +18,6 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run build-dev
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-query
diff --git a/.github/workflows/test-render.yml b/.github/workflows/test-render.yml
@@ -17,6 +17,7 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run build-dev
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-render
       - uses: actions/upload-artifact@v2

diff --git a/.github/workflows/test-style-spec.yml b/.github/workflows/test-style-spec.yml
@@ -18,5 +18,6 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run build-dev
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-style-spec
diff --git a/.github/workflows/test-symbol-shaping.yml b/.github/workflows/test-symbol-shaping.yml
@@ -18,5 +18,6 @@ jobs:
           node-version: 16
           architecture: x64
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run build-dev
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-symbol-shaping
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -27,6 +27,7 @@ jobs:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: npm run test-unit
 
   test_unit_ubuntu:
@@ -49,4 +50,5 @@ jobs:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.architecture }}
       - run: npm ci
+      - run: npm run dev-postinstall
       - run: xvfb-run -s "-ac -screen 0 1280x1024x24" npm run test-unit
diff --git a/.github/workflows/upload-benchmarks.yml b/.github/workflows/upload-benchmarks.yml
@@ -20,6 +20,8 @@ jobs:
       - name: Install
         run: npm ci
 
+      - run: npm run dev-postinstall
+
       - name: Build benchmarks
         run: npm run build-benchmarks
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@
 ### 🐞 Bug fixes
 
 - *...Add new stuff here...*
+
+## 2.1.3
+
+### 🐞 Bug fixes
+
+- Fix postinstall `ts-node` error on non-dev installs (#900)
+
 ## 2.1.2
 
 ### Features and improvements

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,6 +27,7 @@ Install node module dependencies
 ```bash
 cd maplibre-gl-js &&
 npm install
+npm run dev-postinstall
 ```
 
 ### Linux
@@ -56,6 +57,7 @@ Install node module dependencies
 ```bash
 cd maplibre-gl-js &&
 npm install
+npm run dev-postinstall
 ```
 
 ### Windows
@@ -72,6 +74,7 @@ Install node module dependencies
 ```bash
 cd maplibre-gl-js
 npm install
+npm run dev-postinstall
 ```
 
 Install headless-gl dependencies https://github.com/stackgl/headless-gl#windows

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "maplibre-gl",
   "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library",
-  "version": "2.1.3-pre.1",
+  "version": "2.1.3",
   "main": "dist/maplibre-gl.js",
   "style": "dist/maplibre-gl.css",
   "license": "BSD-3-Clause",
@@ -171,7 +171,8 @@
     "codegen": "npm run generate-style-code && npm run generate-struct-arrays && npm run generate-style-spec && npm run generate-shaders",
     "benchmark": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/run-benchmarks.ts",
     "gl-stats": "node --loader ts-node/esm --experimental-specifier-resolution=node test/bench/gl-stats.ts",
-    "prepare": "husky install && npm run codegen && npm run generate-query-test-fixtures"
+    "postinstall": "node ./postinstall.js",
+    "prepare": "husky install"
   },
   "files": [
     "build/",

diff --git a/postinstall.js b/postinstall.js
@@ -0,0 +1,5 @@
+import {execSync} from 'child_process';
+
+if (process.env.NODE_ENV === 'development') {
+    execSync('npm run codegen && npm run generate-query-test-fixtures');
+}