Skip to content

Commit

Permalink
fix(build): reduce typings pain
Browse files Browse the repository at this point in the history
ts files now served in separate folder
(fixes #128, fixes #322)
  • Loading branch information
valorkin committed Mar 30, 2016
1 parent 18456f4 commit 686ef90
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ npm-debug.log
/demo-build
/dist
/coverage
/ts

# ignore incline compiling
/demo/**/*.js
Expand Down
10 changes: 9 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ gulp-tasks
logs

# typings
tsd.d.ts
typings

# testing
Expand All @@ -15,3 +14,12 @@ coverage
demo
demo-build
webpack.config.js

#typescript sources
*.ts
*.js.map
!*.d.ts
/components/**/*.ts
/components/**/*.js.map
!/components/**/*.d.ts

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"scripts": {
"install:typings": "./node_modules/.bin/typings install",
"compile": "./node_modules/.bin/tsc",
"prepublish": "npm run install:typings && ./node_modules/.bin/tsc && ./make.js",
"copy:src": "./node_modules/.bin/cpy ng2-bootstrap.ts \"components/*.ts\" ts --parents",
"clean:dist": "./node_modules/.bin/del bundles coverage demo-build typings",
"publish:gh-pages": "./gh-pages-publish.js",
"prepublish": "npm run install:typings && npm run compile && ./make.js",
"postpublish": "npm run build:prod && npm run publish:gh-pages",
"build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --progress --color",
"build:dev": "./node_modules/.bin/webpack --progress --color",
Expand Down Expand Up @@ -56,7 +58,9 @@
"conventional-changelog-cli": "1.1.1",
"conventional-github-releaser": "1.1.1",
"copy-webpack-plugin": "1.1.1",
"cpy-cli": "1.0.0",
"del": "2.2.0",
"del-cli": "0.2.0",
"es6-promise": "3.1.2",
"es6-shim": "0.35.0",
"es7-reflect-metadata": "1.6.0",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"target": "es5",
"module": "commonjs",
"moduleResolution": "node",
"sourceMap": true,
"sourceMap": false,
"declaration": true,
"removeComments": false,
"emitDecoratorMetadata": true,
Expand Down
10 changes: 5 additions & 5 deletions typings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"dependencies": {
"moment": "github:typed-typings/npm-moment#a4075cd50e63efbedd850f654594f293ab81a385",
"webpack": "github:tkqubo/typed-webpack#10d2cc44a01602b87f8e999eec90192e7e6b3edc"
"moment": "registry:npm/moment#2.10.5+20160211003958",
"webpack": "registry:npm/webpack#1.12.9+20160219013405"
},
"devDependencies": {},
"ambientDependencies": {
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4",
"require": "github:DefinitelyTyped/DefinitelyTyped/requirejs/require.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c"
"es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
"jasmine": "registry:dt/jasmine#2.2.0+20160317120654",
"require": "registry:dt/require#2.1.20+20160316155526"
}
}
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const config = {
noEmitHelpers: false
}
},
exclude: [/\.(spec|e2e)\.ts$/, /node_modules\/(?!(ng2-.+))/]
exclude: [/\.(spec|e2e)\.ts$/]
}
],
noParse: [
Expand Down

0 comments on commit 686ef90

Please sign in to comment.