Merge branch 'master' into feat/license-check-allow-list

# Conflicts:
#	bin/checkLicenses.mjs

.github/workflows/publish.yaml

@@ -53,4 +53,5 @@ jobs:
 
           echo "**Published:** $NEW_VERSION" >> $GITHUB_STEP_SUMMARY
         env:
+          NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           CI: true

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Convential Commits](https://www.conventionalcommits.org/en/v1.0.0/#specification) for commit guidelines.
 
+## [2.5.0](https://github.com/nrkno/sofie-code-standard-preset/compare/v2.4.7...v2.5.0) (Wed Aug 09 2023)
+
+
+### Fixes
+
+* add BlueOak-1.0.0 to allowed licenses (#20) [f22f78f](https://github.com/nrkno/sofie-code-standard-preset/commit/f22f78fb20b9628955875817fc5cf313871056d8)
+* use license-checker directly instead of CLI [a685321](https://github.com/nrkno/sofie-code-standard-preset/commit/a6853219deb48dbb5830834f283dee7a8aaf3138)
+
+### Features
+
+* switch from eslint-plugin-node to eslint-plugin-n [722cad9](https://github.com/nrkno/sofie-code-standard-preset/commit/722cad945fed86c7c1c6c021d53f6fe0e7fdda09)
+
 ## [2.4.7](https://github.com/nrkno/sofie-code-standard-preset/compare/v2.4.6...v2.4.7) (Wed May 10 2023)
 
 

bin/checkLicenses.mjs

@@ -1,9 +1,7 @@
 #! /usr/bin/env node
 'use strict'
 import meow from 'meow'
-import { createRequire } from 'module'
 import { readPackageUpSync } from 'read-pkg-up'
-import shell from 'shelljs'
 import path from 'path'
 import checker from 'license-checker'
 
@@ -37,7 +35,7 @@ const pkgInfo = readPackageUpSync()
 const projectNameAndVersion = `${pkgInfo.packageJson.name}@${pkgInfo.packageJson.version}`
 
 const allowLists = {
-	MIT: 'MIT;BSD;ISC;Apache-2.0;CC0;CC-BY-3.0;CC-BY-4.0;Unlicense;Artistic-2.0;Python-2.0',
+	MIT: 'MIT;BSD;ISC;Apache-2.0;CC0;CC-BY-3.0;CC-BY-4.0;Unlicense;Artistic-2.0;Python-2.0;BlueOak-1.0.0',
 	none: '',
 	// TODO - Add allowList with a list for GPL projects
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/code-standard-preset",
-	"version": "2.4.7",
+	"version": "2.5.0",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
@@ -64,8 +64,7 @@
 		"meow": "^11.0.0",
 		"prettier": "^2.8.8",
 		"read-pkg-up": "^9.1.0",
-		"semver": "^7.5.2",
-		"shelljs": "^0.8.5"
+		"semver": "^7.5.2"
 	},
 	"peerDependencies": {
 		"typescript": "~4.9"

yarn.lock

@@ -156,7 +156,6 @@ __metadata:
     prettier: ^2.8.8
     read-pkg-up: ^9.1.0
     semver: ^7.5.2
-    shelljs: ^0.8.5
   peerDependencies:
     typescript: ~4.9
   bin:
@@ -1150,7 +1149,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.0.0, glob@npm:^7.1.1, glob@npm:^7.1.3":
+"glob@npm:^7.1.1, glob@npm:^7.1.3":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
   dependencies:
@@ -1334,13 +1333,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"interpret@npm:^1.0.0":
-  version: 1.4.0
-  resolution: "interpret@npm:1.4.0"
-  checksum: 2e5f51268b5941e4a17e4ef0575bc91ed0ab5f8515e3cf77486f7c14d13f3010df9c0959f37063dcc96e78d12dc6b0bb1b9e111cdfe69771f4656d2993d36155
-  languageName: node
-  linkType: hard
-
 "is-arrayish@npm:^0.2.1":
   version: 0.2.1
   resolution: "is-arrayish@npm:0.2.1"
@@ -2139,15 +2131,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rechoir@npm:^0.6.2":
-  version: 0.6.2
-  resolution: "rechoir@npm:0.6.2"
-  dependencies:
-    resolve: ^1.1.6
-  checksum: fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b
-  languageName: node
-  linkType: hard
-
 "redent@npm:^4.0.0":
   version: 4.0.0
   resolution: "redent@npm:4.0.0"
@@ -2172,7 +2155,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.22.2":
+"resolve@npm:^1.10.0, resolve@npm:^1.22.2":
   version: 1.22.3
   resolution: "resolve@npm:1.22.3"
   dependencies:
@@ -2185,7 +2168,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.2#~builtin<compat/resolve>":
   version: 1.22.3
   resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin<compat/resolve>::version=1.22.3&hash=c3c19d"
   dependencies:
@@ -2252,11 +2235,11 @@ __metadata:
   linkType: hard
 
 "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0":
-  version: 5.7.1
-  resolution: "semver@npm:5.7.1"
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
   bin:
     semver: ./bin/semver
-  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
+  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
   languageName: node
   linkType: hard
 
@@ -2287,19 +2270,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shelljs@npm:^0.8.5":
-  version: 0.8.5
-  resolution: "shelljs@npm:0.8.5"
-  dependencies:
-    glob: ^7.0.0
-    interpret: ^1.0.0
-    rechoir: ^0.6.2
-  bin:
-    shjs: bin/shjs
-  checksum: 7babc46f732a98f4c054ec1f048b55b9149b98aa2da32f6cf9844c434b43c6251efebd6eec120937bd0999e13811ebd45efe17410edb3ca938f82f9381302748
-  languageName: node
-  linkType: hard
-
 "signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"