Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project clean to make faster #2093

Merged
merged 1 commit into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AISKU/Tests/es6-module-type-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"module": "dist-es5/applicationinsights-test-module-type-check.js",
"types": "types/applicationinsights-test-module-type-check.d.ts",
"scripts": {
"clean": "grunt clean",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grunt clean doesn't actually exist 😦

"clean": "git clean -xdf",
"build": "tsc --project tsconfig.json --noEmit",
"rebuild": "npm run build",
"test": "",
Expand Down
2 changes: 1 addition & 1 deletion AISKU/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS"
},
"scripts": {
"clean": "rm -rfv browser types build dist dist-es5",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt aisku",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions AISKULight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"types": "types/applicationinsights-web-basic.d.ts",
"sideEffects": false,
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt aiskulite",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion channels/applicationinsights-channel-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"sideEffects": false,
"repository": "github:Microsoft/applicationinsights-js",
"scripts": {
"clean": "rm -rf browser build dist dist-es5 types",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt aichannel",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion channels/tee-channel-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"sideEffects": false,
"repository": "github:Microsoft/applicationinsights-js",
"scripts": {
"clean": "rm -rf browser build dist dist-es5 types",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt teechannel",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion common/Tests/Framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"module": "dist-es5/ai-test-framework.js",
"types": "types/ai-test-framework.d.ts",
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser",
"build:esm": "grunt tst-framework",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
10 changes: 10 additions & 0 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@
"enableParallelism": true,
"ignoreMissingScript": true,
"allowWarningsInSuccessfulBuild": true
},
{
"commandKind": "bulk",
"name": "clean",
"summary": "Run all clean tasks to clean each project",
"description": "Run all clean tasks to clean each project",
"safeForSimultaneousRushProcesses": true,
"enableParallelism": true,
"ignoreMissingScript": true,
"allowWarningsInSuccessfulBuild": true
}
]
}
208 changes: 104 additions & 104 deletions common/config/rush/npm-shrinkwrap.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/AISKU/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"example"
],
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser",
"build:esm": "grunt example-aisku",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion examples/dependency/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"example"
],
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser",
"build:esm": "grunt example-dependency",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion examples/shared-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"module": "dist-es5/applicationinsights-example-shared-worker.js",
"types": "types/applicationinsights-example-shared-worker.d.ts",
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser",
"build:esm": "grunt example-shared-worker",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions extensions/applicationinsights-analytics-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-analytics-js"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt ai",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"types": "types/applicationinsights-clickanalytics-js.d.ts",
"sideEffects": false,
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt clickanalytics",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions extensions/applicationinsights-debugplugin-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-debugplugin-js"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt debugplugin",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-dependencies-js"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt deps",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-perfmarkmeasure-js"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt perfmarkmeasure",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions extensions/applicationinsights-properties-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-properties-js"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt properties",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"serve": "grunt serve",
"setVersion": "node ./tools/release-tools/setVersion.js",
"purge": "node common/scripts/install-run-rush.js purge",
"fullClean": "git clean -xdf && npm install && rush update --recheck --full",
"rushClean": "node common/scripts/install-run-rush.js clean",
"fullClean": "npm run rushClean && git clean -xdf && npm install && rush update --recheck --full",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Splitting out the clean into a rush clean and then git clean -xdf as my machine (64gb) was running out of memory when performing a fully populated repo using git clean -xdf...

"fullCleanBuild": "npm run fullClean && npm run rebuild",
"ai-min": "node common/scripts/install-run-rush.js ai-min",
"ai-restore": "node common/scripts/install-run-rush.js ai-restore",
Expand Down
1 change: 1 addition & 0 deletions shared/AppInsightsCommon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/shared/AppInsightsCommon"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt common",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion shared/AppInsightsCore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"module": "dist-es5/applicationinsights-core-js.js",
"types": "types/applicationinsights-core-js.d.ts",
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run sri && npm run dtsgen",
"build:esm": "grunt core",
"build:browser": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions tools/applicationinsights-web-snippet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/extensions/applicationinsights-web-snippet"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run snippet-generate && npm run replace && npm run build:browser",
"build:esm": "grunt websnippet",
"snippet-generate": "npm run snippetCopy && npm run build:snippet && npm run snippetMin",
Expand Down
1 change: 1 addition & 0 deletions tools/chrome-debug-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"url": "https://github.com/microsoft/ApplicationInsights-JS/tree/main/tools/chrome-debug-extension"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:browser && npm run pack && npm run sri",
"build:esm": "grunt chromedebugextension",
"build:browser": "npm run update_manifest && npx rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
1 change: 1 addition & 0 deletions tools/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"url": "git+https://github.com/microsoft/ApplicationInsights-JS.git"
},
"scripts": {
"clean": "git clean -xdf",
"build": "npm run build:browser",
"build:browser": "grunt copy-config",
"rebuild": "npm run build",
Expand Down
1 change: 1 addition & 0 deletions tools/release-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"homepage": "https://1dsdocs.azurewebsites.net/sdk.html",
"sideEffects": false,
"scripts": {
"clean": "git clean -xdf",
"update": "rush update",
"build": "",
"rebuild": "",
Expand Down
2 changes: 1 addition & 1 deletion tools/rollup-es5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"module": "dist-es5/applicationinsights-rollup-es5.js",
"types": "types/applicationinsights-rollup-es5.d.ts",
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:bundle",
"build:esm": "grunt rollupes5",
"build:bundle": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion tools/rollup-plugin-uglify3-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"rollup-plugin"
],
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:bundle",
"build:esm": "grunt rollupuglify",
"build:bundle": "npx rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
2 changes: 1 addition & 1 deletion tools/shims/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"module": "dist-es5/applicationinsights-shims.js",
"types": "types/applicationinsights-shims.d.ts",
"scripts": {
"clean": "grunt clean",
"clean": "git clean -xdf",
"build": "npm run build:esm && npm run build:bundle",
"build:esm": "grunt shims",
"build:bundle": "rollup -c rollup.config.js --bundleConfigAsCjs",
Expand Down
Loading