Skip to content

Commit 69368fb

Browse files
committed
use Inferno typings, updated webpack, added more common junk to .gitignore, use latest Inferno
1 parent ad9e1c6 commit 69368fb

File tree

5 files changed

+57
-23
lines changed

5 files changed

+57
-23
lines changed

.gitignore

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,25 @@
1+
dist
2+
3+
_site
4+
.history
5+
.git
6+
build
7+
.build
8+
.git
9+
.history
10+
.idea
11+
.jshintrc
12+
.nyc_output
13+
.sass-cache
14+
.vscode
15+
build
16+
coverage
17+
jsconfig.json
18+
Gemfile.lock
119
node_modules
2-
dist
20+
.DS_Store
21+
*.map
22+
*.log
23+
*.swp
24+
*~
25+
test/data/result.json

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
"author": "Dominic Gannaway",
1616
"license": "MIT",
1717
"dependencies": {
18-
"inferno": "^1.0.0",
19-
"inferno-component": "^1.0.0",
20-
"inferno-create-element": "^1.0.0"
18+
"inferno": "^1.1.1",
19+
"inferno-component": "^1.1.1",
20+
"inferno-create-element": "^1.1.1"
2121
},
2222
"devDependencies": {
23-
"clean-webpack-plugin": "^0.1.10",
24-
"html-webpack-plugin": "^2.22.0",
23+
"clean-webpack-plugin": "^0.1.15",
24+
"html-webpack-plugin": "^2.26.0",
2525
"source-map-loader": "^0.1.5",
26-
"ts-loader": "^0.8.2",
27-
"typescript": "^1.8.10",
28-
"webpack": "^1.13.1",
29-
"webpack-dev-server": "^1.16.2"
26+
"ts-loader": "^1.3.3",
27+
"typescript": "^2.1.4",
28+
"webpack": "2.2.0-rc.3",
29+
"webpack-dev-server": "2.2.0-rc.0"
3030
}
3131
}

src/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import * as Inferno from 'inferno';
2-
1+
import {render} from 'inferno';
32
import Component from 'inferno-component';
43
import elem from 'inferno-create-element';
54

@@ -11,4 +10,4 @@ class MyComponent extends Component<any, any> {
1110
}
1211
}
1312

14-
Inferno.render(elem(MyComponent, null, null), container);
13+
render(elem(MyComponent, null, null), container);

tsconfig.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
11
{
2+
"version": "2.1.4",
23
"compilerOptions": {
34
"outDir": "./dist/",
5+
"target": "es5",
6+
"module": "es6",
47
"sourceMap": true,
5-
"noImplicitAny": true,
6-
"module": "commonjs",
7-
"target": "es5"
8+
"lib": [
9+
"es6",
10+
"es7",
11+
"dom"
12+
],
13+
"noUnusedLocals": true,
14+
"strictNullChecks": false,
15+
"removeComments": false,
16+
"types": [
17+
"inferno"
18+
]
819
},
920
"include": [
1021
"src/**/*"
22+
],
23+
"exclude": [
24+
"node_modules",
25+
"dist"
1126
]
12-
}
27+
}

webpack.config.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ module.exports = {
2525
)
2626
],
2727
resolve: {
28-
extensions: ["", ".webpack.js", ".web.js", ".ts", ".js"]
28+
extensions: [ '.js', '.jsx', '.ts', '.tsx' ]
2929
},
3030

3131
module: {
3232
loaders: [
33+
// All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
34+
{ test: /\.js$/, loader: "source-map-loader" },
3335
// All files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'.
3436
{ test: /\.ts$/, loader: "ts-loader" }
35-
],
36-
37-
preLoaders: [
38-
// All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
39-
{ test: /\.js$/, loader: "source-map-loader" }
4037
]
4138
},
4239
devServer: {

0 commit comments

Comments
 (0)