Skip to content

Commit c7800eb

Browse files
committed
Merge branch 'master' into ticket/BB-26086
# Conflicts: # application/commerce-crm-de/pnpm-lock.yaml # application/commerce-crm-documentation/pnpm-lock.yaml # application/commerce-crm-ee-de/pnpm-lock.yaml # application/commerce-crm/pnpm-lock.yaml # application/commerce-demo/pnpm-lock.yaml # application/commerce-enterprise/pnpm-lock.yaml # application/commerce/pnpm-lock.yaml # application/crm-demo/pnpm-lock.yaml # application/crm-enterprise/pnpm-lock.yaml # application/crm/pnpm-lock.yaml # application/orocommerce-platform/pnpm-lock.yaml # application/platform-enterprise/pnpm-lock.yaml # application/platform/pnpm-lock.yaml
2 parents 6fa24aa + ffdd3fa commit c7800eb

File tree

6 files changed

+262
-272
lines changed

6 files changed

+262
-272
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ bin/*
5454
/.php-version
5555
/docker-compose.override.yml
5656
/.user.ini
57+
/npm-package

dev.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"scripts": {
7777
"post-install-cmd": [
7878
"@set-permissions",
79-
"@pnpm-install-root",
79+
"@install-npm-assets",
8080
"@set-assets-version",
8181
"@execute-post-install-package-scripts",
8282
"@install-assets"
@@ -110,7 +110,7 @@
110110
"Oro\\Bundle\\InstallerBundle\\Composer\\ParametersHandler::set"
111111
],
112112
"install-assets": [
113-
"console oro:assets:install --symlink --no-interaction --no-ansi"
113+
"console oro:assets:install --no-interaction --no-ansi"
114114
],
115115
"upgrade:full": [
116116
"@health",
@@ -215,9 +215,11 @@
215215
"notification:finish": [
216216
"console oro:maintenance-notification --message=Deploy\\ finish --subject=At\\ $ORO_APP_URL --no-interaction --no-ansi"
217217
],
218-
"pnpm-install-root": [
219-
"cd ../../ && pnpm install --prefer-offline",
220-
"cd ../../ && pnpm run build --no-private"
218+
"sync-npm-package": [
219+
"rm -rf npm-package",
220+
"cp -rf ../../npm-package ./",
221+
"pnpm install --prefer-offline --link-workspace-packages --no-lockfile",
222+
"pnpm -r --if-present run build"
221223
]
222224
},
223225
"minimum-stability": "dev",

0 commit comments

Comments
 (0)