Skip to content

Commit

Permalink
added npm package as submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
janCstoffregen committed Feb 28, 2018
1 parent c397ecd commit a454404
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 85 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
@@ -1 +1,4 @@

[submodule "src/app/npm-package"]
path = src/app/npm-package
url = https://github.com/nie-ine/npm-package.git
19 changes: 11 additions & 8 deletions src/app/core/core.module.ts
View file
Expand Up @@ -11,13 +11,14 @@ import { MainComponent } from './main/main.component';
import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
import { NavigationComponent } from './navigation/navigation.component';
import { MetadataViewModule } from '../metadata-view/metadata-view.module';
import { ArithmeticModule } from 'nie-ine';
import {DashboardModule} from "../dashboard/dashboard.module";
import {TextViewModule} from '../text-view/text-view.module';
import {KnoraRequestService} from '../shared/knora-request.service';
import {SparqlRequestService} from '../shared/sparql-request.service';
import {ResultToTextMapperService} from '../text-view/result-to-text-mapper.service';
import {KnoraAuthService} from '../shared/knora-auth.service';
import { DashboardModule } from '../dashboard/dashboard.module';
import { TextViewModule } from '../text-view/text-view.module';
import { KnoraRequestService } from '../shared/knora-request.service';
import { SparqlRequestService } from '../shared/sparql-request.service';
import { ResultToTextMapperService } from '../text-view/result-to-text-mapper.service';
import { KnoraAuthService } from '../shared/knora-auth.service';
import { ArithmeticModule } from '../npm-package/src/modules/arithmetic.module';
import { ExampleComponent } from '../npm-package/src/modules/exampleComponent/example.component';

@NgModule({
imports: [
Expand All @@ -29,8 +30,10 @@ import {KnoraAuthService} from '../shared/knora-auth.service';
ArithmeticModule,
GrapesjsModule,
DashboardModule,
ArithmeticModule,
RouterModule.forRoot([
{path: '**', component: PageNotFoundComponent}
{ path: 'example', component: ExampleComponent },
{ path: '**', component: PageNotFoundComponent }
])
],
declarations: [HeaderComponent, FooterComponent, MainComponent, PageNotFoundComponent, NavigationComponent],
Expand Down
1 change: 1 addition & 0 deletions src/app/npm-package
Submodule npm-package added at 76a4a2
179 changes: 102 additions & 77 deletions yarn.lock
View file
Expand Up @@ -2,54 +2,55 @@
# yarn lockfile v1


"@angular-devkit/build-optimizer@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.3.1.tgz#6a26a46c58858c7b67833c6d8a81198fa17d23e7"
"@angular-devkit/build-optimizer@0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.3.2.tgz#77d4d1e4fcd09575f0200e2d6d21c1a3f995096f"
dependencies:
loader-utils "^1.1.0"
source-map "^0.5.6"
typescript "~2.6.2"
webpack-sources "^1.0.1"

"@angular-devkit/core@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.3.1.tgz#6aeb990dec92d06360597928748aeeedc21afdde"
"@angular-devkit/core@0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-0.3.2.tgz#b6fd6aa2e4f4ac3c39478198ba91a53d4c0f88d5"
dependencies:
ajv "~5.5.1"
chokidar "^1.7.0"
rxjs "^5.5.6"
source-map "^0.5.6"

"@angular-devkit/schematics@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.3.1.tgz#eb40ca260681f4f420ca8ed41f754fb3ea689f81"
"@angular-devkit/schematics@0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.3.2.tgz#09a2268fad61f4f956f42db87913b8748c512a78"
dependencies:
"@ngtools/json-schema" "^1.1.0"
rxjs "^5.5.6"

"@angular/animations@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.2.tgz#3364a0c4f355d3313dda9bde526e376c137fa169"
"@angular/animations@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.6.tgz#433aace8929ce362762dcccdb5044c3945a194bd"
dependencies:
tslib "^1.7.1"

"@angular/cdk@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-5.2.1.tgz#11500502deeaf42f88f92ca7d78d9a7642b07761"
"@angular/cdk@^5.2.2":
version "5.2.3"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-5.2.3.tgz#b52e7040e1e6577b593b5d974b80020c1f5babe3"
dependencies:
tslib "^1.7.1"

"@angular/cli@^1.6.3":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.0.tgz#63c56e6d36d57bcd9d9d9425bd806f590f518211"
"@angular/cli@^1.7.1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-1.7.1.tgz#3a9d0b8314d4c54226f941beeb53071385c294e0"
dependencies:
"@angular-devkit/build-optimizer" "0.3.1"
"@angular-devkit/core" "0.3.1"
"@angular-devkit/schematics" "0.3.1"
"@angular-devkit/build-optimizer" "0.3.2"
"@angular-devkit/core" "0.3.2"
"@angular-devkit/schematics" "0.3.2"
"@ngtools/json-schema" "1.2.0"
"@ngtools/webpack" "1.10.0"
"@schematics/angular" "0.3.1"
"@schematics/package-update" "0.3.1"
"@ngtools/webpack" "1.10.1"
"@schematics/angular" "0.3.2"
"@schematics/package-update" "0.3.2"
ajv "^6.1.1"
autoprefixer "^7.2.3"
cache-loader "^1.2.0"
chalk "~2.2.0"
Expand Down Expand Up @@ -103,70 +104,70 @@
optionalDependencies:
node-sass "^4.7.2"

"@angular/common@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.2.tgz#24f0f21dbc29a8b2dbfe93d19ec5a18defca9edf"
"@angular/common@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.6.tgz#0c6771739f1407eae0533e82c3ee42425badd489"
dependencies:
tslib "^1.7.1"

"@angular/compiler-cli@^5.2.2":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.5.tgz#b1988bb2c0a956e7fc163acf8c7d794a07a88d08"
"@angular/compiler-cli@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.6.tgz#f60fccabaf8d09641aada8c112a6e4f336f8412d"
dependencies:
chokidar "^1.4.2"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
tsickle "^0.26.0"
tsickle "^0.27.2"

"@angular/compiler@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.2.tgz#cf6ef310c5ca2fdae9551af62d10ab24d4feb51a"
"@angular/compiler@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.6.tgz#0abf72b46c401688342057e3fb7cd59fef0a5ab1"
dependencies:
tslib "^1.7.1"

"@angular/core@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.2.tgz#54950023b971d9e01f6f6fdbc30d2b68e4d05eb2"
"@angular/core@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.6.tgz#483fb0b720d563d3ec4d1895878249beafa39b9b"
dependencies:
tslib "^1.7.1"

"@angular/forms@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.2.tgz#eca24f15d96de285cd0726601db4bffec39c01f3"
"@angular/forms@>= 5.0.0", "@angular/forms@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.6.tgz#fa3e37a9e97fa3e2b24d8564a66a11d430379bfe"
dependencies:
tslib "^1.7.1"

"@angular/http@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.2.tgz#d33c128d5737f8d701bbac3e7e23d831deec3457"
"@angular/http@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.6.tgz#4fa92e61b9848f8571c61ae9ad32af27cd71b043"
dependencies:
tslib "^1.7.1"

"@angular/language-service@^5.0.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.2.5.tgz#7c3021f347dd4b28ae0a867700894f3de4930f48"
"@angular/language-service@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-5.2.6.tgz#f88f49f54a82e95b05af50ded22f4ebbb344df1f"

"@angular/material@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.2.1.tgz#c0433edf98904dc35ae15dfa93ede755418843dd"
"@angular/material@^5.2.2":
version "5.2.3"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.2.3.tgz#ce7e2abb79c0bd16dff7f247b21c5339d02dd949"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser-dynamic@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.2.tgz#2ddd7fa28bb34ae9e181e6f286dfe4c96bde95a6"
"@angular/platform-browser-dynamic@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.6.tgz#8795cca57306b7bdc2bc166d3928bc8eb145125c"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.2.tgz#3eedcbbcc8c0e6c91eba7ed2b32de7c6679d9b62"
"@angular/platform-browser@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.6.tgz#ecb8a6d37506ffb3f181ea10696a3c7feaf1674c"
dependencies:
tslib "^1.7.1"

"@angular/router@5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.2.tgz#b0ffd7121290e8c01f20862b4a2638ebcebc61cf"
"@angular/router@^5.2.6":
version "5.2.6"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.6.tgz#513b555d5cc4b206833646468ffb47fa8f5c1c0b"
dependencies:
tslib "^1.7.1"

Expand All @@ -178,9 +179,9 @@
version "1.1.0"
resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"

"@ngtools/webpack@1.10.0":
version "1.10.0"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.10.0.tgz#1e4f60bdba8cdb8aeb93ebb976e63bf175acd279"
"@ngtools/webpack@1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.10.1.tgz#0af9de19a9716ce0247b6aad83ba9c5702766a03"
dependencies:
chalk "~2.2.0"
enhanced-resolve "^3.1.0"
Expand All @@ -191,15 +192,15 @@
tree-kill "^1.0.0"
webpack-sources "^1.1.0"

"@schematics/angular@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.3.1.tgz#0f5185f5e718145031532fb03d127446e22ee9b8"
"@schematics/angular@0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.3.2.tgz#be209a032a3e4577992d94fbaa14bd4bfde485e2"
dependencies:
typescript "~2.6.2"

"@schematics/package-update@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@schematics/package-update/-/package-update-0.3.1.tgz#b7662a2aeb724e0f162b916cc0937278a6a1e709"
"@schematics/package-update@0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@schematics/package-update/-/package-update-0.3.2.tgz#c5a299ceba8b9e56f3e1f804f86f07664ec6e01c"
dependencies:
rxjs "^5.5.6"
semver "^5.3.0"
Expand Down Expand Up @@ -329,6 +330,14 @@ ajv@^6.1.0:
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"

ajv@^6.1.1:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.0.tgz#afac295bbaa0152449e522742e4547c1ae9328d2"
dependencies:
fast-deep-equal "^1.0.0"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"

align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
Expand Down Expand Up @@ -4445,10 +4454,11 @@ netmask@~1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"

nie-ine@0.0.16:
version "0.0.16"
resolved "https://registry.yarnpkg.com/nie-ine/-/nie-ine-0.0.16.tgz#aee854884181e0a453a005977853bfd5a7957cb6"
nie-ine@0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/nie-ine/-/nie-ine-0.0.18.tgz#3a3002c37c6ccfd649c72a02156117dc401a6be3"
dependencies:
"@angular/forms" ">= 5.0.0"
tslib "^1.7.1"

no-case@^2.2.0:
Expand Down Expand Up @@ -4732,6 +4742,10 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
dependencies:
wrappy "1"

openseadragon@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.3.1.tgz#efdcfee19d8b3c46d00d7f7dda787c7057f68364"

opn@^5.1.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
Expand Down Expand Up @@ -5126,6 +5140,10 @@ pretty-error@^2.0.2:
renderkid "^2.0.1"
utila "~0.4"

primeng@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/primeng/-/primeng-5.2.0.tgz#f74c062f1c4eeaebf5b724b92395d71fe6954e19"

process-nextick-args@~1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
Expand Down Expand Up @@ -6135,7 +6153,7 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"

source-map-support@^0.4.1, source-map-support@^0.4.2, source-map-support@~0.4.0:
source-map-support@^0.4.1, source-map-support@~0.4.0:
version "0.4.18"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
dependencies:
Expand Down Expand Up @@ -6612,14 +6630,14 @@ tsconfig@^7.0.0:
strip-bom "^3.0.0"
strip-json-comments "^2.0.0"

tsickle@^0.26.0:
version "0.26.0"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.26.0.tgz#40b30a2dd6abcb33b182e37596674bd1cfe4039c"
tsickle@^0.27.2:
version "0.27.2"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.2.tgz#f33d46d046f73dd5c155a37922e422816e878736"
dependencies:
minimist "^1.2.0"
mkdirp "^0.5.1"
source-map "^0.5.6"
source-map-support "^0.4.2"
source-map "^0.6.0"
source-map-support "^0.5.0"

tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
version "1.9.0"
Expand Down Expand Up @@ -6702,7 +6720,7 @@ uglify-es@^3.3.4:
commander "~2.13.0"
source-map "~0.6.1"

uglify-js@3.3.x, uglify-js@^3.3.9:
uglify-js@3.3.x:
version "3.3.11"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.11.tgz#e9d058b20715138bb4e8e5cae2ea581686bdaae3"
dependencies:
Expand All @@ -6718,6 +6736,13 @@ uglify-js@^2.6, uglify-js@^2.8.29:
optionalDependencies:
uglify-to-browserify "~1.0.0"

uglify-js@^3.3.12:
version "3.3.12"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.12.tgz#efd87c16a1f4c674a8a5ede571001ef634dcc883"
dependencies:
commander "~2.14.1"
source-map "~0.6.1"

uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
Expand Down

0 comments on commit a454404

Please sign in to comment.