Skip to content

Commit

Permalink
Merge branch 'ci/migrate-pipelines' of https://github.com/equinor/cc-…
Browse files Browse the repository at this point in the history
…components into ci/migrate-pipelines
  • Loading branch information
Gustav-Eikaas committed Nov 6, 2024
2 parents ca4b5c5 + 4a61210 commit 2b0055f
Show file tree
Hide file tree
Showing 12 changed files with 2,141 additions and 1,349 deletions.
2 changes: 1 addition & 1 deletion apps/handover/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "handover",
"version": "3.1.0",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/heattrace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Heat Trace",
"shortName": "heat-trace",
"version": "0.0.1",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/loop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "loop",
"version": "0.3.2",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/mechanicalcompletion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Mechanical completion",
"shortName": "mechanical-completion",
"version": "0.0.26",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/piping/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pipetest",
"displayName": "Pipetest",
"version": "0.0.1",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/punch/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "punch",
"version": "0.3.5",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/scopechangerequest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "scopechangerequest",
"displayName": "Scope Change Control",
"version": "0.0.2",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/swcr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "swcr",
"displayName": "SWCR",
"version": "0.0.23",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion apps/workorder/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "workorder",
"version": "1.2.3",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"type": "module",
"scripts": {
"dev": "fusion-framework-cli app dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "<%= projectName %>",
"version": "0.0.1",
"main": "/src/main.tsx",
"main": "src/main.tsx",
"private": true,
"type": "module",
"scripts": {
Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"bump-deps": "pnpm up --latest --recursive --interactive"
},
"devDependencies": {
"@equinor/fusion-framework-cli": "^9.12.3",
"@equinor/fusion-framework-cli": "^10.0.2",
"@nrwl/devkit": "18.3.4",
"@nrwl/js": "^18.3.4",
"@swc-node/register": "1.9.0",
Expand Down Expand Up @@ -63,17 +63,18 @@
"@equinor/eds-core-react": "^0.37.0",
"@equinor/eds-icons": "0.21.0",
"@equinor/eds-tokens": "0.9.2",
"@equinor/fusion-framework-module": "^4.3.0",
"@equinor/fusion-framework-module-ag-grid": "31.2.1",
"@equinor/fusion-framework-module-event": "^4.1.1",
"@equinor/fusion-framework-module-http": "^5.2.2",
"@equinor/fusion-framework-module-msal": "^3.1.0",
"@equinor/fusion-framework-react": "7.0.5",
"@equinor/fusion-framework-react-app": "5.0.9",
"@equinor/fusion-framework-react-module-context": "^6.2.3",
"@equinor/fusion-framework-react-module-http": "^5.0.3",
"@equinor/fusion-observable": "8.3.0",
"@equinor/workspace-fusion": "9.0.14",
"@equinor/fusion-framework-module": "^4.3.5",
"@equinor/fusion-framework-module-ag-grid": "32.2.0",
"@equinor/fusion-framework-module-event": "^4.2.4",
"@equinor/fusion-framework-module-http": "^6.2.0",
"@equinor/fusion-framework-module-msal": "^3.1.5",
"@equinor/fusion-framework-react": "7.3.0",
"@equinor/fusion-framework-react-app": "5.2.10",
"@equinor/fusion-framework-react-module-bookmark": "^2.1.18",
"@equinor/fusion-framework-react-module-context": "^6.2.13",
"@equinor/fusion-framework-react-module-http": "^8.0.0",
"@equinor/fusion-observable": "8.4.1",
"@equinor/workspace-fusion": "9.0.17",
"@microsoft/applicationinsights-web": "^3.3.0",
"@swc/helpers": "0.5.12",
"@tanstack/react-query": "^5.51.21",
Expand All @@ -82,7 +83,7 @@
"odata-query": "^7.0.6",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-error-boundary": "^4.0.13",
"react-error-boundary": "^4.1.2",
"react-is": "18.3.1",
"rxjs": "^7.8.1",
"styled-components": "6.1.12",
Expand Down
3,443 changes: 2,117 additions & 1,326 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

0 comments on commit 2b0055f

Please sign in to comment.