diff --git a/Jenkinsfile.develop b/Jenkinsfile.develop index 1253ffe..9a29317 100644 --- a/Jenkinsfile.develop +++ b/Jenkinsfile.develop @@ -13,13 +13,16 @@ pipeline { npm install cd ../common-map npm install + cd ../common-map3d + npm install ''' } } stage('build'){ steps { sh '''ng build common - ng build common-map''' + ng build common-map + ng build common-map3d''' } } stage('npm publish'){ @@ -29,6 +32,9 @@ pipeline { npm publish cd ../common-map npm version ${PACKAGE_VERSION} + npm publish + cd ../common-map3d + npm version ${PACKAGE_VERSION} npm publish''' } } diff --git a/package-lock.json b/package-lock.json index 0cfc6dd..af8f150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1715,7 +1715,9 @@ } }, "@farmmaps/common-map": { - "version": "file:dist/common-map", + "version": "0.0.1-prerelease.426", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.426.tgz", + "integrity": "sha512-wt1GB0UY9GVfzOvhuKmsDeMXR7hvV4rJmIIAB8f8yYkM/5vja8sY9VqFXidNvbW4Kp6KHgkzByCOG4qtcyDLdw==", "requires": { "tslib": "^2.0.0" } @@ -8220,19 +8222,9 @@ "integrity": "sha512-6YHXtdXkGH3w0NQoaUgNYAcrj064Lv5RTO284ha/hvpNTrh55yQz2cVh0VvwBk3MjyY2tdmLH4SuCJDszYdYiw==" }, "ngx-openlayers": { - "version": "1.0.0-next.13", - "resolved": "https://registry.npmjs.org/ngx-openlayers/-/ngx-openlayers-1.0.0-next.13.tgz", - "integrity": "sha512-6y724s5JV6n1oxEhryxP3wcbwzpierj9RLiMLXInfKOG3l5IO1AtPNkeK9+mKctVDUVm5URIfzzZH02Ld+bvSQ==", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } - } + "version": "1.0.0-next.16", + "resolved": "https://registry.npmjs.org/ngx-openlayers/-/ngx-openlayers-1.0.0-next.16.tgz", + "integrity": "sha512-GzNCyjj72AHEcmf8oT6SDSZLYBwKBJwRebMv1SgPdY4gsoQ/dbpqY7nmjX8k8kuQoVQQxt7UyIak3tcNYbOKVQ==" }, "ngx-uploadx": { "version": "3.5.2", diff --git a/package.json b/package.json index 0415b31..5e24b37 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1", - "@farmmaps/common-map": "file:dist/common-map", + "@farmmaps/common-map": ">=0.0.1-prerelease.420 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0",