Merge remote-tracking branch 'origin/stable' into sync-constructors-backport

Author: cspotcode

.gitattributes

@@ -1,3 +1,5 @@
+* text=auto eol=lf
+
 dist/source-map.debug.js binary
 dist/source-map.js binary
 dist/source-map.min.js binary

.github/workflows/continuous-integration.yml

@@ -0,0 +1,54 @@
+name: Continuous Integration
+on:
+  # branches pushed by collaborators
+  push:
+    branches:
+      - master
+  # pull request from non-collaborators
+  pull_request: {}
+  # nightly
+  schedule:
+    - cron:  '0 0 * * *'
+jobs:
+  build:
+    name: "Test: ${{ matrix.os }}, node ${{ matrix.node }}"
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, windows]
+        node:
+          - 16
+          - 14
+          - 12
+    steps:
+      # checkout code
+      - uses: actions/checkout@v2
+      # install node
+      - name: Use Node.js ${{ matrix.os }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
+      # npm install with caching
+      - run: |
+          npm config set cache "$( node -p "process.cwd()" )/temp/npm-cache"
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: temp/npm-cache
+          key: npm-cache-${{ matrix.os }} ${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
+          # restore-keys: npm-cache-${{ matrix.os }} ${{ matrix.node }}-
+      - run: npm install
+
+      # Run tests
+      - run: npm run coverage
+
+      # Upload coverage
+      - run: npm run coverage-report
+        if: ${{ always() }}
+      - name: Codecov
+        if: ${{ always() }}
+        uses: codecov/codecov-action@v1
+        with:
+          flags: ${{ matrix.os }},node_${{ matrix.node }}

.travis.yml

@@ -1,10 +1,8 @@
 # Source Map
 
-[![Build Status](https://travis-ci.org/mozilla/source-map.png?branch=master)](https://travis-ci.org/mozilla/source-map)
-
-[![Coverage Status](https://coveralls.io/repos/github/mozilla/source-map/badge.svg)](https://coveralls.io/github/mozilla/source-map)
-
-[![NPM](https://nodei.co/npm/source-map.png?downloads=true&downloadRank=true)](https://www.npmjs.com/package/source-map)
+[![Build status](https://img.shields.io/github/workflow/status/cspotcode/source-map/Continuous%20Integration)](https://github.com/cspotcode/source-map/actions?query=workflow%3A%22Continuous+Integration%22)
+[![Test coverage](https://codecov.io/gh/cspotcode/source-map/branch/master/graph/badge.svg)](https://codecov.io/gh/cspotcode/source-map)
+[![NPM](https://nodei.co/npm/@cspotcode/source-map.png?downloads=true&downloadRank=true)](https://www.npmjs.com/package/@cspotcode/source-map)
 
 This is a library to generate and consume the source map format
 [described here][format].
@@ -13,7 +11,7 @@ This is a library to generate and consume the source map format
 
 ## Use with Node
 
-    $ npm install source-map
+    $ npm install @cspotcode/source-map
 
 ## Use on the Web
 

README.md

@@ -1,44 +1,25 @@
-if (typeof fetch === "function") {
-  // Web version of reading a wasm file into an array buffer.
+// Node version of reading a wasm file into an array buffer.
+const fs = require("fs");
+const path = require("path");
 
-  let mappingsWasmUrl = null;
-
-  module.exports = function readWasm() {
-    if (typeof mappingsWasmUrl !== "string") {
-      throw new Error("You must provide the URL of lib/mappings.wasm by calling " +
-                      "SourceMapConsumer.initialize({ 'lib/mappings.wasm': ... }) " +
-                      "before using SourceMapConsumer");
-    }
-
-    return fetch(mappingsWasmUrl)
-      .then(response => response.arrayBuffer());
-  };
-
-  module.exports.initialize = url => mappingsWasmUrl = url;
-} else {
-  // Node version of reading a wasm file into an array buffer.
-  const fs = require("fs");
-  const path = require("path");
-
-  module.exports = function readWasm() {
-    return new Promise((resolve, reject) => {
-      const wasmPath = path.join(__dirname, "mappings.wasm");
-      fs.readFile(wasmPath, null, (error, data) => {
-        if (error) {
-          reject(error);
-          return;
-        }
+module.exports = function readWasm() {
+  return new Promise((resolve, reject) => {
+    const wasmPath = path.join(__dirname, "mappings.wasm");
+    fs.readFile(wasmPath, null, (error, data) => {
+      if (error) {
+        reject(error);
+        return;
+      }
 
-        resolve(data.buffer);
-      });
+      resolve(data.buffer);
     });
-  };
-  module.exports.sync = function readWasmSync() {
-    const wasmPath = path.join(__dirname, "mappings.wasm");
-    return fs.readFileSync(wasmPath).buffer;
-  };
+  });
+};
+module.exports.sync = function readWasmSync() {
+  const wasmPath = path.join(__dirname, "mappings.wasm");
+  return fs.readFileSync(wasmPath).buffer;
+};
 
-  module.exports.initialize = _ => {
-    console.debug("SourceMapConsumer.initialize is a no-op when running in node.js");
-  };
-}
+module.exports.initialize = _ => {
+  console.debug("SourceMapConsumer.initialize is a no-op when running in node.js");
+};

lib/read-wasm.js

@@ -1,10 +1,11 @@
 {
-  "name": "source-map",
+  "name": "@cspotcode/source-map",
   "description": "Generates and consumes source maps",
   "version": "0.7.3",
-  "homepage": "https://github.com/mozilla/source-map",
-  "author": "Nick Fitzgerald <nfitzgerald@mozilla.com>",
+  "homepage": "https://github.com/cspotcode/source-map",
+  "author": "Andrew Bradley <cspotcode@gmail.com>",
   "contributors": [
+    "Nick Fitzgerald <[email protected]>",
     "Tobias Koppers <[email protected]>",
     "Duncan Beevers <[email protected]>",
     "Stephen Crane <[email protected]>",
@@ -44,18 +45,17 @@
   ],
   "repository": {
     "type": "git",
-    "url": "http://github.com/mozilla/source-map.git"
+    "url": "http://github.com/cspotcode/source-map.git"
   },
   "main": "./source-map.js",
   "types": "./source-map.d.ts",
   "files": [
-    "source-map.js",
-    "source-map.d.ts",
-    "lib/",
-    "dist/source-map.js"
+    "/source-map.js",
+    "/source-map.d.ts",
+    "/lib/"
   ],
   "engines": {
-    "node": ">= 8"
+    "node": ">= 12"
   },
   "license": "BSD-3-Clause",
   "scripts": {
@@ -66,6 +66,7 @@
     "test": "node test/run-tests.js",
     "precoverage": "npm run build",
     "coverage": "nyc node test/run-tests.js",
+    "coverage-report": "nyc report --reporter=lcov",
     "setup": "mkdir -p coverage && cp -n .waiting.html coverage/index.html || true",
     "dev:live": "live-server --port=4103 --ignorePattern='(js|css|png)$' coverage",
     "dev:watch": "watch 'npm run coverage' lib/ test/",