diff --git a/apps/client/project.json b/apps/client/project.json index 82afc3d68..7ccc70cbb 100644 --- a/apps/client/project.json +++ b/apps/client/project.json @@ -103,83 +103,40 @@ "options": { "commands": [ { - "command": "mkdir -p dist/apps/client" + "command": "shx mkdir -p dist/apps/client" }, { - "command": "cp -r apps/client/src/assets dist/apps/client" + "command": "shx cp -r apps/client/src/assets dist/apps/client" }, { - "command": "cp -r apps/client/src/assets/.well-known dist/apps/client" + "command": "shx cp -r apps/client/src/assets/.well-known dist/apps/client" }, { - "command": "cp apps/client/src/assets/favicon.ico dist/apps/client" + "command": "shx cp apps/client/src/assets/favicon.ico dist/apps/client" }, { - "command": "cp apps/client/src/assets/index.html dist/apps/client" + "command": "shx cp apps/client/src/assets/index.html dist/apps/client" }, { - "command": "cp apps/client/src/assets/robots.txt dist/apps/client" + "command": "shx cp apps/client/src/assets/robots.txt dist/apps/client" }, { - "command": "cp apps/client/src/assets/site.webmanifest dist/apps/client" + "command": "shx cp apps/client/src/assets/site.webmanifest dist/apps/client" }, { - "command": "cp node_modules/ionicons/dist/index.js dist/apps/client" + "command": "shx cp node_modules/ionicons/dist/index.js dist/apps/client" }, { - "command": "cp node_modules/ionicons/dist/ionicons.js dist/apps/client" + "command": "shx cp node_modules/ionicons/dist/ionicons.js dist/apps/client" }, { - "command": "cp -r node_modules/ionicons/dist/ionicons dist/apps/client/ionicons" + "command": "shx cp -r node_modules/ionicons/dist/ionicons dist/apps/client/ionicons" }, { - "command": "cp CHANGELOG.md dist/apps/client/assets" + "command": "shx cp CHANGELOG.md dist/apps/client/assets" }, { - "command": "cp LICENSE dist/apps/client/assets" - } - ] - } - }, - "copy-assets-windows": { - "executor": "nx:run-commands", - "options": { - "commands": [ - { - "command": "mkdir dist\\apps\\client" - }, - { - "command": "xcopy /E /I apps\\client\\src\\assets dist\\apps\\client" - }, - { - "command": "xcopy /E /I apps\\client\\src\\assets\\.well-known dist\\apps\\client" - }, - { - "command": "copy apps\\client\\src\\assets\\favicon.ico dist\\apps\\client" - }, - { - "command": "copy apps\\client\\src\\assets\\index.html dist\\apps\\client" - }, - { - "command": "copy apps\\client\\src\\assets\\robots.txt dist\\apps\\client" - }, - { - "command": "copy apps\\client\\src\\assets\\site.webmanifest dist\\apps\\client" - }, - { - "command": "copy node_modules\\ionicons\\dist\\index.js dist\\apps\\client" - }, - { - "command": "copy node_modules\\ionicons\\dist\\ionicons.js dist\\apps\\client" - }, - { - "command": "xcopy /E /I /Y node_modules\\ionicons\\dist\\ionicons dist\\apps\\client\\ionicons" - }, - { - "command": "copy CHANGELOG.md dist\\apps\\client\\assets" - }, - { - "command": "copy LICENSE dist\\apps\\client\\assets" + "command": "shx cp LICENSE dist/apps/client/assets" } ] } diff --git a/package.json b/package.json index fa0043514..472b787a1 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,8 @@ "affected:lint": "nx affected:lint", "affected:test": "nx affected:test", "angular": "node --max_old_space_size=32768 ./node_modules/@angular/cli/bin/ng", - "build:dev": "run-script-os", - "build:dev:windows": "nx run api:build && nx run client:build && nx run client:copy-assets-windows && yarn replace-placeholders-in-build", - "build:dev:default": "nx run api:build && nx run client:build && nx run client:copy-assets && yarn replace-placeholders-in-build", - "build:production": "run-script-os", - "build:production:windows": "nx run api:build:production && nx run client:build:production && nx run client:copy-assets-windows && yarn replace-placeholders-in-build", - "build:production:default": "nx run api:build:production && nx run client:build:production && nx run client:copy-assets && yarn replace-placeholders-in-build", + "build:dev": "nx run api:build && nx run client:build && nx run client:copy-assets && yarn replace-placeholders-in-build", + "build:production": "nx run api:build:production && nx run client:build:production && nx run client:copy-assets && yarn replace-placeholders-in-build", "build:storybook": "nx run ui:build-storybook", "database:format-schema": "prisma format", "database:generate-typings": "prisma generate", @@ -44,9 +40,7 @@ "postinstall": "prisma generate", "replace-placeholders-in-build": "node ./replace.build.js", "start": "node dist/apps/api/main", - "start:client": "run-script-os", - "start:client:windows": "nx run client:copy-assets-windows && nx run client:serve --configuration=development-en --hmr -o", - "start:client:default": "nx run client:copy-assets && nx run client:serve --configuration=development-en --hmr -o", + "start:client": "nx run client:copy-assets && nx run client:serve --configuration=development-en --hmr -o", "start:production": "yarn database:migrate && yarn database:seed && node main", "start:server": "nx run api:serve --watch", "start:storybook": "nx run ui:storybook", @@ -200,7 +194,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "replace-in-file": "7.0.1", - "run-script-os": "^1.1.6", + "shx": "^0.3.4", "storybook": "7.0.9", "ts-jest": "29.1.0", "ts-node": "10.9.1", diff --git a/yarn.lock b/yarn.lock index 1021d7eff..7be880b9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14264,7 +14264,7 @@ minimatch@^9.0.0, minimatch@^9.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -16665,11 +16665,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -run-script-os@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347" - integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== - rw@1: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" @@ -16989,6 +16984,14 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" +shx@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.4.tgz#74289230b4b663979167f94e1935901406e40f02" + integrity sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g== + dependencies: + minimist "^1.2.3" + shelljs "^0.8.5" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"