Skip to content

Commit

Permalink
Merge pull request #68 from Exabyte-io/update/made-code-esse
Browse files Browse the repository at this point in the history
chore: update made-code-esse references
  • Loading branch information
timurbazhirov authored Mar 26, 2024
2 parents 41dfe92 + a17884d commit c55c15b
Show file tree
Hide file tree
Showing 13 changed files with 423 additions and 96 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
if: github.repository != 'Exabyte-io/template-definitions'
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
node-version:
- 14.x
- 20.x

steps:
- name: Checkout this repository
Expand Down Expand Up @@ -53,7 +55,6 @@ jobs:
- name: Publish JS release
uses: ./actions/js/publish
with:
node-version: 14
npm-token: ${{ secrets.NPM_TOKEN }}
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

477 changes: 401 additions & 76 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
"underscore.string": "^3.3.4"
},
"devDependencies": {
"@exabyte-io/code.js": "2024.2.29-0",
"@exabyte-io/eslint-config": "^2022.11.17-0",
"@mat3ra/made": "2024.3.23-1",
"@exabyte-io/application-flavors.js": "2024.3.21-0",
"@mat3ra/esse": "2024.3.20-0",
"@exabyte-io/application-flavors.js": "2024.3.26-0",
"@mat3ra/code": "2024.3.25-3",
"@mat3ra/made": "2024.3.26-0",
"@mat3ra/esse": "2024.3.25-6",
"chai": "^4.3.4",
"eslint": "7.32.0",
"eslint-config-airbnb": "19.0.2",
Expand All @@ -66,7 +66,8 @@
"prettier": "^2.7.1"
},
"peerDependencies": {
"@exabyte-io/code.js": "*",
"@mat3ra/code": "*",
"@mat3ra/esse": "*",
"@mat3ra/made": "*",
"@exabyte-io/application-flavors.js": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion src/application.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { allApplications, getAppData, getAppTree } from "@exabyte-io/application-flavors.js";
import { NamedDefaultableInMemoryEntity } from "@exabyte-io/code.js/dist/entity";
import { NamedDefaultableInMemoryEntity } from "@mat3ra/code/dist/js/entity";
import lodash from "lodash";

import { Executable } from "./executable";
Expand Down
2 changes: 1 addition & 1 deletion src/context/providers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ContextProvider } from "@exabyte-io/code.js/dist/context";
import { ContextProvider } from "@mat3ra/code/dist/js/context";

export class ExecutableContextProvider extends ContextProvider {
constructor(config) {
Expand Down
4 changes: 2 additions & 2 deletions src/context/providers/espresso/providers.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* eslint-disable max-classes-per-file */
import { PERIODIC_TABLE } from "@exabyte-io/periodic-table.js";
import {
JobContextMixin,
MaterialContextMixin,
MaterialsContextMixin,
MaterialsSetContextMixin,
MethodDataContextMixin,
WorkflowContextMixin,
} from "@exabyte-io/code.js/dist/context";
import { PERIODIC_TABLE } from "@exabyte-io/periodic-table.js";
} from "@mat3ra/code/dist/js/context";
import { Made } from "@mat3ra/made";
import lodash from "lodash";
import { mix } from "mixwith";
Expand Down
4 changes: 2 additions & 2 deletions src/context/providers/nwchem/providers.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { PERIODIC_TABLE } from "@exabyte-io/periodic-table.js";
import {
JobContextMixin,
MaterialContextMixin,
MethodDataContextMixin,
WorkflowContextMixin,
} from "@exabyte-io/code.js/dist/context";
import { PERIODIC_TABLE } from "@exabyte-io/periodic-table.js";
} from "@mat3ra/code/dist/js/context";
import { Made } from "@mat3ra/made";
import lodash from "lodash";
import { mix } from "mixwith";
Expand Down
2 changes: 1 addition & 1 deletion src/context/providers/vasp/providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
MaterialsSetContextMixin,
MethodDataContextMixin,
WorkflowContextMixin,
} from "@exabyte-io/code.js/dist/context";
} from "@mat3ra/code/dist/js/context";
import { Made } from "@mat3ra/made";
import { mix } from "mixwith";

Expand Down
2 changes: 1 addition & 1 deletion src/context/registry.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createAndPatchRegistry } from "@exabyte-io/code.js/dist/context";
import { createAndPatchRegistry } from "@mat3ra/code/dist/js/context";

import {
NWChemTotalEnergyContextProvider,
Expand Down
2 changes: 1 addition & 1 deletion src/executable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NamedDefaultableInMemoryEntity, RuntimeItemsMixin } from "@exabyte-io/code.js/dist/entity";
import { NamedDefaultableInMemoryEntity, RuntimeItemsMixin } from "@mat3ra/code/dist/js/entity";
import { mix } from "mixwith";

import { Flavor } from "./flavor";
Expand Down
2 changes: 1 addition & 1 deletion src/flavor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NamedDefaultableInMemoryEntity, RuntimeItemsMixin } from "@exabyte-io/code.js/dist/entity";
import { NamedDefaultableInMemoryEntity, RuntimeItemsMixin } from "@mat3ra/code/dist/js/entity";
import { mix } from "mixwith";

import { Template } from "./template";
Expand Down
4 changes: 2 additions & 2 deletions src/template.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { allTemplates } from "@exabyte-io/application-flavors.js";
import { NamedInMemoryEntity } from "@exabyte-io/code.js/dist/entity";
import { deepClone } from "@exabyte-io/code.js/dist/utils";
import { NamedInMemoryEntity } from "@mat3ra/code/dist/js/entity";
import { deepClone } from "@mat3ra/code/dist/js/utils";
import jinja from "swig";
import _ from "underscore";

Expand Down
2 changes: 1 addition & 1 deletion src/tree.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable new-cap */
import { allApplications, getAppData, getAppTree } from "@exabyte-io/application-flavors.js";
import { getOneMatchFromObject } from "@exabyte-io/code.js/dist/utils";
import { getOneMatchFromObject } from "@mat3ra/code/dist/js/utils";

/**
* @summary Return all applications as both a nested object of Applications and an array of config objects
Expand Down

0 comments on commit c55c15b

Please sign in to comment.