Skip to content
This repository was archived by the owner on Mar 26, 2018. It is now read-only.

Commit 6458a4d

Browse files
author
Rob Dodson
committed
Make grunt play nice with external bower_components
1 parent afcda33 commit 6458a4d

5 files changed

Lines changed: 44 additions & 41 deletions

File tree

‎app/templates/Gruntfile.js‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,12 @@ module.exports = function (grunt) {
121121
},
122122
livereload: {
123123
options: {
124-
middleware: function () {
124+
middleware: function (connect) {
125125
return [
126126
lrSnippet,
127-
mountFolder('.tmp'),
128-
mountFolder(yeomanConfig.app)
127+
connect.static('.tmp'),
128+
connect.static(yeomanConfig.app),
129+
connect().use('/bower_components', connect.static('./bower_components'))
129130
];
130131
}
131132
}
@@ -135,20 +136,22 @@ module.exports = function (grunt) {
135136
open: {
136137
target: 'http://localhost:<%%= connect.options.port %>/test'
137138
},
138-
middleware: function () {
139+
middleware: function (connect) {
139140
return [
140-
mountFolder('.tmp'),
141-
mountFolder(yeomanConfig.app)
141+
connect.static('.tmp'),
142+
connect.static('test'),
143+
connect.static(yeomanConfig.app),
144+
connect().use('/bower_components', connect.static('./bower_components'))
142145
];
143146
},
144147
keepalive: true
145148
}
146149
},
147150
dist: {
148151
options: {
149-
middleware: function () {
152+
middleware: function (connect) {
150153
return [
151-
mountFolder(yeomanConfig.dist)
154+
connect.static(yeomanConfig.dist)
152155
];
153156
}
154157
}
@@ -184,20 +187,15 @@ module.exports = function (grunt) {
184187
html: ['<%%= yeoman.dist %>/{,*/}*.html'],
185188
css: ['<%%= yeoman.dist %>/styles/{,*/}*.css'],
186189
options: {
187-
dirs: ['<%%= yeoman.dist %>'],
188-
blockReplacements: {
189-
vulcanized: function (block) {
190-
return '<link rel="import" href="' + block.dest + '">';
191-
}
192-
}
190+
dirs: ['<%%= yeoman.dist %>']
193191
}
194192
},
195193
replace: {
196194
dist: {
197195
options: {
198196
patterns: [{
199-
match: /elements\/elements\.html/g,
200-
replacement: 'elements/elements.vulcanized.html'
197+
match: /\/elements\/elements\.html/g,
198+
replacement: '/elements/elements.vulcanized.html'
201199
}]
202200
},
203201
files: {
@@ -264,17 +262,22 @@ module.exports = function (grunt) {
264262
files: [{
265263
expand: true,
266264
dot: true,
265+
cwd: '<%%= yeoman.app %>',
267266
dest: '<%%= yeoman.dist %>',
268267
src: [
269-
'<%%= yeoman.app %>/*.{ico,txt}',
270-
'<%%= yeoman.app %>/.htaccess',
271-
'<%%= yeoman.app %>/*.html',
272-
'<%%= yeoman.app %>/elements/**',<% if (includeSass) { %>
273-
'<%%= yeoman.app %>/!elements/**/*.scss',<% } else { %>
274-
'<%%= yeoman.app %>/!elements/**/*.css',<% } %>
275-
'<%%= yeoman.app %>/images/{,*/}*.{webp,gif}',
276-
'bower_components/**'
268+
'*.{ico,txt}',
269+
'.htaccess',
270+
'*.html',
271+
'elements/**',<% if (includeSass) { %>
272+
'!elements/**/*.scss',<% } else { %>
273+
'!elements/**/*.css',<% } %>
274+
'images/{,*/}*.{webp,gif}'
277275
]
276+
}, {
277+
expand: true,
278+
dot: true,
279+
dest: '<%%= yeoman.dist %>',
280+
src: ['bower_components/**']
278281
}]
279282
},
280283
styles: {

‎app/templates/app/elements.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<link rel="import" href="../bower_components/core-drawer-panel/core-drawer-panel.html">
2-
<link rel="import" href="../bower_components/core-header-panel/core-header-panel.html">
3-
<link rel="import" href="../bower_components/core-toolbar/core-toolbar.html">
4-
<link rel="import" href="../bower_components/core-icons/core-icons.html">
5-
<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
6-
<link rel="import" href="../bower_components/core-menu/core-menu.html">
7-
<link rel="import" href="../bower_components/core-item/core-item.html">
1+
<link rel="import" href="../../bower_components/core-drawer-panel/core-drawer-panel.html">
2+
<link rel="import" href="../../bower_components/core-header-panel/core-header-panel.html">
3+
<link rel="import" href="../../bower_components/core-toolbar/core-toolbar.html">
4+
<link rel="import" href="../../bower_components/core-icons/core-icons.html">
5+
<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
6+
<link rel="import" href="../../bower_components/core-menu/core-menu.html">
7+
<link rel="import" href="../../bower_components/core-item/core-item.html">
88
<link rel="import" href="yo-list/yo-list.html">
99
<link rel="import" href="yo-greeting/yo-greeting.html">
1010

‎app/templates/app/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<title>poly foo</title>
99
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
1010

11-
<!-- build:css styles/main.css -->
12-
<link rel="stylesheet" href="styles/main.css">
11+
<!-- build:css /styles/main.css -->
12+
<link rel="stylesheet" href="/styles/main.css">
1313
<!-- endbuild-->
1414

15-
<!-- build:js bower_components/webcomponentsjs/webcomponents.min.js -->
16-
<script src="bower_components/webcomponentsjs/webcomponents.js"></script>
15+
<!-- build:js /bower_components/webcomponentsjs/webcomponents.min.js -->
16+
<script src="/bower_components/webcomponentsjs/webcomponents.js"></script>
1717
<!-- endbuild -->
1818

19-
<!-- will be replaced with elements/elements.vulcanized.html -->
20-
<link rel="import" href="elements/elements.html">
19+
<!-- will be replaced with /elements/elements.vulcanized.html -->
20+
<link rel="import" href="/elements/elements.html">
2121
<!-- endreplace-->
2222
</head>
2323

@@ -61,8 +61,8 @@
6161

6262
</template>
6363

64-
<!-- build:js scripts/app.js -->
65-
<script src="scripts/app.js"></script>
64+
<!-- build:js /scripts/app.js -->
65+
<script src="/scripts/app.js"></script>
6666
<!-- endbuild-->
6767
</body>
6868

‎app/templates/app/yo-greeting.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<link rel="import" href="../../bower_components/polymer/polymer.html">
1+
<link rel="import" href="../../../bower_components/polymer/polymer.html">
22

33
<polymer-element name="yo-greeting" attributes="">
44
<template>

‎app/templates/app/yo-list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<link rel="import" href="../../bower_components/polymer/polymer.html">
1+
<link rel="import" href="../../../bower_components/polymer/polymer.html">
22

33
<polymer-element name="yo-list" attributes="">
44
<template>

0 commit comments

Comments
 (0)