diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop index 66f5310..b6cb87b 100644 --- a/Jenkinsfile.develop +++ b/Jenkinsfile.develop @@ -7,7 +7,12 @@ pipeline { stages { stage('npm install'){ steps { - sh '''npm install''' + sh '''npm install + cd projects/common + npm install + cd ../common-map + npm install + ''' } } stage('build'){ diff --git a/package-lock.json b/package-lock.json index 0f4f264..f0a2860 100644 --- a/package-lock.json +++ b/package-lock.json @@ -648,6 +648,35 @@ "angular-oauth2-oidc": "^5.0.2", "ngx-uploadx": "^3.1.3", "tslib": "^1.9.0" + }, + "dependencies": { + "angular-oauth2-oidc": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-5.0.2.tgz", + "integrity": "sha512-jtOv4IWEjSFfBHVE4seWGWT/ZfWJ95QJ1JaFhVVGJEF64ibGuPwV3ztwTOUl98QHi/Yg4PXXDAisb31JnIbxBw==", + "requires": { + "jsrsasign": "^8.0.12", + "tslib": "^1.9.0" + } + }, + "jsrsasign": { + "version": "8.0.12", + "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz", + "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY=" + }, + "ngx-uploadx": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.3.1.tgz", + "integrity": "sha512-2WsE2BgA1RlrCuJ2Arcl6vObfL+dJzZFdFnnOOjbsW0ib+MmC+6dEL7QXgTs+sRCOzs2wC+F1sQ27nMPjhvpjg==", + "requires": { + "tslib": "^1.9.0" + } + }, + "tslib": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + } } }, "@ng-bootstrap/ng-bootstrap": { @@ -1079,15 +1108,6 @@ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", "dev": true }, - "angular-oauth2-oidc": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-5.0.2.tgz", - "integrity": "sha512-jtOv4IWEjSFfBHVE4seWGWT/ZfWJ95QJ1JaFhVVGJEF64ibGuPwV3ztwTOUl98QHi/Yg4PXXDAisb31JnIbxBw==", - "requires": { - "jsrsasign": "^8.0.12", - "tslib": "^1.9.0" - } - }, "ansi-align": { "version": "2.0.0", "resolved": "https://repository.akkerweb.nl/repository/npm-group/ansi-align/-/ansi-align-2.0.0.tgz", @@ -5891,11 +5911,6 @@ "verror": "1.10.0" } }, - "jsrsasign": { - "version": "8.0.12", - "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz", - "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY=" - }, "jszip": { "version": "3.2.1", "resolved": "https://repository.akkerweb.nl/repository/npm-group/jszip/-/jszip-3.2.1.tgz", @@ -6902,14 +6917,6 @@ "deepmerge": "^3.2.0" } }, - "ngx-uploadx": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.1.3.tgz", - "integrity": "sha512-RX3uEaqMTpjTv5mtdnTQYsDOED3Qg5V3OBU5ohOyL35uL+dllF7I0y+kojJprm9thzHNAWih1DLeTlVWZKo+hQ==", - "requires": { - "tslib": "^1.9.0" - } - }, "nice-try": { "version": "1.0.5", "resolved": "https://repository.akkerweb.nl/repository/npm-group/nice-try/-/nice-try-1.0.5.tgz", diff --git a/package.json b/package.json index f9158d0..7bfd2bd 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "@ngrx/effects": "^7.2.0", "@ngrx/router-store": "^7.2.0", "@ngrx/store": "^7.2.0", - "ngrx-store-localstorage": "^8.0.0", "bootstrap": "^4.3.1", "core-js": "^2.5.4", + "ngrx-store-localstorage": "^8.0.0", "resumablejs": "^1.1.0", "rxjs": "~6.3.3", "tassign": "^1.0.0", diff --git a/projects/common-map/package.json b/projects/common-map/package.json index b2f1f27..56dba52 100644 --- a/projects/common-map/package.json +++ b/projects/common-map/package.json @@ -10,10 +10,8 @@ "ol": "^5.3.3" }, "peerDependencies": { - "@angular/common": "^7.2.0", "@angular/core": "^7.2.0", "ngrx-store-localstorage": "^8.0.0", - "@farmmaps/common": "^0.0.1", "@ngrx/effects": "^7.2", "@ngrx/router-store": "^7.2", "@ngrx/store": "^7.2",