Skip to content

Commit af88936

Browse files
clydinalexeagle
clydin
authored and
alexeagle
committed
fix(@angular-devkit/build-angular): remove unneeded script element type
1 parent f7fada8 commit af88936

File tree

13 files changed

+82
-83
lines changed

13 files changed

+82
-83
lines changed

‎packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts

-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ export class IndexHtmlWebpackPlugin {
154154
let scriptElements = '';
155155
for (const script of scripts) {
156156
const attrs: { name: string, value: string | null }[] = [
157-
{ name: 'type', value: 'text/javascript' },
158157
{ name: 'src', value: (this._options.deployUrl || '') + script },
159158
];
160159

‎packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
// All served files with the latest timestamps
2828
%MAPPINGS%
2929
</script>
30-
<script type="text/javascript" src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
31-
<script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
30+
<script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
31+
<script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
3232
<!-- Dynamically replaced with <script> tags -->
3333
%SCRIPTS%
34-
<script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
35-
<script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
36-
<script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
37-
<script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
34+
<script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
35+
<script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
36+
<script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
37+
<script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
3838
<script type="text/javascript">
3939
window.__karma__.loaded();
4040
</script>

‎packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
// All served files with the latest timestamps
2929
%MAPPINGS%
3030
</script>
31-
<script type="text/javascript" src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
32-
<script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
31+
<script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
32+
<script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
3333
<!-- Dynamically replaced with <script> tags -->
3434
%SCRIPTS%
35-
<script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
36-
<script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
37-
<script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
38-
<script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
35+
<script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
36+
<script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
37+
<script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
38+
<script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
3939
<script type="text/javascript">
4040
window.__karma__.loaded();
4141
</script>

‎packages/angular_devkit/build_angular/test/browser/index_spec_large.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('Browser Builder works with BOM index.html', () => {
3131
const fileName = join(outputPath, 'index.html');
3232
const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
3333
// tslint:disable-next-line:max-line-length
34-
expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
34+
expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
3535
}),
3636
).toPromise().then(done, done.fail);
3737
});
@@ -49,7 +49,7 @@ describe('Browser Builder works with BOM index.html', () => {
4949
const fileName = join(outputPath, 'index.html');
5050
const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
5151
// tslint:disable-next-line:max-line-length
52-
expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
52+
expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
5353
}),
5454
).toPromise().then(done, done.fail);
5555
});
@@ -68,7 +68,7 @@ describe('Browser Builder works with BOM index.html', () => {
6868
const fileName = join(outputPath, 'index.html');
6969
const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
7070
// tslint:disable-next-line:max-line-length
71-
expect(content).toBe(`<html><head><title>&iacute;</title><base href="/"></head> <body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
71+
expect(content).toBe(`<html><head><title>&iacute;</title><base href="/"></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
7272
}),
7373
).toPromise().then(done, done.fail);
7474
});
@@ -87,7 +87,7 @@ describe('Browser Builder works with BOM index.html', () => {
8787
const fileName = join(outputPath, 'index.html');
8888
const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
8989
// tslint:disable-next-line:max-line-length
90-
expect(content).toBe(`<html><head><base href="/"><%= csrf_meta_tags %></head> <body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
90+
expect(content).toBe(`<html><head><base href="/"><%= csrf_meta_tags %></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
9191
}),
9292
).toPromise().then(done, done.fail);
9393
});

‎packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ describe('Browser Builder scripts array', () => {
5050
'./dist/renamed-script.js': 'pre-rename-script',
5151
'./dist/renamed-lazy-script.js': 'pre-rename-lazy-script',
5252
'./dist/main.js': 'input-script',
53-
'./dist/index.html': '<script type="text/javascript" src="runtime.js"></script>'
54-
+ '<script type="text/javascript" src="polyfills.js"></script>'
55-
+ '<script type="text/javascript" src="scripts.js"></script>'
56-
+ '<script type="text/javascript" src="renamed-script.js"></script>'
57-
+ '<script type="text/javascript" src="vendor.js"></script>'
58-
+ '<script type="text/javascript" src="main.js"></script>',
53+
'./dist/index.html': '<script src="runtime.js"></script>'
54+
+ '<script src="polyfills.js"></script>'
55+
+ '<script src="scripts.js"></script>'
56+
+ '<script src="renamed-script.js"></script>'
57+
+ '<script src="vendor.js"></script>'
58+
+ '<script src="main.js"></script>',
5959
};
6060

6161
host.writeMultipleFiles(scripts);

‎packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ describe('Browser Builder service worker', () => {
105105
hashTable: {
106106
'/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
107107
'/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
108-
'/index.html': '843c96f0aeadc8f093b1b2203c08891ecd8f7425',
108+
'/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
109109
'/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
110110
},
111111
});
@@ -161,7 +161,7 @@ describe('Browser Builder service worker', () => {
161161
hashTable: {
162162
'/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
163163
'/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
164-
'/foo/bar/index.html': '9ef50361678004b3b197c12cbc74962e5a15b844',
164+
'/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
165165
},
166166
});
167167
}),

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ describe('Browser Builder styles', () => {
5656
'./dist/renamed-lazy-style.js': '.pre-rename-lazy-style',
5757
};
5858
const jsIndexMatches: { [path: string]: string } = {
59-
'./dist/index.html': '<script type="text/javascript" src="runtime.js"></script>'
60-
+ '<script type="text/javascript" src="polyfills.js"></script>'
61-
+ '<script type="text/javascript" src="styles.js"></script>'
62-
+ '<script type="text/javascript" src="renamed-style.js"></script>'
63-
+ '<script type="text/javascript" src="vendor.js"></script>'
64-
+ '<script type="text/javascript" src="main.js"></script>',
59+
'./dist/index.html': '<script src="runtime.js"></script>'
60+
+ '<script src="polyfills.js"></script>'
61+
+ '<script src="styles.js"></script>'
62+
+ '<script src="renamed-style.js"></script>'
63+
+ '<script src="vendor.js"></script>'
64+
+ '<script src="main.js"></script>',
6565
};
6666

6767
host.writeMultipleFiles(styles);

‎tests/legacy-cli/e2e/tests/basic/scripts-array.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ export default function () {
5353
.then(() => expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'))
5454
// index.html lists the right bundles
5555
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
56-
<script type="text/javascript" src="runtime.js"></script>
57-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
58-
<script type="text/javascript" src="polyfills.js"></script>
59-
<script type="text/javascript" src="scripts.js"></script>
60-
<script type="text/javascript" src="renamed-script.js"></script>
61-
<script type="text/javascript" src="vendor.js"></script>
62-
<script type="text/javascript" src="main.js"></script>
56+
<script src="runtime.js"></script>
57+
<script src="es2015-polyfills.js" nomodule></script>
58+
<script src="polyfills.js"></script>
59+
<script src="scripts.js"></script>
60+
<script src="renamed-script.js"></script>
61+
<script src="vendor.js"></script>
62+
<script src="main.js"></script>
6363
`))
6464
// Ensure scripts can be separately imported from the app.
6565
.then(() => expectFileToMatch('dist/test-project/main.js', 'console.log(\'string-script\');'));

‎tests/legacy-cli/e2e/tests/basic/styles-array.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ export default function () {
4242
<link rel="stylesheet" href="renamed-style.css">
4343
`))
4444
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
45-
<script type="text/javascript" src="runtime.js"></script>
46-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
47-
<script type="text/javascript" src="polyfills.js"></script>
48-
<script type="text/javascript" src="vendor.js"></script>
49-
<script type="text/javascript" src="main.js"></script>
45+
<script src="runtime.js"></script>
46+
<script src="es2015-polyfills.js" nomodule></script>
47+
<script src="polyfills.js"></script>
48+
<script src="vendor.js"></script>
49+
<script src="main.js"></script>
5050
`));
5151
}

‎tests/legacy-cli/e2e/tests/build/polyfills.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ export default async function () {
1414
await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect');
1515
await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
1616
expectFileToMatch('dist/test-project/index.html', oneLineTrim`
17-
<script type="text/javascript" src="runtime.js"></script>
18-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
19-
<script type="text/javascript" src="polyfills.js"></script>
17+
<script src="runtime.js"></script>
18+
<script src="es2015-polyfills.js" nomodule></script>
19+
<script src="polyfills.js"></script>
2020
`);
2121
const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
2222

@@ -27,8 +27,8 @@ export default async function () {
2727
await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect'));
2828
await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
2929
expectFileToMatch('dist/test-project/index.html', oneLineTrim`
30-
<script type="text/javascript" src="runtime.js"></script>
31-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
32-
<script type="text/javascript" src="polyfills.js"></script>
30+
<script src="runtime.js"></script>
31+
<script src="es2015-polyfills.js" nomodule></script>
32+
<script src="polyfills.js"></script>
3333
`);
3434
}

‎tests/legacy-cli/e2e/tests/build/styles/extract-css.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ export default function () {
4747
<link rel="stylesheet" href="renamed-style\.css"/?>
4848
`)))
4949
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
50-
<script type="text/javascript" src="runtime.js"></script>
51-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
52-
<script type="text/javascript" src="polyfills.js"></script>
53-
<script type="text/javascript" src="vendor.js"></script>
54-
<script type="text/javascript" src="main.js"></script>
50+
<script src="runtime.js"></script>
51+
<script src="es2015-polyfills.js" nomodule></script>
52+
<script src="polyfills.js"></script>
53+
<script src="vendor.js"></script>
54+
<script src="main.js"></script>
5555
`))
5656
// also check when css isn't extracted
5757
.then(() => ng('build', '--no-extract-css'))
@@ -63,12 +63,12 @@ export default function () {
6363
.then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.js', '.pre-rename-lazy-style'))
6464
// index.html lists the right bundles
6565
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
66-
<script type="text/javascript" src="runtime.js"></script>
67-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
68-
<script type="text/javascript" src="polyfills.js"></script>
69-
<script type="text/javascript" src="styles.js"></script>
70-
<script type="text/javascript" src="renamed-style.js"></script>
71-
<script type="text/javascript" src="vendor.js"></script>
72-
<script type="text/javascript" src="main.js"></script>
66+
<script src="runtime.js"></script>
67+
<script src="es2015-polyfills.js" nomodule></script>
68+
<script src="polyfills.js"></script>
69+
<script src="styles.js"></script>
70+
<script src="renamed-style.js"></script>
71+
<script src="vendor.js"></script>
72+
<script src="main.js"></script>
7373
`));
7474
}

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ export default async function () {
1212
await ng('build');
1313
await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
1414
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
15-
<script type="text/javascript" src="runtime.js"></script>
16-
<script type="text/javascript" src="polyfills.js"></script>
17-
<script type="text/javascript" src="styles.js"></script>
18-
<script type="text/javascript" src="vendor.js"></script>
19-
<script type="text/javascript" src="main.js"></script>
15+
<script src="runtime.js"></script>
16+
<script src="polyfills.js"></script>
17+
<script src="styles.js"></script>
18+
<script src="vendor.js"></script>
19+
<script src="main.js"></script>
2020
`);
2121

2222
await ng('build', `--es5BrowserSupport`);
2323
await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
2424
await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
25-
<script type="text/javascript" src="runtime.js"></script>
26-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
27-
<script type="text/javascript" src="polyfills.js"></script>
28-
<script type="text/javascript" src="styles.js"></script>
29-
<script type="text/javascript" src="vendor.js"></script>
30-
<script type="text/javascript" src="main.js"></script>
25+
<script src="runtime.js"></script>
26+
<script src="es2015-polyfills.js" nomodule></script>
27+
<script src="polyfills.js"></script>
28+
<script src="styles.js"></script>
29+
<script src="vendor.js"></script>
30+
<script src="main.js"></script>
3131
`);
3232
}

‎tests/legacy-cli/e2e/tests/third-party/bootstrap.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ export default function() {
2222
.then(() => expectFileToMatch('dist/test-project/scripts.js', '* Bootstrap'))
2323
.then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
2424
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
25-
<script type="text/javascript" src="runtime.js"></script>
26-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
27-
<script type="text/javascript" src="polyfills.js"></script>
28-
<script type="text/javascript" src="scripts.js"></script>
29-
<script type="text/javascript" src="vendor.js"></script>
30-
<script type="text/javascript" src="main.js"></script>
25+
<script src="runtime.js"></script>
26+
<script src="es2015-polyfills.js" nomodule></script>
27+
<script src="polyfills.js"></script>
28+
<script src="scripts.js"></script>
29+
<script src="vendor.js"></script>
30+
<script src="main.js"></script>
3131
`))
3232
.then(() => ng(
3333
'build',
@@ -39,10 +39,10 @@ export default function() {
3939
.then(() => expectFileToMatch('dist/test-project/scripts.js', 'jQuery'))
4040
.then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
4141
.then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
42-
<script type="text/javascript" src="runtime.js"></script>
43-
<script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
44-
<script type="text/javascript" src="polyfills.js"></script>
45-
<script type="text/javascript" src="scripts.js"></script>
46-
<script type="text/javascript" src="main.js"></script>
42+
<script src="runtime.js"></script>
43+
<script src="es2015-polyfills.js" nomodule></script>
44+
<script src="polyfills.js"></script>
45+
<script src="scripts.js"></script>
46+
<script src="main.js"></script>
4747
`));
4848
}

0 commit comments

Comments
 (0)