Skip to content

Commit

Permalink
Merge branch 'main' into chore/change-default-group-mc
Browse files Browse the repository at this point in the history
  • Loading branch information
@espenkalle
espenkalle authored Dec 8, 2023
2 parents 0f48dc6 + 7e1a171 commit 65d8869
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/create-fusion-app.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- name: 'Create application in Fusion CI'
shell: bash
run: npx ts-node --esm ./github-action/src/createFusionApp.ts create -T ${{ steps.get-fusion-token-ci.outputs.token }} -A '${{inputs.appKey}}' -C '${{inputs.category}}' -D '${{inputs.displayName}}' -O '${{vars.FUSION_APP_ADMINS_CI}}' -E 'CI'
run: npx tsx ./github-action/src/createFusionApp.ts create -T ${{ steps.get-fusion-token-ci.outputs.token }} -A '${{inputs.appKey}}' -C '${{inputs.category}}' -D '${{inputs.displayName}}' -O '${{vars.FUSION_APP_ADMINS_CI}}' -E 'CI'

create-fusion-app-fprd:
runs-on: ubuntu-latest
Expand All @@ -84,4 +84,4 @@ jobs:

- name: 'Create application in Fusion FPRD'
shell: bash
run: npx ts-node --esm ./github-action/src/createFusionApp.ts create -T ${{ steps.get-fusion-token-fprd.outputs.token }} -A '${{inputs.appKey}}' -C '${{inputs.category}}' -D '${{inputs.displayName}}' -O '${{vars.FUSION_APP_ADMINS_FPRD}}' -E 'FPRD'
run: npx tsx ./github-action/src/createFusionApp.ts create -T ${{ steps.get-fusion-token-fprd.outputs.token }} -A '${{inputs.appKey}}' -C '${{inputs.category}}' -D '${{inputs.displayName}}' -O '${{vars.FUSION_APP_ADMINS_FPRD}}' -E 'FPRD'
2 changes: 1 addition & 1 deletion .github/workflows/issue.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:

- name: 'Update issue'
shell: bash
run: npx ts-node --esm ./github-action/src/issue.ts issue -T ${{ github.token }} -C ${{steps.get-fusion-token-ci.outputs.token}} -F ${{steps.get-fusion-token-fprd.outputs.token}}
run: npx tsx ./github-action/src/issue.ts issue -T ${{ github.token }} -C ${{steps.get-fusion-token-ci.outputs.token}} -F ${{steps.get-fusion-token-fprd.outputs.token}}
4 changes: 2 additions & 2 deletions apps/electricalconsumers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/electricalconsumersapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/handover/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/handoverapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/heattrace/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/heattraceapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/loop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/loopapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/mechanicalcompletion/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/mechanicalcompletionapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/piping/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/pipingapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/punch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/punchapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/scopechangerequest/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/scopechangerequestapp": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/swcr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/shared": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions apps/workorder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"dev": "fusion-framework-cli app dev",
"dev:local": "fusion-framework-cli app dev -c app.config.local.js",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/shared": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions libs/plugins/src/generators/fusion-app-generator/files/package.json__template__
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"scripts": {
"dev": "fusion-framework-cli app dev",
"build": "tsc -b -f",
"pr:deploy": "ts-node --esm ../../github-action/src/releasePr.ts release",
"fprd:deploy": "ts-node --esm ../../github-action/src/releaseMain.ts release"
"pr:deploy": "tsx ../../github-action/src/releasePr.ts release",
"fprd:deploy": "tsx ../../github-action/src/releaseMain.ts release"
},
"dependencies": {
"@cc-components/<%= projectName%>app": "workspace:^",
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"nx": "15.7.1",
"rollup-plugin-inject-process-env": "^1.3.1",
"ts-node": "^10.9.1",
"tsx": "^4.6.2",
"turbo": "^1.10.14",
"typescript": "~5.2.2",
"vite": "^5.0.6",
Expand Down
24 changes: 24 additions & 0 deletions pnpm-lock.yaml
View file

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

0 comments on commit 65d8869

Please sign in to comment.