From 1dc2e2746cba44d67787806f8372f7a15e5aa847 Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Fri, 9 Dec 2022 10:10:04 +0300 Subject: [PATCH] work for #5312 clean package.json & yml files --- azure-pipelines.yml | 14 ++++---------- build-packages.yml | 18 +++++------------- devops-pull-requests-parallel-jobs.yml | 4 ---- devops-visual-regression-tests.yml | 1 - package.json | 16 ---------------- visual-regression-tests.yml | 2 +- 6 files changed, 10 insertions(+), 45 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 94dbf144bd..160c468710 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,7 +38,7 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins displayName: "Build Core" @@ -63,11 +63,9 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_knockout_ui - npm run build-knockout-ui-typings:linux npm run build_knockout_prod - npm run build-knockout-typings:linux displayName: "Build Knockout" - script: | @@ -102,11 +100,9 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_react_ui - npm run build-react-ui-typings:linux npm run build_react_prod - npm run build-react-typings:linux displayName: "Build React" - script: | @@ -136,11 +132,9 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_vue_ui - npm run build-vue-ui-typings npm run build_vue_prod - npm run build-vue-typings displayName: "Build Vue" - script: | diff --git a/build-packages.yml b/build-packages.yml index 9a6de91c67..a8aebb79a5 100644 --- a/build-packages.yml +++ b/build-packages.yml @@ -102,19 +102,17 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins displayName: "Build Core" - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_angular - npm run build-angular-typings:linux displayName: "Build Angular" - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_jquery - npm run build-jquery-typings:linux displayName: "Build jQuery" - task: CopyFiles@2 @@ -208,16 +206,14 @@ jobs: - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_knockout - npm run build-knockout-typings:linux displayName: "Build Knockout" - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_knockout_ui - npm run build-knockout-ui-typings:linux displayName: "Build Knockout UI" - script: | @@ -316,16 +312,14 @@ jobs: - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_react - npm run build-react-typings:linux displayName: "Build React" - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_react_ui - npm run build-react-ui-typings:linux displayName: "Build React UI" - script: | @@ -419,16 +413,14 @@ jobs: - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_vue - npm run build-vue-typings displayName: "Build Vue" - script: | cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins npm run build_vue_ui - npm run build-vue-ui-typings displayName: "Build Vue UI" - script: | @@ -516,7 +508,7 @@ jobs: cd $(Build.SourcesDirectory)/survey-library npm run build_core npm run build_i18n - npm run build-core-typings:linux + npm run build-plugins displayName: "Build Core" - script: | diff --git a/devops-pull-requests-parallel-jobs.yml b/devops-pull-requests-parallel-jobs.yml index 4641149048..4f3febf12e 100644 --- a/devops-pull-requests-parallel-jobs.yml +++ b/devops-pull-requests-parallel-jobs.yml @@ -52,7 +52,6 @@ jobs: - script: | npm run build_knockout_prod - npm run build-knockout-typings:linux displayName: "Build Knockout" - script: | @@ -107,7 +106,6 @@ jobs: - script: | npm run build_react_prod - npm run build-react-typings:linux displayName: "Build React" - script: | @@ -154,7 +152,6 @@ jobs: - script: | npm run build_vue_prod - npm run build-vue-typings displayName: "Build Vue" - script: | @@ -201,7 +198,6 @@ jobs: - script: | npm run build_core npm run build_i18n - npm run build-core-typings:linux npm run build-plugins displayName: "Build Core" diff --git a/devops-visual-regression-tests.yml b/devops-visual-regression-tests.yml index e1881864bd..b962c77f0d 100644 --- a/devops-visual-regression-tests.yml +++ b/devops-visual-regression-tests.yml @@ -219,7 +219,6 @@ jobs: - powershell: | npm run build_core npm run build_i18n_dev - npm run build-core-typings:windows npm run build-plugins displayName: "Build Core" diff --git a/package.json b/package.json index 85ebcbb315..c3662f6b0d 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,8 @@ "build_vue_prod": "webpack --config ./build-scripts/survey-vue/webpack.config.js --env.buildType prod", "build_jquery_dev": "webpack --config ./build-scripts/survey-jquery/webpack.config.js --env.buildType dev", "build_jquery_prod": "webpack --config ./build-scripts/survey-jquery/webpack.config.js --env.buildType prod", - "build-jquery-typings:linux": "", - "build-jquery-typings:windows": "", "build_angular_dev": "webpack --config ./build-scripts/survey-angular/webpack.config.js --env.buildType dev", "build_angular_prod": "webpack --config ./build-scripts/survey-angular/webpack.config.js --env.buildType prod", - "build-angular-typings:linux": "", - "build-angular-typings:windows": "", "build_i18n_dev": "webpack --config ./build-scripts/survey-core/webpack.i18n.js --env.buildType dev", "build_i18n_prod": "webpack --config ./build-scripts/survey-core/webpack.i18n.js --env.buildType prod", "build_dev": "concurrently \"npm run build_knockout_dev\" \"npm run build_react_dev\" \"npm run build_angular_dev\" \"npm run build_jquery_dev\" \"npm run build_vue_dev\" \"npm run build_core_dev\" \"npm run build_i18n_dev\"", @@ -41,24 +37,12 @@ "watch_jquery_dev": "webpack --config ./build-scripts/survey-jquery/webpack.config.js --env.buildType dev --watch", "watch_vue_dev": "webpack --config ./build-scripts/survey-vue/webpack.config.js --env.buildType dev --watch", "build_knockout": "npm run build_knockout_dev && npm run build_knockout_prod", - "build-knockout-typings:linux": "", - "build-knockout-typings:windows": "", "build_knockout_ui": "webpack --config ./build-scripts/survey-knockout-ui/webpack.config.js --env.buildType dev && webpack --config ./build-scripts/survey-knockout-ui/webpack.config.js --env.buildType prod", - "build-knockout-ui-typings:linux": "", - "build-knockout-ui-typings:windows": "", "build_react": "npm run build_react_dev && npm run build_react_prod", - "build-react-typings:linux": "", - "build-react-typings:windows": "", "build_react_ui": "webpack --config ./build-scripts/survey-react-ui/webpack.config.js --env.buildType dev && webpack --config ./build-scripts/survey-react-ui/webpack.config.js --env.buildType prod", - "build-react-ui-typings:linux": "", - "build-react-ui-typings:windows": "", "build_vue": "npm run build_vue_dev && npm run build_vue_prod", - "build-vue-typings": "", "build_vue_ui": "webpack --config ./build-scripts/survey-vue-ui/webpack.config.js --env.buildType dev && webpack --config ./build-scripts/survey-vue-ui/webpack.config.js --env.buildType prod", - "build-vue-ui-typings": "", "build_core": "npm run build_core_dev && npm run build_core_prod", - "build-core-typings:linux": "", - "build-core-typings:windows": "", "build-plugins": "", "build_i18n": "npm run build_i18n_dev && npm run build_i18n_prod", "build_jquery": "npm run build_jquery_dev && npm run build_jquery_prod", diff --git a/visual-regression-tests.yml b/visual-regression-tests.yml index a8ea5afdc1..dafe032296 100644 --- a/visual-regression-tests.yml +++ b/visual-regression-tests.yml @@ -219,7 +219,7 @@ jobs: - powershell: | npm run build_core npm run build_i18n_dev - npm run build-core-typings:windows + npm run build-plugins displayName: "Build Core" - script: |