Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update packages #109

Merged
merged 2 commits into from
Jul 6, 2021
Merged

Update packages #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0cfb48
Update CI to node 14
nobodywasishere Jul 6, 2021
62c6a4c
Update packages to latest versions and fix new errors (exc typescript)
nobodywasishere Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
environment:
nodejs_version: "6"
nodejs_version: "14"

install:
- ps: Install-Product node $env:nodejs_version
Expand Down
2 changes: 1 addition & 1 deletion bin/exportLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var lib = require('../built'),
yargs = require('yargs'),
Ajv = require('ajv');

var ajv = new Ajv({allErrors: true, jsonPointers: true});
var ajv = new Ajv({allErrors: true});
require('ajv-errors')(ajv);

if (require.main === module) {
Expand Down
2 changes: 1 addition & 1 deletion bin/netlistsvg.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var lib = require('../built'),
yargs = require('yargs'),
Ajv = require('ajv');

var ajv = new Ajv({allErrors: true, jsonPointers: true});
var ajv = new Ajv({allErrors: true});
require('ajv-errors')(ajv);

if (require.main === module) {
Expand Down
23,227 changes: 12,223 additions & 11,004 deletions built/netlistsvg.bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jsmodule/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const lib = require('../built');
const fs = require('fs');
const json5 = require('json5');
const Ajv = require('ajv');
var ajv = new Ajv({allErrors: true, jsonPointers: true});
var ajv = new Ajv({allErrors: true});
require('ajv-errors')(ajv);

const digital = fs.readFileSync(__dirname + '/../lib/default.svg', 'utf8');
Expand Down
2 changes: 1 addition & 1 deletion lib/YosysModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Yosys {
X = 'x',
}

export type Signals = Array<number | ConstantVal>;
export type Signals = (number | ConstantVal)[];

interface ModuleMap {
[moduleName: string]: Module;
Expand Down
2 changes: 1 addition & 1 deletion lib/elkGraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export namespace ElkModel {
export interface Graph {
id: string;
children: Cell[];
edges: Array<Edge|ExtendedEdge>;
edges: (Edge|ExtendedEdge)[];
width?: number;
height?: number;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function render(skinData: string, yosysNetlist: Yosys.Netlist, done?: ICa
let promise;
// if we already have a layout then use it
if (elkData) {
promise = new Promise((resolve) => {
promise = new Promise<void>((resolve) => {
drawModule(elkData, flatModule);
resolve();
});
Expand Down
37 changes: 18 additions & 19 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
"author": "Neil Turley",
"license": "MIT",
"dependencies": {
"@types/clone": "^0.1.30",
"@types/json5": "0.0.30",
"@types/lodash": "^4.14.116",
"ajv": "^6.10.0",
"ajv-errors": "^1.0.1",
"clone": "^2.1.0",
"@types/clone": "^2.1.0",
"@types/lodash": "^4.14.170",
"ajv": "^8.6.1",
"ajv-errors": "^3.0.0",
"clone": "^2.1.2",
"elkjs": "^0.7.1",
"fs-extra": "^1.0.0",
"json5": "^0.5.1",
"lodash": "^4.17.11",
"onml": "^0.3.1",
"yargs": "^6.5.0"
"fs-extra": "^10.0.0",
"json5": "^2.2.0",
"lodash": "^4.17.21",
"onml": "^2.1.0",
"yargs": "^17.0.1"
},
"repository": {
"type": "git",
Expand All @@ -43,15 +42,15 @@
},
"homepage": "https://github.com/nturley/netlistsvg#readme",
"devDependencies": {
"@types/jest": "^24.0.11",
"@types/node": "^11.13.0",
"browserify": "^16.2.3",
"@types/jest": "^26.0.23",
"@types/node": "^16.0.0",
"browserify": "^17.0.0",
"browserify-shim": "^3.8.14",
"eslint": "^5.15.3",
"jest": "^24.5.0",
"superagent": "^3.8.2",
"ts-jest": "^24.0.0",
"tslint": "^5.14.0",
"eslint": "^7.30.0",
"jest": "^27.0.6",
"superagent": "^6.1.0",
"ts-jest": "^27.0.3",
"tslint": "^6.1.3",
"typescript": "^3.3.4000",
"brfs": "^2.0.2"
},
Expand Down