Skip to content

Commit bb78c59

Browse files
compulimcompulim
authored
Audit-fix dependencies (#4534)
* Add auditfix and bump scripts * Prune package-lock.json after auditfix/bump * Run clean/bootstrap only for packages * Use --legacy-peer-deps for audit fix * Clean up package-lock.json by "lerna bootstrap" * Audit fix for packages * Add auditfix * Add scripts * Bump lerna * Add lock file * Audit fix for samples * Add audit script
1 parent ae47f35 commit bb78c59

76 files changed

Lines changed: 18905 additions & 29288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,21 @@
1818
"keywords": [],
1919
"cldr-data-coverage": "full",
2020
"scripts": {
21+
"audit": "npm run audit:packages && npm run audit:samples",
22+
"audit:packages": "for i in `find packages -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Audit $i/package.json ---\u001b[0m; cd $i; npm audit --audit-level=critical; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while audit $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Audit completed ---\u001b[0m",
23+
"audit:samples": "for i in `find samples -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Audit $i/package.json ---\u001b[0m; cd $i; npm audit --audit-level=critical; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while audit $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Audit completed ---\u001b[0m",
24+
"auditfix": "npm run auditfix:packages && npm run auditfix:samples",
25+
"auditfix:packages": "for i in `find packages -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Audit-fixing $i/package.json ---\u001b[0m; cd $i; npm run auditfix; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while audit-fixing $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Audit-fix completed ---\u001b[0m && lerna clean --yes && lerna bootstrap",
26+
"auditfix:samples": "for i in `find samples -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Audit-fixing $i/package.json ---\u001b[0m; cd $i; npm run auditfix; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while audit-fixing $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Audit-fix completed ---\u001b[0m",
2127
"bootstrap": "lerna bootstrap --ci",
2228
"browser": "node ./packages/test/harness/src/host/dev/index http://localhost:5001/__tests__/html/",
2329
"browser:watch": "node-dev --no-notify --respawn ./packages/test/harness/src/host/dev/index http://localhost:5001/__tests__/html/",
2430
"build": "lerna run --ignore playground --stream build",
25-
"bump": "npm run bump:prod && npm run bump:dev",
26-
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
27-
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
31+
"bump": "npm run bump:prod && npm run bump:dev && && npm run bump:packages && npm run bump:samples",
32+
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
33+
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
34+
"bump:packages": "for i in `find packages -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Bumping $i/package.json ---\u001b[0m; cd $i; npm run bump; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while bumping $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Bump completed ---\u001b[0m && lerna clean --yes && lerna bootstrap",
35+
"bump:samples": "for i in `find samples -name package.json ! -path */node_modules/* | xargs realpath | xargs dirname`; do echo \u001b[32m--- Bumping $i/package.json ---\u001b[0m; cd $i; npm run bump; if [ $? -ne 0 ]; then echo \u001b[31m--- Error while bumping $i/package.json ---\u001b[0m; break; fi; cd $OLDPWD; done; echo \u001b[32m--- Bump completed ---\u001b[0m",
2836
"docker": "npm run docker:up",
2937
"docker:down": "docker-compose -f docker-compose-wsl2.yml down --rmi all",
3038
"docker:up": "docker-compose -f docker-compose-wsl2.yml down && docker-compose -f docker-compose-wsl2.yml up --build --scale chrome=4",

‎packages/api/package.json‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,19 @@
2222
],
2323
"homepage": "https://github.com/microsoft/BotFramework-WebChat/tree/main/packages/component#readme",
2424
"scripts": {
25+
"auditfix": "npm audit fix --legacy-peer-deps || exit 0",
2526
"build": "npm run build:globalize && npm run build:typescript && npm run build:babel",
2627
"build:babel": "babel src --copy-files --extensions .js,.ts,.tsx --ignore **/*.spec.js,**/*.spec.ts,**/*.spec.tsx,**/*.test.js,**/*.test.ts,**/*.test.tsx,__tests__/**/*.js,__tests__/**/*.ts,__tests__/**/*.tsx --no-copy-ignored --out-dir lib --verbose",
2728
"build:globalize": "node scripts/createPrecompiledGlobalize.mjs",
2829
"build:typescript": "tsc --project src/tsconfig.json",
2930
"bump": "npm run bump:prod && npm run bump:dev",
30-
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
31-
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
31+
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
32+
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
3233
"eslint": "npm run precommit",
34+
"postauditfix": "npm run postbump",
35+
"postbump": "cat package.json | jq '. + (.dependencies = ((.dependencies + (.localPeerDependencies // {})) | to_entries | sort_by(.key) | from_entries)) | (.devDependencies = ((.devDependencies + (.localPeerDevDependencies // {})) | to_entries | sort_by(.key) | from_entries))' > package-temp.json && mv package-temp.json package.json",
36+
"preauditfix": "npm run prebump",
37+
"prebump": "cat package.json | jq '(((.localPeerDependencies // {}) | keys | map([\"dependencies\", .])) + ((.localPeerDevDependencies // {}) | keys | map([\"devDependencies\", .]))) as $localPeerPaths | delpaths($localPeerPaths)' > package-temp.json && mv package-temp.json package.json",
3338
"precommit": "npm run precommit:eslint -- src && npm run precommit:typecheck",
3439
"precommit:eslint": "../../node_modules/.bin/eslint --report-unused-disable-directives --max-warnings 0",
3540
"precommit:typecheck": "tsc --project ./src --emitDeclarationOnly false --esModuleInterop true --noEmit --pretty false",
@@ -75,5 +80,11 @@
7580
"peerDependencies": {
7681
"react": ">= 16.8.6",
7782
"react-dom": ">= 16.8.6"
83+
},
84+
"localPeerDependencies": {
85+
"botframework-webchat-core": "0.0.0-0"
86+
},
87+
"localPeerDevDependencies": {
88+
"cldr-data": "36.0.0-0"
7889
}
7990
}

‎packages/bundle/package-lock.json‎

Lines changed: 12 additions & 144 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bundle/package.json‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@
2424
"src/**/*"
2525
],
2626
"scripts": {
27+
"auditfix": "npm audit fix --legacy-peer-deps || exit 0",
2728
"build": "npm run build:typescript && npm run build:babel && npm run build:webpack",
2829
"build:babel": "babel src --extensions .js,.ts,.tsx --ignore **/*.spec.js,**/*.spec.ts,**/*.spec.tsx,**/*.test.js,**/*.test.ts,**/*.test.tsx,__tests__/**/*.js,__tests__/**/*.ts,__tests__/**/*.tsx --out-dir lib --verbose",
2930
"build:typescript": "tsc --project src/tsconfig.json",
3031
"build:webpack": "webpack-cli",
3132
"bump": "npm run bump:prod && npm run bump:dev",
32-
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
33-
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - (.skipBump | keys) | .[]' | awk '{print $1 \"@latest\"}')",
33+
"bump:dev": "npm install --legacy-peer-deps $(cat package.json | jq -r '(.devDependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
34+
"bump:prod": "npm install --legacy-peer-deps --save-exact $(cat package.json | jq -r '(.dependencies | keys) - ((.skipBump // {}) | keys) | .[]' | awk '{print $1 \"@latest\"}')",
3435
"eslint": "npm run precommit",
36+
"postauditfix": "npm run postbump",
37+
"postbump": "cat package.json | jq '. + (.dependencies = ((.dependencies + (.localPeerDependencies // {})) | to_entries | sort_by(.key) | from_entries)) | (.devDependencies = ((.devDependencies + (.localPeerDevDependencies // {})) | to_entries | sort_by(.key) | from_entries))' > package-temp.json && mv package-temp.json package.json",
38+
"preauditfix": "npm run prebump",
39+
"prebump": "cat package.json | jq '(((.localPeerDependencies // {}) | keys | map([\"dependencies\", .])) + ((.localPeerDevDependencies // {}) | keys | map([\"devDependencies\", .]))) as $localPeerPaths | delpaths($localPeerPaths)' > package-temp.json && mv package-temp.json package.json",
3540
"precommit": "npm run precommit:eslint -- src && npm run precommit:typecheck",
3641
"precommit:eslint": "../../node_modules/.bin/eslint --report-unused-disable-directives --max-warnings 0",
3742
"precommit:typecheck": "tsc --project ./src --emitDeclarationOnly false --esModuleInterop true --noEmit --pretty false",
@@ -97,5 +102,15 @@
97102
"peerDependencies": {
98103
"react": ">= 16.8.6",
99104
"react-dom": ">= 16.8.6"
105+
},
106+
"localPeerDependencies": {
107+
"botframework-directlinespeech-sdk": "0.0.0-0",
108+
"botframework-webchat-api": "0.0.0-0",
109+
"botframework-webchat-component": "0.0.0-0",
110+
"botframework-webchat-core": "0.0.0-0"
111+
},
112+
"localPeerDevDependencies": {
113+
"isomorphic-react": "^0.0.0-0",
114+
"isomorphic-react-dom": "^0.0.0-0"
100115
}
101116
}

0 commit comments

Comments
 (0)