Skip to content

Commit 1c455a6

Browse files
authored
Merge pull request #23 from mpalourdio/sub-modules
sub-modules split. Fixes #20
2 parents 3a6b5f1 + f0f3af1 commit 1c455a6

File tree

51 files changed

+214
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+214
-127
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ tmp
77
*.iml
88
dist
99
coverage
10+
.idea/

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ coverage
1212
.travis.yml
1313
gulpfile.js
1414
karma.conf.js
15+
main.ts
1516
polyfills.ts
1617
test.ts
1718
tsconfig.json
@@ -20,3 +21,4 @@ tsconfig.spec.json
2021
tslint.json
2122
yarn.lock
2223
*.iml
24+
.idea/

CHANGELOG.MD

Lines changed: 28 additions & 0 deletions

README.MD

Lines changed: 31 additions & 0 deletions

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ gulp.task('copy-package-json', function () {
3131
});
3232

3333
gulp.task('copy-misc-files', function () {
34-
return gulp.src(['README.MD', 'LICENSE'])
34+
return gulp.src(['README.MD', 'LICENSE', 'CHANGELOG.MD'])
3535
.pipe(gulp.dest(distDir));
3636
});
3737

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-http-loader",
3-
"version": "0.4.0",
3+
"version": "0.5.0",
44
"scripts": {
55
"prepare-deploy": "gulp inline-templates && gulp clean-dist && ngc -p tsconfig.ngc.json && gulp clean-tmp && gulp copy-all",
66
"test": "ng test --watch false"
@@ -28,24 +28,25 @@
2828
"bugs": {
2929
"url": "https://github.com/mpalourdio/ng-http-loader/issues"
3030
},
31-
"dependencies": {
31+
"peerDependencies": {
3232
"@angular/common": "^5.0.0",
33-
"@angular/compiler": "^5.0.0",
3433
"@angular/core": "^5.0.0",
35-
"@angular/platform-browser": "^5.0.0",
36-
"@angular/platform-browser-dynamic": "^5.0.0",
37-
"core-js": "^2.4.1",
38-
"rxjs": "^5.5.2",
39-
"zone.js": "^0.8.14"
34+
"rxjs": "^5.5.2"
4035
},
4136
"devDependencies": {
4237
"@angular/cli": "^1.5.0",
38+
"@angular/common": "^5.0.0",
39+
"@angular/compiler": "^5.0.0",
4340
"@angular/compiler-cli": "^5.0.0",
41+
"@angular/core": "^5.0.0",
4442
"@angular/language-service": "^5.0.0",
43+
"@angular/platform-browser": "^5.0.0",
44+
"@angular/platform-browser-dynamic": "^5.0.0",
4545
"@types/jasmine": "~2.5.53",
4646
"@types/jasminewd2": "~2.0.2",
4747
"@types/node": "~6.0.60",
4848
"codelyzer": "~3.2.0",
49+
"core-js": "^2.4.1",
4950
"gulp": "^3.9.1",
5051
"gulp-clean": "^0.3.2",
5152
"gulp-inline-ng2-template": "^4.0.0",
@@ -60,8 +61,10 @@
6061
"karma-phantomjs-launcher": "^1.0.4",
6162
"phantomjs-prebuilt": "^2.1.14",
6263
"protractor": "~5.1.2",
64+
"rxjs": "^5.5.2",
6365
"ts-node": "~3.2.0",
6466
"tslint": "~5.7.0",
65-
"typescript": "~2.4.2"
67+
"typescript": "~2.4.2",
68+
"zone.js": "^0.8.14"
6669
}
6770
}
File renamed without changes.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import { HttpClientModule } from '@angular/common/http';
4+
import { SpinnerComponent } from './spinner/spinner.component';
5+
import { SPINKIT_COMPONENTS } from '../spinkits';
6+
7+
@NgModule({
8+
declarations: [
9+
SpinnerComponent,
10+
SPINKIT_COMPONENTS,
11+
],
12+
imports: [
13+
CommonModule,
14+
HttpClientModule,
15+
],
16+
exports: [
17+
SpinnerComponent,
18+
SPINKIT_COMPONENTS,
19+
],
20+
})
21+
export class NgHttpLoaderComponentsModule {
22+
}

src/sk-chasing-dots/sk-chasing-dots.component.css renamed to src/components/sk-chasing-dots/sk-chasing-dots.component.css

File renamed without changes.

src/sk-chasing-dots/sk-chasing-dots.component.html renamed to src/components/sk-chasing-dots/sk-chasing-dots.component.html

File renamed without changes.

0 commit comments

Comments
 (0)