Merge pull request #79 from bugsnag/release/v2.3.1

Release/v2.3.1

Author: djskinner

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.3.1 (2022-02-04)
+
+### Fixed
+
+- handle the webpack 5 default devtoolModuleFilenameTemplate format [#78](https://github.com/bugsnag/bugsnag-source-maps/pull/78)
+
 ## 2.3.0 (2021-08-05)
 
 - Add `--idle-timeout` flag to control the HTTP request timeout ([see Node documentation](https://nodejs.org/api/http.html#http_request_settimeout_timeout_callback)) [#74](https://github.com/bugsnag/bugsnag-source-maps/pull/74)

CONTRIBUTING.md

@@ -17,10 +17,14 @@ To start a release:
 
 Once the release PR has been approved, merge the PR into `main`. You are now ready to make the release. Ensure you are logged in to npm and that you have access to publish the package.
 
-- Bump the package version:
+- Make sure you are on the latest `main`.
+
+- Bump the package version and push the new commit and tag:
 
   ```
   npm version <major|minor|patch>
+  git push origin main
+  git push --tags
   ```
 
 - Publish the new version to npm:
@@ -32,7 +36,7 @@ Once the release PR has been approved, merge the PR into `main`. You are now rea
 Finally:
 
 - create a release on GitHub https://github.com/bugsnag/bugsnag-source-maps/releases/new
-- A new tag vX.Y.Z will be created on publish
+- Use the existing tag created during the version step above
 - copy the release notes from `CHANGELOG.md`
 - publish the release
 - update and push `next`:

features/browser-upload-one.feature

@@ -295,3 +295,24 @@ Feature: Browser source map upload one
     And the sourcemap payload field "minifiedUrl" equals "http://myapp.url/static/js/main.js" for all requests
     And the sourcemap payload field "sourceMap" matches the expected source map for "single-source-map-webpack" for all requests
     And the sourcemap payload field "minifiedFile" matches the expected minified file for "single-source-map-webpack" for all requests
+
+  Scenario: Sources are added to the upload when devtool: nosources-source-map is used
+    When I run the service "webpack-nosources" with the command
+      """
+      bugsnag-source-maps upload-browser
+        --api-key 123
+        --app-version 2.0.0
+        --source-map dist/main.js.map
+        --bundle dist/main.js
+        --bundle-url "http://myapp.url/static/js/main.js"
+        --endpoint http://maze-runner:9339
+      """
+    And I wait to receive 1 sourcemap
+    Then the sourcemap payload field "apiKey" equals "123"
+    And the sourcemap payload field "appVersion" equals "2.0.0"
+    And the sourcemap payload field "overwrite" is null
+    And the sourcemap payload field "minifiedUrl" equals "http://myapp.url/static/js/main.js"
+    And the sourcemap payload field "sourceMap" matches the expected source map for "webpack-nosources"
+    And the sourcemap payload field "minifiedFile" matches the expected minified file for "webpack-nosources"
+    And the Content-Type header is valid multipart form-data
+    And the last run docker command exited successfully

features/expected/multiple-source-map-webpack/main-b3944033.json

@@ -1,11 +1,11 @@
 {
     "version": 3,
     "sources": [
-        "dist/webpack:/multiple-source-map-webpack/src/lib/b.js",
-        "dist/webpack:/multiple-source-map-webpack/webpack/bootstrap",
-        "dist/webpack:/multiple-source-map-webpack/webpack/runtime/hasOwnProperty shorthand",
-        "dist/webpack:/multiple-source-map-webpack/webpack/runtime/jsonp chunk loading",
-        "dist/webpack:/multiple-source-map-webpack/webpack/startup"
+        "src/lib/b.js",
+        "webpack://multiple-source-map-webpack/webpack/bootstrap",
+        "webpack://multiple-source-map-webpack/webpack/runtime/hasOwnProperty shorthand",
+        "webpack://multiple-source-map-webpack/webpack/runtime/jsonp chunk loading",
+        "webpack://multiple-source-map-webpack/webpack/startup"
     ],
     "names": [
         "console",

features/expected/multiple-source-map-webpack/main-cb48d68d.json

@@ -1,7 +1,7 @@
 {
     "version": 3,
     "sources": [
-        "dist/webpack:/multiple-source-map-webpack/src/lib/a.js"
+        "src/lib/a.js"
     ],
     "names": [
         "console",

features/expected/multiple-source-map-webpack/main-d89fcf10.json

@@ -1,7 +1,7 @@
 {
     "version": 3,
     "sources": [
-        "dist/webpack:/multiple-source-map-webpack/src/index.js"
+        "src/index.js"
     ],
     "names": [
         "console",

features/expected/single-source-map-webpack/source-map.json

@@ -1,10 +1,10 @@
 {
     "version": 3,
     "sources": [
-        "dist/webpack:/single-source-map-webpack/src/lib/a.js",
-        "dist/webpack:/single-source-map-webpack/src/lib/b.js",
-        "dist/webpack:/single-source-map-webpack/webpack/bootstrap",
-        "dist/webpack:/single-source-map-webpack/src/index.js"
+        "src/lib/a.js",
+        "src/lib/b.js",
+        "webpack://single-source-map-webpack/webpack/bootstrap",
+        "src/index.js"
     ],
     "names": [
         "console",

features/expected/webpack-nosources/minified-file.js

@@ -0,0 +1,28 @@
+{
+    "version": 3,
+    "sources": [
+        "src/lib/a.js",
+        "src/lib/b.js",
+        "webpack://webpack-nosources/webpack/bootstrap",
+        "src/index.js"
+    ],
+    "names": [
+        "console",
+        "log",
+        "__webpack_module_cache__",
+        "__webpack_require__",
+        "moduleId",
+        "exports",
+        "module",
+        "__webpack_modules__"
+    ],
+    "mappings": "sBAAAA,QAAQC,IAAI,c,SCAZD,QAAQC,IAAI,eCCRC,EAA2B,GAG/B,SAASC,EAAoBC,GAE5B,GAAGF,EAAyBE,GAC3B,OAAOF,EAAyBE,GAAUC,QAG3C,IAAIC,EAASJ,EAAyBE,GAAY,CAGjDC,QAAS,IAOV,OAHAE,EAAoBH,GAAUE,EAAQA,EAAOD,QAASF,GAG/CG,EAAOD,QCpBfL,QAAQC,IAAI,MAEZ,EAAQ,KACR,EAAQ,M",
+    "file": "main.js",
+    "sourceRoot": "",
+    "sourcesContent": [
+        "console.log('hi from a')\n",
+        "console.log('hi from b')\n",
+        null,
+        "console.log('hi')\n\nrequire('./lib/a')\nrequire('./lib/b')\n"
+    ]
+}

features/expected/webpack-nosources/source-map.json

@@ -36,6 +36,10 @@ services:
       context: source-map-babel
       dockerfile: Dockerfile.browser-multiple
 
+  webpack-nosources:
+    build:
+      context: webpack-nosources
+
   single-source-map-react-native-0-60-ios:
     build:
       context: rn0_60

features/fixtures/docker-compose.yml

@@ -0,0 +1,12 @@
+FROM node:lts-alpine
+
+WORKDIR /app
+
+COPY build/bugsnag-source-maps.tgz build/bugsnag-source-maps.tgz
+COPY src/ src/
+COPY package.json package-lock.json ./
+COPY webpack.config.js ./
+
+RUN npm ci
+RUN npm install -g ./build/bugsnag-source-maps.tgz
+RUN npm run build

features/fixtures/webpack-nosources/Dockerfile

@@ -0,0 +1,2 @@
+*
+!.gitignore