@nordicsemiconductor/pc-nrfconnect-shared 89.0.0 → 91.0.0

package/scripts/check-app-properties.ts

@@ -80,6 +80,51 @@ const checkMandatoryProperties = (packageJson: PackageJson) => {
     );
 };
 
+const checkNrfutilProperties = (packageJson: PackageJson) => {
+    const nrfutilModules = packageJson.nrfConnectForDesktop?.nrfutil;
+    if (nrfutilModules != null) {
+        Object.entries(nrfutilModules).forEach(
+            ([moduleName, moduleVersions]) => {
+                if (
+                    !Array.isArray(moduleVersions) ||
+                    moduleVersions.length === 0
+                ) {
+                    fail(
+                        `For each module in \`nrfConnectForDesktop.nrfutil\` in package.json at least one version must be specified, but for \`${moduleName}\` none was specified.`
+                    );
+                }
+            }
+        );
+    }
+};
+
+const checkRepoUrl = (packageJson: PackageJson) => {
+    if (!existsSync('./.git')) {
+        return;
+    }
+
+    const realGitUrl = execSync('git remote get-url origin', {
+        encoding: 'utf-8',
+    }).trimEnd();
+    const declaredGitUrl = packageJson.repository?.url;
+
+    const withoutPostfix = (gitUrl?: string) => gitUrl?.replace(/\.git$/, '');
+
+    const withoutProtocol = (gitUrl?: string) =>
+        gitUrl
+            ?.replace(/^git@github\.com:/, 'github.com/')
+            .replace(/^https:\/\//, '');
+
+    const stripped = (gitUrl?: string) =>
+        withoutProtocol(withoutPostfix(gitUrl));
+
+    if (stripped(realGitUrl) !== stripped(declaredGitUrl)) {
+        fail(
+            `package.json says the repository is located at \`${declaredGitUrl}\` but \`git remote get-url origin\` says it is at \`${realGitUrl}\`.`
+        );
+    }
+};
+
 const checkOptionalProperties = (packageJson: PackageJson) => {
     if (propertyIsMissing(packageJson)('homepage')) {
         warn('Please provide a property `homepage` in package.json.');
@@ -89,32 +134,14 @@ const checkOptionalProperties = (packageJson: PackageJson) => {
         warn(
             'Please provide a property `nrfConnectForDesktop.html` in package.json'
         );
+    } else {
+        checkNrfutilProperties(packageJson);
     }
 
     if (propertyIsMissing(packageJson)('repository.url')) {
         warn('Please provide a property `repository.url` in package.json.');
-    } else if (existsSync('./.git')) {
-        const realGitUrl = execSync('git remote get-url origin', {
-            encoding: 'utf-8',
-        }).trimEnd();
-        const declaredGitUrl = packageJson.repository?.url;
-
-        const withoutPostfix = (gitUrl?: string) =>
-            gitUrl?.replace(/\.git$/, '');
-
-        const withoutProtocol = (gitUrl?: string) =>
-            gitUrl
-                ?.replace(/^git@github\.com:/, 'github.com/')
-                .replace(/^https:\/\//, '');
-
-        const stripped = (gitUrl?: string) =>
-            withoutProtocol(withoutPostfix(gitUrl));
-
-        if (stripped(realGitUrl) !== stripped(declaredGitUrl)) {
-            fail(
-                `package.json says the repository is located at \`${declaredGitUrl}\` but \`git remote get-url origin\` says it is at \`${realGitUrl}\`.`
-            );
-        }
+    } else {
+        checkRepoUrl(packageJson);
     }
 };
 

package/scripts/esbuild-renderer.js

@@ -56,7 +56,6 @@ function options(additionalOptions) {
             'electron',
             'serialport',
             '@electron/remote',
-            '@nordicsemiconductor/nrf-device-lib-js',
             ...(appHasOwnHtml ? [] : ['react']),
 
             // App dependencies