Skip to content

Commit 10e7eb2

Browse files
alan-agius4mgechev
authored andcommitted
test: change browserslist file name to .browserslistrc
1 parent b7a612f commit 10e7eb2

File tree

15 files changed

+38
-30
lines changed

15 files changed

+38
-30
lines changed

packages/angular_devkit/build_angular/src/utils/build-browser-features_spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('BuildBrowserFeatures', () => {
3131
describe('isDifferentialLoadingNeeded', () => {
3232
it('should be true for for IE 9-11 and ES2015', () => {
3333
host.writeMultipleFiles({
34-
'browserslist': 'IE 9-11',
34+
'.browserslistrc': 'IE 9-11',
3535
});
3636

3737
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -43,7 +43,7 @@ describe('BuildBrowserFeatures', () => {
4343

4444
it('should be false for Chrome and ES2015', () => {
4545
host.writeMultipleFiles({
46-
'browserslist': 'last 1 chrome version',
46+
'.browserslistrc': 'last 1 chrome version',
4747
});
4848

4949
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -55,7 +55,7 @@ describe('BuildBrowserFeatures', () => {
5555

5656
it('detects no need for differential loading for target is ES5', () => {
5757
host.writeMultipleFiles({
58-
'browserslist': 'last 1 chrome version',
58+
'.browserslistrc': 'last 1 chrome version',
5959
});
6060

6161
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -67,7 +67,7 @@ describe('BuildBrowserFeatures', () => {
6767

6868
it('should be false for Safari 10.1 when target is ES2015', () => {
6969
host.writeMultipleFiles({
70-
'browserslist': 'Safari 10.1',
70+
'.browserslistrc': 'Safari 10.1',
7171
});
7272

7373
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -81,7 +81,7 @@ describe('BuildBrowserFeatures', () => {
8181
describe('isFeatureSupported', () => {
8282
it('should be true for es6-module and Safari 10.1', () => {
8383
host.writeMultipleFiles({
84-
'browserslist': 'Safari 10.1',
84+
'.browserslistrc': 'Safari 10.1',
8585
});
8686

8787
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -93,7 +93,7 @@ describe('BuildBrowserFeatures', () => {
9393

9494
it('should be false for es6-module and IE9', () => {
9595
host.writeMultipleFiles({
96-
'browserslist': 'IE 9',
96+
'.browserslistrc': 'IE 9',
9797
});
9898

9999
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -105,7 +105,7 @@ describe('BuildBrowserFeatures', () => {
105105

106106
it('should be true for es6-module and last 1 chrome version', () => {
107107
host.writeMultipleFiles({
108-
'browserslist': 'last 1 chrome version',
108+
'.browserslistrc': 'last 1 chrome version',
109109
});
110110

111111
const buildBrowserFeatures = new BuildBrowserFeatures(
@@ -117,7 +117,7 @@ describe('BuildBrowserFeatures', () => {
117117

118118
it('should be true for es6-module and Edge 18', () => {
119119
host.writeMultipleFiles({
120-
'browserslist': 'Edge 18',
120+
'.browserslistrc': 'Edge 18',
121121
});
122122

123123
const buildBrowserFeatures = new BuildBrowserFeatures(

packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Browser Builder with differential loading', () => {
1818
await host.initialize().toPromise();
1919
// to trigger differential loading we need an non ever green browser
2020
host.writeMultipleFiles({
21-
browserslist: 'IE 10',
21+
'.browserslistrc': 'IE 10',
2222
});
2323

2424
architect = (await createArchitect(host.root())).architect;
@@ -193,7 +193,7 @@ describe('Browser Builder with differential loading', () => {
193193

194194
it('adds `type="module"` when differential loading is needed', async () => {
195195
host.writeMultipleFiles({
196-
browserslist: `
196+
'.browserslistrc': `
197197
last 1 chrome version
198198
IE 9
199199
`,

packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ describe('Browser Builder styles', () => {
285285
/* normal-comment */
286286
/*! important-comment */
287287
div { flex: 1 }`,
288-
browserslist: 'IE 10',
288+
'.browserslistrc': 'IE 10',
289289
});
290290

291291
const overrides = { extractCss: true, optimization: false };
@@ -319,7 +319,7 @@ describe('Browser Builder styles', () => {
319319
grid-template-columns: 100px;
320320
}
321321
`,
322-
browserslist: 'IE 10',
322+
'.browserslistrc': 'IE 10',
323323
});
324324

325325
const overrides = { extractCss: true, optimization: true, styles: ['src/styles.scss'] };

packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Dev Server Builder index', () => {
1818

1919
it(`adds 'type="module"' when differential loading is needed`, async () => {
2020
host.writeMultipleFiles({
21-
browserslist: `
21+
'.browserslistrc': `
2222
last 1 chrome version
2323
IE 10
2424
`,
@@ -41,7 +41,7 @@ describe('Dev Server Builder index', () => {
4141

4242
it(`does not add 'type="module"' to custom scripts when differential loading is needed`, async () => {
4343
host.writeMultipleFiles({
44-
browserslist: `
44+
'.browserslistrc': `
4545
last 1 chrome version
4646
IE 10
4747
`,
@@ -85,7 +85,7 @@ describe('Dev Server Builder index', () => {
8585

8686
it(`doesn't 'type="module"' when differential loading is not needed`, async () => {
8787
host.writeMultipleFiles({
88-
browserslist: `
88+
'.browserslistrc': `
8989
last 1 chrome version
9090
`,
9191
});

packages/angular_devkit/build_angular/test/server/base_spec_large.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('Server Builder', () => {
5757
// the below is needed because of different code paths
5858
// for polyfills if differential loading is needed
5959
host.writeMultipleFiles({
60-
'browserslist': 'IE 10',
60+
'.browserslistrc': 'IE 10',
6161
});
6262

6363
const run = await architect.scheduleTarget(target);
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# You can see what browsers were selected by your queries by running:
6+
# npx browserslist
7+
8+
> 0.5%
9+
last 2 versions
10+
Firefox ESR
11+
not dead
12+
not IE 9-11 # For IE 9-11 support, remove 'not'.

packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,22 @@
88
import { Path, join } from '@angular-devkit/core';
99
import { DirEntry, Rule } from '@angular-devkit/schematics';
1010

11-
function visit(directory: DirEntry): Path[] {
12-
const files: Path[] = [];
13-
11+
function* visit(directory: DirEntry): IterableIterator<string> {
1412
for (const path of directory.subfiles) {
1513
if (path !== 'browserslist') {
1614
continue;
1715
}
1816

19-
files.push(join(directory.path, path));
17+
yield join(directory.path, path);
2018
}
2119

2220
for (const path of directory.subdirs) {
2321
if (path === 'node_modules') {
2422
continue;
2523
}
2624

27-
files.push(...visit(directory.dir(path)));
25+
yield* visit(directory.dir(path));
2826
}
29-
30-
return files;
3127
}
3228

3329
export default function (): Rule {

tests/legacy-cli/e2e/tests/i18n/ivy-localize-es2015.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default async function() {
99
await setupI18nConfig();
1010

1111
// Ensure a ES2015 build is used.
12-
await writeFile('browserslist', 'Chrome 65');
12+
await writeFile('.browserslistrc', 'Chrome 65');
1313
await updateJsonFile('tsconfig.json', config => {
1414
config.compilerOptions.target = 'es2015';
1515
config.angularCompilerOptions.disableTypeScriptVersionCheck = true;

tests/legacy-cli/e2e/tests/i18n/ve-localize-es2015.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default async function() {
2222
await npm('install', `${localizeVersion}`);
2323

2424
// Ensure a ES2015 build is used.
25-
await writeFile('browserslist', 'Chrome 65');
25+
await writeFile('.browserslistrc', 'Chrome 65');
2626
await updateJsonFile('tsconfig.json', config => {
2727
config.compilerOptions.target = 'es2015';
2828
config.angularCompilerOptions.disableTypeScriptVersionCheck = true;

tests/legacy-cli/e2e/tests/misc/browsers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default async function () {
1616
}
1717

1818
await replaceInFile(
19-
'browserslist',
19+
'.browserslistrc',
2020
'not IE 9-11',
2121
'Safari 9-10.1\nIE 9-11',
2222
);

tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ng } from '../../utils/process';
33

44
export default async function() {
55
// Ensure an ES2015 build is used in test
6-
await writeFile('browserslist', 'Chrome 65');
6+
await writeFile('.browserslistrc', 'Chrome 65');
77

88
await ng('generate', 'service', 'user');
99

tests/legacy-cli/e2e/tests/misc/forwardref-es2105.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { expectToFail } from '../../utils/utils';
44

55
export default async function() {
66
// Ensure an ES2015 build is used in test
7-
await writeFile('browserslist', 'Chrome 65');
7+
await writeFile('.browserslistrc', 'Chrome 65');
88

99
// Update the application to use a forward reference
1010
await replaceInFile(

tests/legacy-cli/e2e/tests/misc/support-ie.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default async function () {
1414
appArchitect.build.options.es5BrowserSupport = false;
1515
});
1616

17-
await writeFile('browserslist', 'last 2 Chrome versions');
17+
await writeFile('.browserslistrc', 'last 2 Chrome versions');
1818
await ng('build');
1919
await expectFileNotToExist('dist/test-project/polyfills-es5.js');
2020
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
@@ -40,7 +40,7 @@ export default async function () {
4040
const appArchitect = workspaceJson.projects['test-project'].architect;
4141
appArchitect.build.options.es5BrowserSupport = undefined;
4242
});
43-
await writeFile('browserslist', 'IE 10');
43+
await writeFile('.browserslistrc', 'IE 10');
4444
await ng('build');
4545
await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
4646
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`

0 commit comments

Comments
 (0)