apply similar changes to more packages in core - ci pipeline

Azure · Apr 23, 2024 · fcec45d · fcec45d
1 parent 682b93d
commit fcec45d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/sdk/template/template-dpg/package.json b/sdk/template/template-dpg/package.json
@@ -31,16 +31,16 @@
     "build:samples": "echo Obsolete",
     "build:test:browser": "tsc -p . && dev-tool run bundle",
     "build:test:node": "tsc -p . && dev-tool run bundle",
-    "build:test": "tsc -p . && dev-tool run bundle",
+    "build:test": "echo skipped. actual commands inlined in browser test scripts",
     "build:output": "node scripts/renameOutput.mjs",
-    "build": "npm run customize && npm run build:test && dev-tool run extract-api && npm run build:output",
+    "build": "npm run customize && dev-tool run extract-api && npm run build:output",
     "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
     "clean": "rimraf --glob dist dist-* temp types *.tgz *.log",
     "customize": "dev-tool customization apply -s sources/generated/src -c sources/customizations/src && npm run format",
     "execute:samples": "dev-tool samples run samples-dev",
     "extract-api": "tsc -p . && dev-tool run extract-api",
     "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"sources/customizations/**/*.ts\" \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
-    "integration-test:browser": "dev-tool run test:browser",
+    "integration-test:browser": "tsc -p . && dev-tool run bundle && dev-tool run test:browser",
     "integration-test:node": "dev-tool run test:node-js-input -- --timeout 5000000 'dist-esm/test/**/*.spec.js'",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "lint:fix": "eslint README.md package.json api-extractor.json src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]",
@@ -49,7 +49,7 @@
     "test:browser": "npm run clean && npm run build && npm run integration-test:browser",
     "test:node": "npm run clean && tsc -p . && npm run integration-test:node",
     "test": "npm run clean && tsc -p . && npm run unit-test:node && dev-tool run bundle && npm run unit-test:browser && npm run integration-test",
-    "unit-test:browser": "dev-tool run test:browser",
+    "unit-test:browser": "tsc -p . && dev-tool run bundle && dev-tool run test:browser",
     "unit-test:node": "dev-tool run test:node-ts-input -- \"test/internal/unit/{,!(browser)/**/}*.spec.ts\" \"test/public/{,!(browser)/**/}*.spec.ts\"",
     "unit-test": "npm run unit-test:node && npm run unit-test:browser"
   },

diff --git a/sdk/template/template/package.json b/sdk/template/template/package.json
@@ -34,23 +34,23 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:node": "tshy && npm run build:test",
+    "build:node": "tshy",
     "build:samples": "echo Skipped.",
-    "build:test": "tshy && dev-tool run build-test",
-    "build": "npm run clean && npm run build:test && dev-tool run extract-api",
+    "build:test": "echo skipped. actual commands inlined in browser test scripts",
+    "build": "npm run clean && tshy && dev-tool run extract-api",
     "check-format": "dev-tool run vendored prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
     "clean": "rimraf --glob dist dist-* temp types *.tgz *.log",
     "execute:samples": "dev-tool samples run samples-dev",
     "extract-api": "tshy && dev-tool run extract-api",
     "format": "dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"samples-dev/**/*.ts\" \"*.{js,json}\"",
     "generate:client": "autorest --typescript ./swagger/README.md",
-    "integration-test:browser": "dev-tool run test:vitest --browser",
+    "integration-test:browser": "tshy && dev-tool run build-test && dev-tool run test:vitest --browser",
     "integration-test:node": "dev-tool run test:vitest",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "lint:fix": "eslint README.md package.json api-extractor.json src test --ext .ts,.javascript,.js --fix --fix-type [problem,suggestion]",
     "lint": "eslint README.md package.json api-extractor.json src test --ext .ts,.javascript,.js",
     "pack": "npm pack 2>&1",
-    "test:browser": "npm run clean && npm run build:test && npm run integration-test:browser",
+    "test:browser": "npm run clean && npm run integration-test:browser",
     "test:node": "npm run clean && npm run build:test && npm run integration-test:node",
     "test": "npm run clean && tshy && npm run unit-test:node && dev-tool run bundle && npm run unit-test:browser && npm run integration-test",
     "unit-test:browser": "npm run integration-test:browser",