Skip to content

Commit

Permalink
chore(package): switch to publishing webpack bundle and compiled JS
Browse files Browse the repository at this point in the history
BREAKING CHANGE:

* `filter-data` attribute no longer supports returning a `$defer`'ed

Previously you could supply to the `filter-data` attribute a `$defer`'ed object.

Now, any asynchronous result must be supplied as a promise

* UMD bundle no longer returns an angular `ngModule` but instead returns a namespace object

RequireJS will be mostly affected by this change. See the demo-apps/es5-requirejs demo app
for a working example of how to use ng-table with this module loader
  • Loading branch information
christianacca authored and ccrowhurstram committed Sep 26, 2016
1 parent 8c83561 commit 380c2d2
Show file tree
Hide file tree
Showing 138 changed files with 10,645 additions and 5,397 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

31 changes: 26 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
.temp
.idea
node_modules
bower_components
out
typings
npm-debug.log
test/*.js
npm-debug.*
index.js
index.d.ts
index.js.map
src/**/*.js
src/**/*.js.map
src/**/*.d.ts
e2e/**/*.js
e2e/**/*.js.map
e2e/**/*.d.ts
!e2e/**/global.d.ts
!e2e/protractor*.js
demo-apps/ts-webpack/src/**/*.js
demo-apps/ts-webpack/src/**/*.js.map
demo-apps/ts-webpack/src/**/*.d.ts
!demo-apps/es5/index.js
!demo-apps/es6-systemjs/index.js
test/**/*.d.ts
test/**/*.js.map
test/**/*.js
!test/index.js
!test/index.d.ts
# redundant webpack build artifacts produced by ExtractTextPlugin
dist/styles.*
bundles
build
build-stats.json
docs
21 changes: 0 additions & 21 deletions .jshintrc

This file was deleted.

34 changes: 17 additions & 17 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
.vscode
.idea
.temp
bower_components
demo-site
docs
examples-old
out
src
test
typings
.bowerrc
.vscode/
.idea/
.temp/
bundles/styles.*
demo-apps/
demo-site/
docs/
e2e/
examples-old/
out/
scripts/
*.ts
!*.d.ts
test/
.editorconfig
.jshintrc
.travis.yml
*.yml
*.json
*.js
!/dist/*.js
DeleteNodeModules.bat
*.conf.js
*.config.js
33 changes: 20 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
language: node_js
node_js:
- node
- node

addons:
sauce_connect: true

env:
global:
- secure: gnwapHmalQ00mis28sRZQwmrkOWU7CyIyU3iKc1bixgGKZu6dhMUwQt2WA8HDkOLgSxSCSMigtzwuPvkxH6CRLbMnYwCDkCHZS9SvjrOLX+jZkORbSKRJUjlkRS3cjkY9AzKOYAOngAN07j0iqvsKx6UtdtEvA4QVM/ToQzVfi0=
- secure: J9OuScEujGDV/JKBvOz7pgh/hzA6QEqJKo8wtQprsSuUnP1zdUvlRV+oKuGXAGnfsFlr/aw+7+djz4QbqITQeQDJaQ4Ui4/M8dfDp4kLKGH6U8obrnX79IERjgKZubs17dW+NcbIt6pNzJavOdLlvAZiQtQMcdXbHI+Xa0PoTHs=

before_install:
- npm install -g karma-cli
- npm install -g grunt-cli
- npm install -g bower
- npm install -g karma-cli

install:
- npm prune && npm install
- npm run setup
- npm run build
- npm prune && npm install
- npm run setup:demo-apps

before_script:
- npm run build:all
- '[ "${TRAVIS_PULL_REQUEST}" = "true" ] || npm run e2e-server:ci'

script:
- npm test
- npm test
- '[ "${TRAVIS_PULL_REQUEST}" = "true" ] || npm run e2e:ci'

after_success:
cat out/coverage/*/lcov.info | ./node_modules/coveralls/bin/coveralls.js
after_success: cat out/coverage/*/lcov.info | ./node_modules/coveralls/bin/coveralls.js

cache:
directories:
- node_modules
- bower_components

- node_modules
46 changes: 46 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/demo-apps/es6-webpack/_debug-webpack.js",
"stopOnEntry": true,
"args": [],
"cwd": "${workspaceRoot}",
"preLaunchTask": null,
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy"
],
"env": {
"NODE_ENV": "development"
},
"externalConsole": false,
"sourceMaps": false,
"outDir": null
},
{
"name": "Attach",
"type": "node",
"request": "attach",
"port": 5858,
"address": "localhost",
"restart": false,
"sourceMaps": false,
"outDir": null,
"localRoot": "${workspaceRoot}",
"remoteRoot": null
},
{
"name": "Attach to Process",
"type": "node",
"request": "attach",
"processId": "${command.PickProcess}",
"port": 5858,
"sourceMaps": false,
"outDir": null
}
]
}
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@

// Controls if the editor will insert spaces for tabs. Accepted values: "auto", true, false. If set to "auto", the value will be guessed when a file is opened.
"editor.insertSpaces": true,

"editor.snippetSuggestions": "bottom",

"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/*.js": {"when": "$(basename).ts"}
"**/*.js": {"when": "$(basename).ts"},
"src/browser/*.d.ts": true,
"src/browser/*.js.map": true,
"src/core/*.d.ts": true,
"src/core/*.js.map": true
}
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CONTRIBUTING

1. Fork the repo.

2. `npm install && npm run setup`
2. `npm install`

3. Run the build: `npm run build:full`
- builds dist/ng-table.js and associated files
Expand Down
5 changes: 0 additions & 5 deletions DeleteNodeModules.bat

This file was deleted.

11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ It's recommended to upgrade in three jumps:

## Installing

**Bower**
```
bower install ng-table --save
```

**NPM**
```
npm install ng-table --save
Expand All @@ -59,13 +54,10 @@ and [@types/ng-table](https://www.npmjs.com/package/@types/ng-table) are depreci
We use Karma to ensure the quality of the code. The easiest way to run these checks is to use `npm test`:

```sh
npm install && npm run setup
npm run build
npm install
npm test
```

The karma task will try to open Firefox and Chrome as browser in which to run the tests. Make sure this is available or change the configuration in `karma.conf.js`


## Configuring ng-table
For a list of configuration options available, see [examples website](http://ng-table.com/)
Expand All @@ -92,6 +84,7 @@ Please be responsible, the open source community is not there to guess your prob
Note that 80% of the open issues are actually not issues but "problem" due to developpers laziness or lack of investigation. These "issues" are a waste of time for us and especially if we have to setup a sample to reproduce the issue which those developpers could have done. Any open issue which does not fulfill this contract will be closed without investigation.



## Examples

* [Demo site](http://ng-table.com/)
Expand Down
5 changes: 1 addition & 4 deletions RELEASING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
RELEASING
============

1. Update [semver](http://semver.org/) version number in:
- package.json
- bower.json
1. Update [semver](http://semver.org/) version number in `package.json`

2. Minify source files: `npm run build:full`

Expand All @@ -16,7 +14,6 @@ RELEASING

5. Check in the following updated files to git:
- dist/*.*
- bower.json
- package.json
- CHANGELOG.md

Expand Down
21 changes: 0 additions & 21 deletions bower.json

This file was deleted.

4 changes: 0 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ machine:

dependencies:
pre:
- npm install -g grunt-cli
- npm install -g bower
- npm install -g karma-cli
- npm prune && npm install
- npm run setup
- npm run build
cache_directories:
- node_modules
- bower_components

test:
override:
Expand Down
25 changes: 25 additions & 0 deletions demo-apps/es5/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">

<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="node_modules/ng-table/bundles/ng-table.css">
<script src="node_modules/angular/angular.min.js"></script>
<script src="node_modules/ng-table/bundles/ng-table.js"></script>
<script src="index.js"></script>
<script src="src/my-table.component.js"></script>
</head>

<body ng-app="demo-app">

<h1>ng-table sample app (ES5)</h1>

<my-table></my-table>

</body>

</html>
5 changes: 5 additions & 0 deletions demo-apps/es5/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(function(){
'use strict';

angular.module('demo-app', ['ngTable']);
})();
31 changes: 31 additions & 0 deletions demo-apps/es5/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 380c2d2

Please sign in to comment.