Skip to content

Commit be3b862

Browse files
authored
Merge branch 'master' into mdc-select
2 parents fb51226 + 70ead0c commit be3b862

File tree

109 files changed

+1237
-576
lines changed

Some content is hidden

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

109 files changed

+1237
-576
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ jobs:
336336
yarn check-entry-point-setup $(bazel info bazel-bin)/entry_points_manifest.json
337337
338338
- run: yarn ng-dev format changed --check << pipeline.git.base_revision >>
339+
- run: yarn ng-dev commit-message validate-range --range << pipeline.git.base_revision >>...<<pipeline.git.revision>>
339340
- run: yarn ownerslint
340341
- run: yarn stylelint
341342
- run: yarn tslint

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ testem.log
3939
/.git
4040
/.firebase
4141
/.bazelrc.user
42+
*.log

.ng-dev/commit-message.ts

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
import {CommitMessageConfig} from '@angular/dev-infra-private/commit-message/config';
2+
3+
/**
4+
* The configuration for `ng-dev commit-message` commands.
5+
*/
6+
export const commitMessage: CommitMessageConfig = {
7+
maxLineLength: 120,
8+
minBodyLength: 0,
9+
minBodyLengthTypeExcludes: ['docs'],
10+
scopes: [
11+
'cdk-experimental/column-resize',
12+
'cdk-experimental/combobox',
13+
'cdk-experimental/dialog',
14+
'cdk-experimental/listbox',
15+
'cdk-experimental/menu',
16+
'cdk-experimental/popover-edit',
17+
'cdk-experimental/scrolling',
18+
'cdk-experimental/selection',
19+
'cdk/a11y',
20+
'cdk/accordion',
21+
'cdk/bidi',
22+
'cdk/clipboard',
23+
'cdk/coercion',
24+
'cdk/collections',
25+
'cdk/drag-drop',
26+
'cdk/keycodes',
27+
'cdk/layout',
28+
'cdk/observers',
29+
'cdk/overlay',
30+
'cdk/platform',
31+
'cdk/portal',
32+
'cdk/schematics',
33+
'cdk/scrolling',
34+
'cdk/stepper',
35+
'cdk/table',
36+
'cdk/testing',
37+
'cdk/text-field',
38+
'cdk/tree',
39+
'google-maps',
40+
'material-experimental/column-resize',
41+
'material-experimental/mdc-autocomplete',
42+
'material-experimental/mdc-button',
43+
'material-experimental/mdc-card',
44+
'material-experimental/mdc-checkbox',
45+
'material-experimental/mdc-chips',
46+
'material-experimental/mdc-color',
47+
'material-experimental/mdc-core',
48+
'material-experimental/mdc-density',
49+
'material-experimental/mdc-dialog',
50+
'material-experimental/mdc-form-field',
51+
'material-experimental/mdc-helpers',
52+
'material-experimental/mdc-input',
53+
'material-experimental/mdc-list',
54+
'material-experimental/mdc-menu',
55+
'material-experimental/mdc-progress-bar',
56+
'material-experimental/mdc-progress-spinner',
57+
'material-experimental/mdc-radio',
58+
'material-experimental/mdc-select',
59+
'material-experimental/mdc-sidenav',
60+
'material-experimental/mdc-slide-toggle',
61+
'material-experimental/mdc-slider',
62+
'material-experimental/mdc-snack-bar',
63+
'material-experimental/mdc-table',
64+
'material-experimental/mdc-tabs',
65+
'material-experimental/mdc-theming',
66+
'material-experimental/mdc-typography',
67+
'material-experimental/menubar',
68+
'material-experimental/popover-edit',
69+
'material-experimental/selection',
70+
'material-moment-adapter',
71+
'material/autocomplete',
72+
'material/badge',
73+
'material/bottom-sheet',
74+
'material/button',
75+
'material/button-toggle',
76+
'material/card',
77+
'material/checkbox',
78+
'material/chips',
79+
'material/core',
80+
'material/datepicker',
81+
'material/dialog',
82+
'material/divider',
83+
'material/expansion',
84+
'material/form-field',
85+
'material/grid-list',
86+
'material/icon',
87+
'material/input',
88+
'material/list',
89+
'material/menu',
90+
'material/paginator',
91+
'material/prebuilt-themes',
92+
'material/progress-bar',
93+
'material/progress-spinner',
94+
'material/radio',
95+
'material/schematics',
96+
'material/select',
97+
'material/sidenav',
98+
'material/slide-toggle',
99+
'material/slider',
100+
'material/snack-bar',
101+
'material/sort',
102+
'material/stepper',
103+
'material/table',
104+
'material/tabs',
105+
'material/testing',
106+
'material/toolbar',
107+
'material/tooltip',
108+
'material/tree',
109+
'youtube-player'
110+
],
111+
};

.ng-dev/config.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import {format} from './format';
22
import {github} from './github';
33
import {merge} from './merge';
4+
import {commitMessage} from './commit-message';
45

56
module.exports = {
7+
commitMessage,
8+
format,
69
github,
710
merge,
8-
format,
911
};

.yarn/releases/yarn-1.22.0.js renamed to .yarn/releases/yarn-1.22.5.js

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34805,15 +34805,27 @@ function hasMergeConflicts(str) {
3480534805
function parse(str, fileLoc) {
3480634806
const parser = new Parser(str, fileLoc);
3480734807
parser.next();
34808-
try {
34809-
return parser.parse();
34810-
} catch (error1) {
34808+
34809+
if (!fileLoc.endsWith(`.yml`)) {
3481134810
try {
34812-
return safeLoad(str, {
34813-
schema: FAILSAFE_SCHEMA
34814-
});
34815-
} catch (error2) {
34816-
throw error1;
34811+
return parser.parse();
34812+
} catch (error1) {
34813+
try {
34814+
return safeLoad(str, {
34815+
schema: FAILSAFE_SCHEMA
34816+
});
34817+
} catch (error2) {
34818+
throw error1;
34819+
}
34820+
}
34821+
} else {
34822+
const result = safeLoad(str, {
34823+
schema: FAILSAFE_SCHEMA
34824+
});
34825+
if (typeof result === 'object') {
34826+
return result;
34827+
} else {
34828+
return {};
3481734829
}
3481834830
}
3481934831
}
@@ -44642,7 +44654,7 @@ const FOLDERS_IGNORE = [
4464244654
const DEFAULT_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([...FOLDERS_IGNORE,
4464344655

4464444656
// ignore cruft
44645-
'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.npmignore', '.gitignore', '.DS_Store']);
44657+
'yarn.lock', '.lock-wscript', '.wafpickle-{0..9}', '*.swp', '._*', 'npm-debug.log', 'yarn-error.log', '.npmrc', '.yarnrc', '.yarnrc.yml', '.npmignore', '.gitignore', '.DS_Store']);
4464644658

4464744659
const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
4464844660
// never ignore these files
@@ -44651,6 +44663,7 @@ const NEVER_IGNORE = (0, (_filter || _load_filter()).ignoreLinesToRegex)([
4465144663
function packWithIgnoreAndHeaders(cwd, ignoreFunction, { mapHeader } = {}) {
4465244664
return tar.pack(cwd, {
4465344665
ignore: ignoreFunction,
44666+
sort: true,
4465444667
map: header => {
4465544668
const suffix = header.name === '.' ? '' : `/${header.name}`;
4465644669
header.name = `package${suffix}`;
@@ -46666,7 +46679,7 @@ function mkdirfix (name, opts, cb) {
4666646679
/* 194 */
4666746680
/***/ (function(module, exports) {
4666846681

46669-
module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
46682+
module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.22.5","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^3.1.0","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","cli-table3":"^0.4.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^6.2.0","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","js-yaml":"^3.13.1","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.4","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-inline-import":"^3.0.0","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.28","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.11.0","fancy-log":"^1.3.2","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^4.0.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","string-replace-loader":"^2.1.1","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
4667046683

4667146684
/***/ }),
4667246685
/* 195 */
@@ -69876,12 +69889,12 @@ function getRcConfigForFolder(cwd) {
6987669889
}
6987769890

6987869891
function loadRcFile(fileText, filePath) {
69879-
var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, 'yarnrc');
69892+
var _parse = (0, (_lockfile || _load_lockfile()).parse)(fileText, filePath);
6988069893

6988169894
let values = _parse.object;
6988269895

6988369896

69884-
if (filePath.match(/\.yml$/)) {
69897+
if (filePath.match(/\.yml$/) && typeof values.yarnPath === 'string') {
6988569898
values = { 'yarn-path': values.yarnPath };
6988669899
}
6988769900

@@ -98326,7 +98339,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
9832698339

9832798340
const bundle = yield fetchBundle(config, bundleUrl);
9832898341

98329-
const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.js`);
98342+
const yarnPath = path.resolve(config.lockfileFolder, `.yarn/releases/yarn-${bundleVersion}.cjs`);
9833098343
reporter.log(`Saving it into ${chalk.magenta(yarnPath)}...`);
9833198344
yield (_fs || _load_fs()).mkdirp(path.dirname(yarnPath));
9833298345
yield (_fs || _load_fs()).writeFile(yarnPath, bundle);
@@ -98338,7 +98351,7 @@ var _buildSubCommands = (0, (_buildSubCommands2 || _load_buildSubCommands()).def
9833898351
const rcPath = `${config.lockfileFolder}/.yarnrc.yml`;
9833998352
reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
9834098353

98341-
yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(yarnPath)}\n`);
98354+
yield (_fs || _load_fs()).writeFilePreservingEol(rcPath, `yarnPath: ${JSON.stringify(targetPath)}\n`);
9834298355
} else {
9834398356
const rcPath = `${config.lockfileFolder}/.yarnrc`;
9834498357
reporter.log(`Updating ${chalk.magenta(rcPath)}...`);
@@ -100178,7 +100191,7 @@ let main = exports.main = (() => {
100178100191

100179100192
const config = new (_config || _load_config()).default(reporter);
100180100193
const outputWrapperEnabled = (0, (_conversion || _load_conversion()).boolifyWithDefault)(process.env.YARN_WRAP_OUTPUT, true);
100181-
const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args);
100194+
const shouldWrapOutput = outputWrapperEnabled && !(_commander || _load_commander()).default.json && command.hasWrapper((_commander || _load_commander()).default, (_commander || _load_commander()).default.args) && !(commandName === 'init' && (_commander || _load_commander()).default[`2`]);
100182100195

100183100196
if (shouldWrapOutput) {
100184100197
reporter.header(commandName, { name: 'yarn', version: (_yarnVersion || _load_yarnVersion()).version });
@@ -100586,8 +100599,13 @@ let start = (() => {
100586100599
const opts = { stdio: 'inherit', env: Object.assign({}, process.env, { YARN_IGNORE_PATH: 1 }) };
100587100600
let exitCode = 0;
100588100601

100602+
process.on(`SIGINT`, function () {
100603+
// We don't want SIGINT to kill our process; we want it to kill the
100604+
// innermost process, whose end will cause our own to exit.
100605+
});
100606+
100589100607
try {
100590-
if (yarnPath.endsWith(`.js`)) {
100608+
if (/\.[cm]?js$/.test(yarnPath)) {
100591100609
exitCode = yield (0, (_child || _load_child()).spawnp)(process.execPath, [yarnPath, ...argv], opts);
100592100610
} else {
100593100611
exitCode = yield (0, (_child || _load_child()).spawnp)(yarnPath, argv, opts);
@@ -107715,7 +107733,11 @@ function parseRcPaths(paths, parser) {
107715107733
try {
107716107734
return parser((0, (_fs || _load_fs()).readFileSync)(path).toString(), path);
107717107735
} catch (error) {
107718-
return {};
107736+
if (error.code === 'ENOENT' || error.code === 'EISDIR') {
107737+
return {};
107738+
} else {
107739+
throw error;
107740+
}
107719107741
}
107720107742
}));
107721107743
}

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44

55
lastUpdateCheck 1581546341989
6-
yarn-path ".yarn/releases/yarn-1.22.0.js"
6+
yarn-path ".yarn/releases/yarn-1.22.5.js"

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@angular/bazel": "^10.1.0",
7676
"@angular/benchpress": "^0.2.1",
7777
"@angular/compiler-cli": "^10.1.0",
78-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#d0855af987db4e426477da1780bcd02941c31271",
78+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0364a68f33191747a0bb7580e44a9ad6d50add10",
7979
"@angular/platform-browser-dynamic": "^10.1.0",
8080
"@angular/platform-server": "^10.1.0",
8181
"@angular/router": "^10.1.0",
@@ -126,7 +126,7 @@
126126
"gulp-cli": "^2.0.1",
127127
"gulp-sass": "^4.0.2",
128128
"highlight.js": "^9.11.0",
129-
"husky": "^1.3.1",
129+
"husky": "^4.3.0",
130130
"inquirer": "^7.1.0",
131131
"jasmine-core": "^3.5.0",
132132
"kagekiri": "^1.0.18",
@@ -177,5 +177,10 @@
177177
"resolutions": {
178178
"dgeni-packages/typescript": "4.0.2",
179179
"**/graceful-fs": "4.2.2"
180+
},
181+
"husky": {
182+
"hooks": {
183+
"commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS"
184+
}
180185
}
181186
}

scripts/caretaking/firebase-functions/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2834,9 +2834,9 @@ node-emoji@^1.4.1:
28342834
lodash.toarray "^4.4.0"
28352835

28362836
node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0:
2837-
version "2.6.0"
2838-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
2839-
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
2837+
version "2.6.1"
2838+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
2839+
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
28402840

28412841
node-forge@^0.9.0, node-forge@^0.9.1:
28422842
version "0.9.1"

0 commit comments

Comments
 (0)