Skip to content

Commit

Permalink
Merge pull request #202 from NordicSemiconductor/small_fixes
Browse files Browse the repository at this point in the history
Small fixes
  • Loading branch information
datenreisender authored Oct 6, 2021
2 parents 636eab5 + f6d7fdf commit b0e45da
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 5.3.2 - 2021-10-06
### Fixed
- Removed the outdated externals `pc-nrfjprog-js`, `usb`, and
`nrf-device-setup` from the webpack config for apps.
- Handle trailing slashes in `.gitignore` correctly in
`bin/nrfconnect-license.mjs`.

## 5.3.1 - 2021-10-05
### Fixed
- Add ambient module for resolving css modules
Expand Down
3 changes: 3 additions & 0 deletions bin/nrfconnect-license.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,15 @@ const checkLicense = () => {
}
};

const removeTrailingSlashes = entry => entry.replace(/\/$/, '');

// Replace entries like '/node_modules' with something like 'node_modules/**'
const replaceRootEntries = entry => entry.replace(/^\/(.*)/, '$1/**');

const entriesInGitignore = readFileSync('.gitignore', { encoding: 'utf8' })
.trim()
.split(/\r?\n/)
.map(removeTrailingSlashes)
.map(replaceRootEntries);

const allSourceFiles = () =>
Expand Down
3 changes: 0 additions & 3 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ function createExternals() {
'serialport',
'nrf-device-lib-js',
'pc-ble-driver-js',
'pc-nrfjprog-js',
'usb',
'nrf-device-setup',
'nrfconnect/core',
'pc-nrfconnect-shared',
'@nordicsemiconductor/nrf-device-lib-js',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pc-nrfconnect-shared",
"version": "5.3.1",
"version": "5.3.2",
"description": "Shared commodities for developing pc-nrfconnect-* packages",
"repository": {
"type": "git",
Expand Down

0 comments on commit b0e45da

Please sign in to comment.