Skip to content

Commit

Permalink
Update deps, tsconfig & travis config (#14)
Browse files Browse the repository at this point in the history
* Update travis config
* Sync tslint from main jsonform repo
* Update jsonform to 2.2.0
* Add missing dependency
* Update lock files
* Add skipLibCheck
* Remove theia plugin pack
* Remove skipLibCheck and add missing tsconfig options
  • Loading branch information
TheZoker authored and edgarmueller committed Mar 7, 2019
1 parent 7200d6f commit f7a9b45
Show file tree
Hide file tree
Showing 16 changed files with 2,918 additions and 2,277 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ before_install:
- npm update

install:
- npm ci
- lerna bootstrap --npm-ci-mode --ignore-scripts
- lerna exec --no-bail --npm-ci-mode -- npm run postinstall
- npm install

script:
- lerna run build
- lerna run lint
- npm run compile
- npm run lint
# - npm run coveralls
1,574 changes: 899 additions & 675 deletions generator-jsonforms/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion generator-jsonforms/src/generators/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// tslint:disable:no-require-imports
'use strict';

import * as Generator from 'yeoman-generator';
import Generator from 'yeoman-generator';
import chalk from 'chalk';
const clear = require('clear');
const figlet = require('figlet');
Expand Down
171 changes: 140 additions & 31 deletions jsonforms-tooling-common/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions jsonforms-tooling-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
"lint": "tslint --project tsconfig.json"
},
"dependencies": {
"@jsonforms/core": "^2.0.12",
"@jsonforms/core": "^2.2.0",
"@jsonforms/react": "^2.2.0",
"ajv": "^6.5.5",
"yeoman-environment": "^2.3.4"
"yeoman-environment": "^2.3.4",
"react": "^16.8.3",
"redux": "^3.0.0"
},
"type-check": "tsc",
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions jsonforms-tooling-common/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// tslint:disable:no-require-imports
// tslint:disable:no-use-before-declare

import * as jsonforms from '@jsonforms/core';
import { generateDefaultUISchema } from '@jsonforms/core';
import { readFile, writeFile } from 'fs';
import * as Ajv from 'ajv';
import Ajv from 'ajv';
import { sep } from 'path';
const yeoman = require('yeoman-environment');

Expand Down Expand Up @@ -96,7 +96,7 @@ const asyncGenerateUiSchema = (editorInstance: any, path: string) => {
return;
}

const jsonUISchema = jsonforms.generateDefaultUISchema(jsonSchema);
const jsonUISchema = generateDefaultUISchema(jsonSchema);

// Check if windows or linux filesystem
let newPath = path.substring(0, path.lastIndexOf(sep));
Expand Down
Loading

0 comments on commit f7a9b45

Please sign in to comment.