Skip to content

Commit 02ed722

Browse files
authored
Merge pull request #170 from bdauer/omit_type_attributes
Removed type from link and script tags per #152
2 parents 729fbd8 + 51fdb28 commit 02ed722

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ WEBPACK_LOADER = {
133133
If the bundle generates a file called `main-cf4b5fab6e00a404e0c7.js` and your STATIC_URL is `/static/`, then the `<script>` tag will look like this
134134

135135
```html
136-
<script type="text/javascript" src="/static/output/bundles/main-cf4b5fab6e00a404e0c7.js"/>
136+
<script src="/static/output/bundles/main-cf4b5fab6e00a404e0c7.js"/>
137137
```
138138
139139
**NOTE:** If your webpack config outputs the bundles at the root of your `staticfiles` dir, then `BUNDLE_DIR_NAME` should be an empty string `''`, not `'/'`.
@@ -350,8 +350,8 @@ the function in the `webpack_loader.utils` module.
350350
[{'url': '/static/bundles/main.js', u'path': u'/home/mike/root/projects/django-webpack-loader/tests/assets/bundles/main.js', u'name': u'main.js'},
351351
{'url': '/static/bundles/styles.css', u'path': u'/home/mike/root/projects/django-webpack-loader/tests/assets/bundles/styles.css', u'name': u'styles.css'}]
352352
>>> utils.get_as_tags('main')
353-
['<script type="text/javascript" src="/static/bundles/main.js" ></script>',
354-
'<link type="text/css" href="/static/bundles/styles.css" rel="stylesheet" />']
353+
['<script src="/static/bundles/main.js" ></script>',
354+
'<link href="/static/bundles/styles.css" rel="stylesheet" />']
355355
```
356356
357357
## How to use in Production

tests/app/tests/test_webpack.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ def test_templatetags(self):
124124
view = TemplateView.as_view(template_name='home.html')
125125
request = self.factory.get('/')
126126
result = view(request)
127-
self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
128-
self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
127+
self.assertIn('<link href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
128+
self.assertIn('<script src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
129129

130-
self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/app2.css" rel="stylesheet" />', result.rendered_content)
131-
self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/app2.js" ></script>', result.rendered_content)
130+
self.assertIn('<link href="/static/django_webpack_loader_bundles/app2.css" rel="stylesheet" />', result.rendered_content)
131+
self.assertIn('<script src="/static/django_webpack_loader_bundles/app2.js" ></script>', result.rendered_content)
132132
self.assertIn('<img src="/static/my-image.png"/>', result.rendered_content)
133133

134134
view = TemplateView.as_view(template_name='only_files.html')
@@ -173,8 +173,8 @@ def test_jinja2(self):
173173
with self.settings(**settings):
174174
request = self.factory.get('/')
175175
result = view(request)
176-
self.assertIn('<link type="text/css" href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
177-
self.assertIn('<script type="text/javascript" src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
176+
self.assertIn('<link href="/static/django_webpack_loader_bundles/main.css" rel="stylesheet" />', result.rendered_content)
177+
self.assertIn('<script src="/static/django_webpack_loader_bundles/main.js" async charset="UTF-8"></script>', result.rendered_content)
178178

179179
def test_reporting_errors(self):
180180
self.compile_bundles('webpack.config.error.js')

webpack_loader/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ def get_as_tags(bundle_name, extension=None, config='DEFAULT', attrs=''):
6464
for chunk in bundle:
6565
if chunk['name'].endswith(('.js', '.js.gz')):
6666
tags.append((
67-
'<script type="text/javascript" src="{0}" {1}></script>'
67+
'<script src="{0}" {1}></script>'
6868
).format(chunk['url'], attrs))
6969
elif chunk['name'].endswith(('.css', '.css.gz')):
7070
tags.append((
71-
'<link type="text/css" href="{0}" rel="stylesheet" {1}/>'
71+
'<link href="{0}" rel="stylesheet" {1}/>'
7272
).format(chunk['url'], attrs))
7373
return tags
7474

0 commit comments

Comments
 (0)