Skip to content

Commit 52f8dfd

Browse files
authored
Merge pull request #91 from Exabyte-io/update/SOF-7161
chore: latest esse
2 parents d2d9324 + 865d543 commit 52f8dfd

33 files changed

+1004
-1138
lines changed

.github/workflows/cicd.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.repository != 'Exabyte-io/template-definitions'
1717
strategy:
1818
matrix:
19-
node-version: [14.x, 16.x]
19+
node-version: [14.x, 20.x]
2020

2121
steps:
2222
- name: Checkout this repository
@@ -29,6 +29,9 @@ jobs:
2929
token: ${{ secrets.BOT_GITHUB_TOKEN }}
3030
path: actions
3131

32+
- name: Run JS validate
33+
uses: ./actions/js/validate
34+
3235
- name: Run JS tests
3336
uses: ./actions/js/test
3437
with:
@@ -56,7 +59,7 @@ jobs:
5659
id: publish
5760
uses: ./actions/js/publish
5861
with:
59-
node-version: 12.21.x
62+
node-version: 14.19.x
6063
npm-token: ${{ secrets.NPM_TOKEN }}
6164
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
6265

compileTS.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

package-lock.json

Lines changed: 714 additions & 434 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
"lint": "eslint src tests && prettier --write src tests",
88
"lint:fix": "eslint --fix --cache src tests && prettier --write src tests",
99
"transpile": "tsc",
10-
"postinstall": "npm run compileTS && npm run transpile",
10+
"postinstall": "npm run transpile",
1111
"prettier": "prettier --check src tests",
12-
"prepare": "husky install",
13-
"compileTS": "ts-node ./compileTS.ts"
12+
"prepare": "husky install"
1413
},
1514
"repository": {
1615
"type": "git",
@@ -23,22 +22,19 @@
2322
"./utils/*": "./dist/utils/*.js",
2423
"./constants": "./dist/constants.js",
2524
"./math": "./dist/math.js",
26-
"./JSONSchemasInterface": "./dist/JSONSchemasInterface.js",
2725
"./dist/context": "./dist/context/index.js",
2826
"./dist/entity": "./dist/entity/index.js",
2927
"./dist/utils": "./dist/utils/index.js",
3028
"./dist/constants": "./dist/constants.js",
3129
"./dist/math": "./dist/math.js",
3230
"./dist/utils/schemas": "./dist/utils/schemas.js",
33-
"./dist/JSONSchemasInterface": "./dist/JSONSchemasInterface.js",
3431
"./dist/bin/compileTS": "./dist/bin/compileTS.js"
3532
},
3633
"files": [
3734
"/dist",
3835
"/src",
3936
".babelrc",
4037
"modules.d.ts",
41-
"compileTS.ts",
4238
"tsconfig.json"
4339
],
4440
"author": "Exabyte Inc.",
@@ -56,7 +52,6 @@
5652
"@babel/preset-react": "7.16.7",
5753
"@babel/register": "^7.16.0",
5854
"@babel/runtime-corejs3": "7.16.8",
59-
"@mat3ra/esse": "^2024.1.18-0",
6055
"@types/chai": "^4.3.5",
6156
"@types/crypto-js": "^4.1.1",
6257
"@types/js-yaml": "^4.0.5",
@@ -66,13 +61,10 @@
6661
"@types/node": "^20.4.2",
6762
"@types/react-jsonschema-form": "^1.7.8",
6863
"@types/underscore": "^1.11.6",
69-
"ajv": "4.1.7",
64+
"ajv": "8.12.0",
7065
"crypto-js": "^4.1.1",
7166
"js-yaml": "^4.1.0",
7267
"json-schema": "^0.4.0",
73-
"json-schema-deref-sync": "0.14.0",
74-
"json-schema-merge-allof": "^0.8.1",
75-
"json-schema-to-typescript": "^13.0.2",
7668
"lodash": "^4.17.21",
7769
"mathjs": "^3.9.0",
7870
"mixwith": "^0.1.1",
@@ -88,26 +80,30 @@
8880
"devDependencies": {
8981
"@babel/preset-typescript": "^7.22.5",
9082
"@exabyte-io/eslint-config": "^2023.8.29-1",
83+
"@mat3ra/esse": "^2024.2.19-1",
9184
"@typescript-eslint/eslint-plugin": "^5.56.0",
9285
"@typescript-eslint/parser": "^5.56.0",
9386
"chai": "^4.3.4",
9487
"eslint": "7.32.0",
9588
"eslint-config-airbnb": "19.0.2",
9689
"eslint-config-prettier": "^8.3.0",
90+
"eslint-import-resolver-exports": "^1.0.0-beta.2",
9791
"eslint-plugin-import": "2.25.3",
9892
"eslint-plugin-jsdoc": "37.1.0",
9993
"eslint-plugin-jsx-a11y": "6.5.1",
10094
"eslint-plugin-mui-path-imports": "0.0.15",
10195
"eslint-plugin-prettier": "^4.2.1",
10296
"eslint-plugin-react": "7.30.0",
10397
"eslint-plugin-simple-import-sort": "7.0.0",
104-
"eslint-import-resolver-exports": "^1.0.0-beta.2",
10598
"husky": "^7.0.4",
10699
"lint-staged": "^12.1.2",
107100
"mocha": "^9.1.3",
108101
"nyc": "^15.1.0",
109102
"prettier": "^2.7.1"
110103
},
104+
"peerDependencies": {
105+
"@mat3ra/esse": "*"
106+
},
111107
"engines": {
112108
"node": ">=12.0.0"
113109
},

src/JSONSchemasInterface.ts

Lines changed: 0 additions & 168 deletions
This file was deleted.

src/bin/compileTS.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/context/mixins.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
2+
import {
3+
ApplicationSchemaBase,
4+
JobSchema,
5+
MaterialSchema,
6+
WorkflowSchema,
7+
} from "@mat3ra/esse/lib/js/types";
28
import CryptoJS from "crypto-js";
39

410
import { InMemoryEntity } from "../entity";
511
import { DefaultableMixin } from "../entity/mixins/props";
612
import { compareEntitiesInOrderedSetForSorting } from "../entity/set/ordered/utils";
7-
import { ApplicationSchemaBase, JobSchema, MaterialSchema, WorkflowSchema } from "../types";
813

914
type Constructor<T = any> = new (...args: any[]) => T;
1015

0 commit comments

Comments
 (0)