Skip to content

Commit 044c763

Browse files
committed
Updated dependencies and examples.
1 parent da45295 commit 044c763

13 files changed

+41
-28
lines changed

.babelrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"presets": ["es2015", "stage-0", "react"],
2+
"presets": ["es2015", "stage-0"],
3+
"plugins": ["transform-flow-strip-types"],
34
"env": {
45
"test": {
56
"presets": ["es2015", "stage-0", "react"]

examples/assets-and-html/.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015", "stage-0"]
3+
}

examples/assets-and-html/.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
node_modules/
2-
./npm-debug.log
3-
./public
2+
npm-debug.log
3+
public/

examples/assets-and-html/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
"author": "Urban Faubion",
1111
"license": "MIT",
1212
"dependencies": {
13-
"@urban/webpack-config": "*",
14-
"@urban/webpack-html-plugin": "^1.0.0",
13+
"@urban/webpack-html-plugin": "*",
14+
"babel-core": "*",
1515
"babel-loader": "*",
16+
"babel-preset-es2015": "*",
17+
"babel-preset-stage-0": "*",
1618
"css-loader": "*",
1719
"cssnext": "*",
1820
"extract-text-webpack-plugin": "*",
@@ -23,7 +25,7 @@
2325
"webpack": "*"
2426
},
2527
"devDependencies": {
26-
"rimraf": "^2.4.3",
27-
"webpack-dev-server": "^1.12.0"
28+
"rimraf": "*",
29+
"webpack-dev-server": "*"
2830
}
2931
}

examples/assets-and-html/public/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/assets-and-html/public/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/assets-and-html/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function renderUI (props) {
77
return `
88
<div class='${styles.component}'>
99
<header role='banner'>
10-
<h1>Assets Only Example</h1>
10+
<h1>Assets and HTML</h1>
1111
</header>
1212
<p>This is a <em>simple</em> example that uses <a href='https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/template_strings'>Template Strings</a>.</p>
1313
<div className='${styles.counter}'>

examples/assets-and-html/webpack.config.babel.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import getConfig from '@urban/webpack-config'
1+
2+
import getConfig from '../../src'
23
import HtmlPlugin from '@urban/webpack-html-plugin'
34

45
export default getConfig({

examples/assets-only/.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["es2015", "stage-0"]
3+
}

examples/assets-only/.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node_modules/
2-
./npm-debug.log
3-
./public/
4-
!./public/index.html
2+
npm-debug.log
3+
public/
4+
!public/index.html

examples/assets-only/package.json

+15-13
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@
1212
"author": "Urban Faubion",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@urban/webpack-config": "*",
16-
"babel-loader": "^5.3.2",
17-
"css-loader": "^0.15.6",
18-
"cssnext": "^1.8.4",
19-
"extract-text-webpack-plugin": "^0.8.2",
20-
"file-loader": "^0.8.4",
21-
"json-loader": "^0.5.3",
22-
"postcss-loader": "^0.6.0",
23-
"style-loader": "^0.12.4",
24-
"url-loader": "^0.5.6",
25-
"webpack": "^1.12.2"
15+
"babel-core": "*",
16+
"babel-loader": "*",
17+
"babel-preset-es2015": "*",
18+
"babel-preset-stage-0": "*",
19+
"css-loader": "*",
20+
"cssnext": "*",
21+
"extract-text-webpack-plugin": "*",
22+
"file-loader": "*",
23+
"json-loader": "*",
24+
"postcss-loader": "*",
25+
"style-loader": "*",
26+
"url-loader": "*",
27+
"webpack": "*"
2628
},
2729
"devDependencies": {
28-
"rimraf": "^2.4.3",
29-
"webpack-dev-server": "^1.12.0"
30+
"rimraf": "*",
31+
"webpack-dev-server": "*"
3032
}
3133
}

examples/assets-only/webpack.config.babel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import getConfig from '@urban/webpack-config'
1+
import getConfig from '../../src'
22

33
export default getConfig({
44
context: __dirname,

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"postversion": "git push && git push --tags"
3636
},
3737
"dependencies": {
38+
"babel-plugin-transform-flow-strip-types": "6.3.15",
3839
"invariant": "^2.2.0",
3940
"lodash.merge": "^3.3.2"
4041
},

0 commit comments

Comments
 (0)