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

Merging to update Forked Origin - Fixing conflicts. #3310

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merging to update Forked Origin - Fixing conflicts. #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0016a1
Building Issue with package.json fix applied to the building process
Nick-Goorwah Jan 13, 2022
668ba01
Merge pull request #1 from Nick-Goorwah/dev
Nick-Goorwah Jan 13, 2022
7630c72
Adding additional dependencies parity and pnpm
Nick-Goorwah Jan 19, 2022
eac74fd
Merging Energy Web Master to Forked Origin Repo - Fixing Conflicts
Nick-Goorwah Jan 26, 2022
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
7,286 changes: 2,933 additions & 4,353 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions openapitools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
"spaces": 2,
"generator-cli": {
"version": "5.3.1"
}
}
1,870 changes: 1,870 additions & 0 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,11 @@
],
"engines": {
"node": "14"
},
"dependencies": {
"parity": "^0.2.7",
"pnpm": "^6.26.1",
"python": "0.0.4",
"yarn": "^1.22.17"
}
}
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/exchange-irec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/exchange/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/issuer-irec-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/origin-device-registry-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/origin-device-registry-irec-local-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/origin-energy-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-clients/react-query/origin-organization-irec-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn clean && yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate",
"clean": "rm -rf dist dist-shakeable && yarn client:clean",
"client:generate": "rm -rf src/client && orval && barrelsby -d src/client",
Expand Down
2 changes: 1 addition & 1 deletion packages/devices/origin-device-registry-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/devices/origin-device-registry-irec-form-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/devices/origin-device-registry-irec-local-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/devices/origin-energy-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/organizations/origin-organization-irec-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/origin-backend-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "dist/js/index.js",
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:post-generation && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/traceability/issuer-api-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/trade/exchange-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
2 changes: 1 addition & 1 deletion packages/trade/exchange-irec-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"scripts": {
"build": "yarn build:ts",
"build:ts": "yarn build:client 1>/dev/null 2>/dev/null && tsc --project tsconfig.json",
"build:ts": "yarn build:client && tsc --project tsconfig.json",
"build:client": "yarn client:generate:schema && yarn client:generate && yarn client:clean",
"clean": "shx rm -rf dist dist-shakeable",
"client:generate": "openapi-generator-cli generate -g typescript-axios -i src/schema.yaml -o src --api-name-suffix Client --remove-operation-id-prefix",
Expand Down
238 changes: 238 additions & 0 deletions volta.json
View file
Open in desktop

Large diffs are not rendered by default.