Skip to content

Webpack only #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 67 commits into from
Dec 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
6f65cb6
Try remove tests to karma and webpack
dyuvzhenko Nov 11, 2017
4c7c8f6
Fixed path
dyuvzhenko Nov 11, 2017
e47318c
Fixed path for karma
dyuvzhenko Nov 11, 2017
5c29ec5
Fixed paths
dyuvzhenko Nov 11, 2017
9898137
Added key --single-run
dyuvzhenko Nov 11, 2017
ef1a67f
Changed browser for linux in karma.conf
dyuvzhenko Nov 11, 2017
5f0a6ae
Added build before start testing
dyuvzhenko Nov 11, 2017
5677c25
Change config
dyuvzhenko Nov 11, 2017
f622243
Continue of npm-test
dyuvzhenko Nov 12, 2017
c1a4cca
Returned preprocessors
dyuvzhenko Nov 12, 2017
c9ea904
npm test refactoring, dependencies upgrading
dhilt Nov 12, 2017
41df64c
Split build on prod and dev
dyuvzhenko Nov 13, 2017
a149be1
Added removing of /temp
dyuvzhenko Nov 13, 2017
74acb55
Rewrite removing temp folder with clean-webpack-plugin
dyuvzhenko Nov 13, 2017
1874961
prod build dist fix
dhilt Nov 13, 2017
d7f60c0
Merge branch 'master' of https://github.com/BitDen/ui-scroll
dhilt Nov 13, 2017
73f85f2
config improvement
dhilt Nov 13, 2017
2c2e9e6
Removed BannerPlugin to end of plugins
dyuvzhenko Nov 13, 2017
6904779
Added jshint-loader
dyuvzhenko Nov 13, 2017
baa18e5
Added copying files
dyuvzhenko Nov 13, 2017
fb7f7f0
prod build & test
dhilt Nov 13, 2017
a1ae6f7
Jshint for prod and dev build
dyuvzhenko Nov 14, 2017
e708e0f
Fixed regexp, probably
dyuvzhenko Nov 14, 2017
fab01d4
Fixed regexp (2)
dyuvzhenko Nov 14, 2017
5d00631
jshint-loader + babel-loader work together
dhilt Nov 14, 2017
9b14a31
force npm fail on jshint errors
dhilt Nov 14, 2017
2fd0009
respect .jshintrc
dhilt Nov 14, 2017
5408462
no need to resolve
dhilt Nov 14, 2017
92544d6
immediate restart if watch has been triggered
dhilt Nov 14, 2017
f5ceb4b
How karma can rebuild
dyuvzhenko Nov 14, 2017
b535ac1
Trying do rebuild after changes in ./src
dyuvzhenko Nov 14, 2017
2f59605
development mode works without ./temp
dhilt Nov 14, 2017
fc4af26
Merge branch 'master' of https://github.com/BitDen/ui-scroll
dhilt Nov 14, 2017
85f435e
Added tests on ./test/*Spec.js
dyuvzhenko Nov 14, 2017
3ae8a77
dev plugins purge
dhilt Nov 14, 2017
5ad84a1
New .jshintrc
dyuvzhenko Nov 14, 2017
2381e77
Removed comments
dyuvzhenko Nov 14, 2017
bdb65e9
Added test files to entry-point
dyuvzhenko Nov 15, 2017
1a60faf
Start make devServer
dyuvzhenko Nov 15, 2017
2c0b79a
WebpackDevServer and including .js-files
dyuvzhenko Nov 15, 2017
96b4e1d
Rewrite path with historyapifallback to ./demo
dyuvzhenko Nov 15, 2017
9ada21c
Added keys for jshint
dyuvzhenko Nov 15, 2017
1bd7bf6
Added new npm-script 'hint-tests'
dyuvzhenko Nov 15, 2017
eb6e76d
jshint tests refactoring and improvements
dhilt Nov 16, 2017
3ce4e2c
Added publicPath
dyuvzhenko Nov 16, 2017
7310d16
fix dev-server in-memory dist serving
dhilt Nov 17, 2017
b6a74b7
cleanup
dhilt Nov 17, 2017
195d109
Change npm start
dyuvzhenko Nov 17, 2017
aa429bf
Added tests to build-script
dyuvzhenko Nov 17, 2017
1909652
build processes are less verbose
dhilt Nov 17, 2017
ecb8e2e
New env and little fix in npmScript
dyuvzhenko Nov 17, 2017
1da0dca
Removed webpack-config
dyuvzhenko Nov 17, 2017
d40d9be
Simplified npmScripts
dyuvzhenko Nov 18, 2017
04bbcf6
jshnit process refactoring
dhilt Nov 18, 2017
7d0d181
webpack dev serverer proxy update
dhilt Nov 18, 2017
98348b8
npm scripts definition fix
dhilt Nov 18, 2017
9734117
travis upd
dhilt Nov 18, 2017
73fedd1
Merge changes from original repo
dyuvzhenko Nov 19, 2017
6c023f3
merge fixes
dhilt Nov 19, 2017
955ec16
jqLiteExtras .height() tests update due to changes in jQuery 3
dhilt Nov 19, 2017
b748c24
Merge pull request #193 from BitDen/master
dhilt Nov 20, 2017
c295d65
switch es5 compilation to babel-preset-env
dhilt Nov 20, 2017
e931d74
remove Chrome from Travis testing process
dhilt Nov 20, 2017
59ce91e
bundling test sources in development + test case only
dhilt Nov 20, 2017
f12ede7
do not instantiate JQLiteExtras before jQuery has been checked
dhilt Nov 21, 2017
91d4904
update the Readme
dhilt Nov 21, 2017
7b409b4
strict mode fix for Node 5 compatibility
dhilt Dec 5, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"presets": [
["env", {
"targets": {
"browsers": ["last 2 versions", "IE >= 9"]
}
}]
]
}
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
.idea
public
node_modules
temp
/nbproject/private/
*.log
*.log
.idea
45 changes: 23 additions & 22 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"boss": true,
"browser": true,
"eqnull": true,
"expr": true,
"esversion": 6,
"immed": true,
"laxbreak": true,
"loopfunc": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"quotmark": true,
"smarttabs": true,
"strict": true,
"sub": true,
"trailing": true,
"undef": true,
"unused": true,
"globals": {
"angular": false
}
"emitErrors": true,
"boss": true,
"browser": true,
"eqnull": true,
"expr": true,
"esversion": 6,
"immed": true,
"laxbreak": true,
"loopfunc": true,
"newcap": true,
"noarg": true,
"noempty": true,
"nonew": true,
"quotmark": true,
"smarttabs": true,
"strict": false,
"sub": true,
"trailing": true,
"undef": true,
"unused": true,
"globals": {
"angular": false
}
}
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ before_install:
- sh -e /etc/init.d/xvfb start

before_script:
- npm install -g grunt-cli
- npm install -g karma
- npm install

script:
- grunt travis
- npm run build

deploy:
provider: npm
Expand Down
159 changes: 0 additions & 159 deletions Gruntfile.js

This file was deleted.

34 changes: 13 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Currently we have 2 regular modules which can be added to the angular-app you ar
- __ui.scroll__ module which has
- [uiScroll directive](#uiscroll-directive)
- [uiScrollViewport directive](#uiscrollviewport-directive)
- [jqLiteExtras service](#jqliteextras-service) (with runner)
- [jqLiteExtras constant](#jqliteextras-constant) (with runner)
- __ui.scroll.grid__ module which has
- [uiScrollTh directive](#uiscrollth-and-uiscrolltd-directives)
- [uiScrollTd directive](#uiscrollth-and-uiscrolltd-directives)
Expand Down Expand Up @@ -349,9 +349,9 @@ the browser window object will be used as viewport.
-------------------


## jqLiteExtras service
## jqLiteExtras constant

This service implements some DOM element methods of jQuery which are currently not implemented in jqLite, namely
This constant is a class that implements some DOM element methods of jQuery which are currently not implemented in jqLite, namely

* before(elem)
* height() and height(value)
Expand Down Expand Up @@ -425,8 +425,7 @@ A reference to this object is injected as a property named `gridAdapter`in the s
Please feel free to make Pull Requests. Below is the information which could be useful for local developing and contributing.

The ui-scroll sources are in [./src](https://github.com/angular-ui/ui-scroll/tree/master/src) folder. They could not be run as is
because of ES6 modules (since v1.6.0), they should be built. Build process includes jshint sources verification, webpack-based
distributive files forming and tests running.
because of ES6 modules (since v1.6.0), they should be built. The build process includes jshint sources verification, distributive files generating and tests running.

There are some npm scripts available for developing.

Expand All @@ -436,43 +435,36 @@ There are some npm scripts available for developing.
npm start
```

This should start development server on 5005 port over the [./demo](https://github.com/angular-ui/ui-scroll/tree/master/demo) folder.
The middleware is configured to provide work with temporary distributive files (./temp) despite the direct links to public distributive
files (./dist). So the dist-folder should stay clear until the development is finished. Dev-server watches for the source codes (./src)
and automatically re-build temporary distributive files.
This should start development server on 5005 port over the [./demo](https://github.com/angular-ui/ui-scroll/tree/master/demo) folder. The dev-server proxy is configured to provide work with temporary distributive files (which are being built in-memory each time the sources from ./src have been changed) despite the direct links to public distributive files form ./dist folder. So the dist-folder should stay clear until the development is finished.

__2__. To run tests in keep-alive mode use

```
npm test
```

This runs karma testing against temporary distributive files (./temp). We created a number of specifications which consist of more
than 160 tests. They are living at the [./test](https://github.com/angular-ui/ui-scroll/tree/master/test) folder. Karma watches for temp
and test folders changes and automatically re-runs tests.
This runs Karma testing against temporary distributive files that are being built in-memory by the Webpack. We created a number of specifications which consist of more than 200 tests. They are living at the [./test](https://github.com/angular-ui/ui-scroll/tree/master/test) folder. Karma watches both for ./src and ./test folders and automatically re-runs tests after the source code has been changed.

__3__. To run both dev-server and tests in keep-alive mode use

```
npm run dev
```

This is the combination of first two scripts running in concurrently mode. This allows you to work with the ui-scroll examples on 5005 port
during continuous tests running.
This is the combination of first two scripts running in concurrently mode. This allows you to work with the ui-scroll examples on 5005 port during continuous tests running.

__4__. To run full build process use

```
npm run build
```

After developing and testing complete, the build process should be run to
a) pass through jshint,
b) generate minified versions of distributive,
c) run tests with minified distributive files,
d) obtain all necessary files in the [./dist](https://github.com/angular-ui/ui-scroll/tree/master/dist) folder.
After developing and testing are completed, the build process should be run to
a) pass through jshint (both of ui-scroll and test specifications sources),
b) generate compressed and uncompressed versions of the ui-scroll distributive in the public [./dist](https://github.com/angular-ui/ui-scroll/tree/master/dist) folder,
c) run tests over minified distributive files.

PR should include source code (./scr) changes, may include tests (./test) changes and may not include public distributive (./dist) changes.
Pull Rerquest should include source code (./scr) changes, may include tests (./test) changes and may not include public distributive (./dist) changes.


-------------------
Expand All @@ -486,7 +478,7 @@ PR should include source code (./scr) changes, may include tests (./test) change
* Reconsidered min/max indices processing.
* Refactored tests (removed timeouts, added helpers).
* Added ~50 new tests.
* Fixed a number of issues.
* Fixed a number of issues and other improvements.

### v1.6.2
* Added bottomVisible, bottomVisibleElement and bottomVisibleScope properties to the Adapter.
Expand Down
17 changes: 7 additions & 10 deletions dist/ui-scroll-grid.js

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

2 changes: 1 addition & 1 deletion dist/ui-scroll-grid.js.map

Large diffs are not rendered by default.

Loading