Skip to content

Commit

Permalink
Replace git with npm installation of shared
Browse files Browse the repository at this point in the history
All references to pc-nrfconnect-shared will now poing to
@nordicsemiconductor/pc-nrfconnect-shared.

Added "nrfConnectForDesktop" property in package.json, and uses the
render exported by pc-nrfconnect-shared.
  • Loading branch information
aadnekar committed Aug 30, 2023
1 parent 868770d commit 7b27b70
Show file tree
Hide file tree
Showing 55 changed files with 4,127 additions and 7,014 deletions.
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

module.exports = require('pc-nrfconnect-shared/config/jest.config')();
module.exports =
require('@nordicsemiconductor/pc-nrfconnect-shared/config/jest.config')();
10,960 changes: 4,014 additions & 6,946 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@
},
"author": "Nordic Semiconductor ASA",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/bundle.js",
"nrfConnectForDesktop": {
"html": "dist/index.html",
"nrfutil": {
"device": [
"1.2.2"
]
}
},
"engines": {
"nrfconnect": ">=4.0.0"
"nrfconnect": "^4.1.2"
},
"main": "dist/bundle.js",
"files": [
"dist/",
"resources/icon.*",
Expand All @@ -39,16 +47,16 @@
"nordic-publish": "node ./dist/nordic-publish.js"
},
"devDependencies": {
"@nordicsemiconductor/pc-nrfconnect-shared": "^97.0.0",
"@types/redux-mock-store": "^1.0.3",
"bson": "4.6.5",
"chart.js": "^4.3.3",
"mathjs": "^10.6.3",
"pc-nrfconnect-shared": "github:NordicSemiconductor/pc-nrfconnect-shared#v79",
"react-chartjs-2": "^5.2.0",
"redux-mock-store": "^1.5.4"
},
"eslintConfig": {
"extends": "./node_modules/pc-nrfconnect-shared/config/eslintrc"
"extends": "./node_modules/@nordicsemiconductor/pc-nrfconnect-shared/config/eslintrc"
},
"prettier": "./node_modules/pc-nrfconnect-shared/config/prettier.config.js"
"prettier": "./node_modules/@nordicsemiconductor/pc-nrfconnect-shared/config/prettier.config.js"
}
8 changes: 6 additions & 2 deletions src/actions/deviceActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion -- TODO: Remove, only added for conservative refactoring to typescript */
/* eslint-disable @typescript-eslint/no-explicit-any -- TODO: Remove, only added for conservative refactoring to typescript */

import { isDevelopment, logger, usageData } from 'pc-nrfconnect-shared';
import {
isDevelopment,
logger,
usageData,
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import SerialDevice from '../device/serialDevice';
import { SampleValues } from '../device/types';
Expand Down Expand Up @@ -58,7 +62,7 @@ import { setSpikeFilter as persistSpikeFilter } from '../utils/persistentStore';
import { calculateWindowSize, processTriggerSample } from './triggerActions';

let device: null | SerialDevice = null;
let updateRequestInterval: NodeJS.Timer;
let updateRequestInterval: NodeJS.Timeout | undefined;

const zeroCap = isDevelopment
? (n: number) => n
Expand Down
2 changes: 1 addition & 1 deletion src/actions/exportChartAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { logger } from '@nordicsemiconductor/pc-nrfconnect-shared';
import fs from 'fs';
import { logger } from 'pc-nrfconnect-shared';

import { indexToTimestamp, options } from '../globals';
import { hideExportDialog } from '../slices/appSlice';
Expand Down
6 changes: 3 additions & 3 deletions src/actions/fileActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
*/

import { dialog, getCurrentWindow } from '@electron/remote';
import fs from 'fs';
import { dirname, join } from 'path';
import {
currentPane as currentPaneSelector,
logger,
setCurrentPane,
} from 'pc-nrfconnect-shared';
} from '@nordicsemiconductor/pc-nrfconnect-shared';
import fs from 'fs';
import { dirname, join } from 'path';

import { minimapEvents } from '../features/minimap/minimapEvents';
import { options, updateTitle } from '../globals';
Expand Down
2 changes: 1 addition & 1 deletion src/actions/triggerActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* eslint-disable @typescript-eslint/no-non-null-assertion -- TODO: Remove, only added for conservative refactoring to typescript */

import { logger } from 'pc-nrfconnect-shared';
import { logger } from '@nordicsemiconductor/pc-nrfconnect-shared';

import SerialDevice from '../device/serialDevice';
import { indexToTimestamp } from '../globals';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/AmpereChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import type {
ForwardedRef,
} from 'react-chartjs-2/dist/types';
import { useDispatch, useSelector } from 'react-redux';
import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Chart, ChartConfiguration, ChartData, ChartOptions } from 'chart.js';
import { unit } from 'mathjs';
import { colors } from 'pc-nrfconnect-shared';

import { updateTriggerLevel as updateTriggerLevelAction } from '../../actions/deviceActions';
import { indexToTimestamp } from '../../globals';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import React, {
} from 'react';
import Button from 'react-bootstrap/Button';
import { useDispatch, useSelector } from 'react-redux';
import { useHotKey } from '@nordicsemiconductor/pc-nrfconnect-shared';
import {
Chart as ChartJS,
LinearScale,
Expand All @@ -24,7 +25,6 @@ import {
PointElement,
Title,
} from 'chart.js';
import { useHotKey } from 'pc-nrfconnect-shared';

import Minimap from '../../features/minimap/Minimap';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/ChartOptions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Dropdown from 'react-bootstrap/Dropdown';
import Form from 'react-bootstrap/Form';
import SelectableContext from 'react-bootstrap/SelectableContext';
import { useDispatch, useSelector } from 'react-redux';
import { NumberInlineInput, usageData } from 'pc-nrfconnect-shared';
import { NumberInlineInput, usageData } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { func, number } from 'prop-types';

import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Chart/ChartTop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import React, { MutableRefObject } from 'react';
import Button from 'react-bootstrap/Button';
import ButtonGroup from 'react-bootstrap/ButtonGroup';
import { useDispatch, useSelector } from 'react-redux';
import { Toggle } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { BigNumber, Fraction, unit } from 'mathjs';
import { Toggle } from 'pc-nrfconnect-shared';

import {
chartState,
Expand Down Expand Up @@ -74,7 +74,7 @@ const ChartTop = ({
].slice(maxFreqLog10 - sampleFreqLog10, maxFreqLog10 - sampleFreqLog10 + 6);

return (
<div className="chart-top d-flex justify-content-between align-items-center my-2 flex-row">
<div className="chart-top d-flex justify-content-between align-items-center tw-min-w-[1200px] my-2 flex-row">
<div className="settings-y-axis">
<Toggle
label="LOGARITHMIC Y-AXIS"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/DigitalChannels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import React from 'react';
import { Line } from 'react-chartjs-2';
import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { ChartOptions, LineControllerDatasetOptions } from 'chart.js';
import { colors } from 'pc-nrfconnect-shared';

import { DigitalChannelStates, DigitalChannelsType } from './data/dataTypes';
import crossHairPlugin from './plugins/chart.crossHair';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/chart.icss.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

@import '~pc-nrfconnect-shared/styles';
@import '~@nordicsemiconductor/pc-nrfconnect-shared/styles';

$yAxisWidthPx: 70px; // must be in pixels, imported in JS
$rightMarginPx: 30px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/charttop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

@import '~pc-nrfconnect-shared/styles';
@import '~@nordicsemiconductor/pc-nrfconnect-shared/styles';

.chart-top {
> div {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/plugins/chart.crossHair.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Plugin } from 'chart.js';
import { colors } from 'pc-nrfconnect-shared';

import type { AmpereChartJS } from '../AmpereChart';

Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/plugins/chart.dragSelect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Plugin } from 'chart.js';
import { colors } from 'pc-nrfconnect-shared';

import type { AmpereChartJS } from '../AmpereChart';
import { isCanvasElement } from './utility';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/plugins/chart.triggerLevel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Plugin } from 'chart.js';
import { colors } from 'pc-nrfconnect-shared';

import { updateTriggerLevel } from '../../../actions/deviceActions';
import { TDispatch } from '../../../slices/thunk';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/plugins/chart.triggerOrigin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { colors } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Plugin } from 'chart.js';
import { colors } from 'pc-nrfconnect-shared';

import { indexToTimestamp } from '../../../globals';
import type { AmpereChartJS } from '../AmpereChart';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/plugins/chart.zoomPan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

import { logger, usageData } from '@nordicsemiconductor/pc-nrfconnect-shared';
import { CoreScaleOptions, Plugin, Scale } from 'chart.js';
import { logger, usageData } from 'pc-nrfconnect-shared';

import { getSamplesPerSecond, options } from '../../../globals';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Chart/statbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

@import '~pc-nrfconnect-shared/styles';
@import '~@nordicsemiconductor/pc-nrfconnect-shared/styles';

.statbox {
flex: 1;
Expand Down
2 changes: 1 addition & 1 deletion src/components/DeviceSelector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
getAppFile,
logger,
sdfuDeviceSetup,
} from 'pc-nrfconnect-shared';
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import { close, open } from '../actions/deviceActions';
import { setShowPPK1Dialog } from '../features/DeprecatedDevice/DeprecatedDeviceSlice';
Expand Down
2 changes: 1 addition & 1 deletion src/components/SaveExport/ExportDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import ProgressBar from 'react-bootstrap/ProgressBar';
import Row from 'react-bootstrap/Row';
import { useDispatch, useSelector } from 'react-redux';
import { dialog } from '@electron/remote';
import { Toggle } from '@nordicsemiconductor/pc-nrfconnect-shared';
import * as mathjs from 'mathjs';
import { dirname, join } from 'path';
import { Toggle } from 'pc-nrfconnect-shared';

import exportChart from '../../actions/exportChartAction';
import { indexToTimestamp } from '../../globals';
Expand Down
2 changes: 1 addition & 1 deletion src/components/SaveExport/ExportSelection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React, { useEffect, useState } from 'react';
import ToggleButton from 'react-bootstrap/ToggleButton';
import ToggleButtonGroup from 'react-bootstrap/ToggleButtonGroup';
import { logger } from 'pc-nrfconnect-shared';
import { logger } from '@nordicsemiconductor/pc-nrfconnect-shared';

import { options, timestampToIndex } from '../../globals';

Expand Down
2 changes: 1 addition & 1 deletion src/components/SaveExport/saveexport.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
*/

@import '~pc-nrfconnect-shared/styles';
@import '~@nordicsemiconductor/pc-nrfconnect-shared/styles';

.modal-body {
padding: 2rem;
Expand Down
6 changes: 3 additions & 3 deletions src/components/SidePanel/BufferSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import React, { useState } from 'react';
import FormLabel from 'react-bootstrap/FormLabel';
import { useDispatch, useSelector } from 'react-redux';
import { getCurrentWindow } from '@electron/remote';
import { kMaxLength as maxBufferSizeForSystem } from 'buffer';
import { unit } from 'mathjs';
import {
Button,
Group,
NumberInlineInput,
usageData,
} from 'pc-nrfconnect-shared';
} from '@nordicsemiconductor/pc-nrfconnect-shared';
import { kMaxLength as maxBufferSizeForSystem } from 'buffer';
import { unit } from 'mathjs';

import {
changeMaxBufferSizeAction,
Expand Down
2 changes: 1 addition & 1 deletion src/components/SidePanel/CapVoltageSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
NumberInlineInput,
Slider,
usageData,
} from 'pc-nrfconnect-shared';
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import { updateRegulator } from '../../actions/deviceActions';
import {
Expand Down
5 changes: 4 additions & 1 deletion src/components/SidePanel/DisplayOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { CollapsibleGroup, Toggle } from 'pc-nrfconnect-shared';
import {
CollapsibleGroup,
Toggle,
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import {
chartState,
Expand Down
5 changes: 4 additions & 1 deletion src/components/SidePanel/Gains.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
import React from 'react';
import Form from 'react-bootstrap/Form';
import { useDispatch, useSelector } from 'react-redux';
import { CollapsibleGroup, Slider } from 'pc-nrfconnect-shared';
import {
CollapsibleGroup,
Slider,
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import { updateGains } from '../../actions/deviceActions';
import { appState } from '../../slices/appSlice';
Expand Down
6 changes: 5 additions & 1 deletion src/components/SidePanel/Instructions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
*/

import React from 'react';
import { Button, Group, openUrl } from 'pc-nrfconnect-shared';
import {
Button,
Group,
openUrl,
} from '@nordicsemiconductor/pc-nrfconnect-shared';

const urls = {
ppkUserGuide:
Expand Down
2 changes: 1 addition & 1 deletion src/components/SidePanel/LoadSave.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React, { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Button, Group } from 'pc-nrfconnect-shared';
import { Button, Group } from '@nordicsemiconductor/pc-nrfconnect-shared';

import { load, screenshot } from '../../actions/fileActions';
import { appState, toggleSaveChoiceDialog } from '../../slices/appSlice';
Expand Down
7 changes: 5 additions & 2 deletions src/components/SidePanel/NumberWithUnitInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@

import React, { useEffect, useState } from 'react';
import Form from 'react-bootstrap/Form';
import { NumberInlineInput, Slider } from 'pc-nrfconnect-shared';
import { Range } from 'pc-nrfconnect-shared/typings/generated/src/Slider/range';
import {
NumberInlineInput,
Slider,
} from '@nordicsemiconductor/pc-nrfconnect-shared';
import { Range } from '@nordicsemiconductor/pc-nrfconnect-shared/typings/generated/src/Slider/range';
import { bool, func, number, shape, string } from 'prop-types';

interface NumberWithUnit {
Expand Down
2 changes: 1 addition & 1 deletion src/components/SidePanel/PowerMode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from 'react';
import Button from 'react-bootstrap/Button';
import ButtonGroup from 'react-bootstrap/ButtonGroup';
import { useDispatch, useSelector } from 'react-redux';
import { Group, Toggle } from 'pc-nrfconnect-shared';
import { Group, Toggle } from '@nordicsemiconductor/pc-nrfconnect-shared';

import { setDeviceRunning, setPowerMode } from '../../actions/deviceActions';
import { appState } from '../../slices/appSlice';
Expand Down
5 changes: 4 additions & 1 deletion src/components/SidePanel/SidePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { SidePanel, useHotKey } from 'pc-nrfconnect-shared';
import {
SidePanel,
useHotKey,
} from '@nordicsemiconductor/pc-nrfconnect-shared';

import DeprecatedDeviceDialog from '../../features/DeprecatedDevice/DeprecatedDevice';
import MinimapOptions from '../../features/minimap/MinimapOptions';
Expand Down
Loading

0 comments on commit 7b27b70

Please sign in to comment.