From 488f0cdfb048849f42b7fe1e45d21b6990a7a087 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 8 Sep 2020 13:18:49 -0600
Subject: [PATCH 1/3] types/
update name
---
.npmrc | 1 +
example/package-lock.json | 10 +++++-----
example/package.json | 2 +-
example/src/app/app.component.ts | 2 +-
example/src/app/app.service.ts | 2 +-
package-lock.json | 30 +++++++++++++++---------------
package.json | 4 ++--
types/disagg/DisaggResponse.d.ts | 2 +-
types/disagg/Disaggregation.d.ts | 2 +-
9 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/.npmrc b/.npmrc
index fcdbb55..9292540 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
+//code.usgs.gov/api/v4/packages/npm/:_authToken=${GITLAB_TOKEN}
diff --git a/example/package-lock.json b/example/package-lock.json
index dac5d4d..0159ce5 100644
--- a/example/package-lock.json
+++ b/example/package-lock.json
@@ -1710,7 +1710,7 @@
"@nshmp/disagg-d3": {
"version": "file:..",
"requires": {
- "@nshmp/nshmp-utils": "^1.2.5",
+ "@ghsc/nshmp-utils": "^1.2.5",
"d3": "^3.5.17"
},
"dependencies": {
@@ -1819,9 +1819,9 @@
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
- "@nshmp/nshmp-utils": {
+ "@ghsc/nshmp-utils": {
"version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@nshmp/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
+ "resolved": "https://registry.npmjs.org/@ghsc/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
"integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
"requires": {
"@mapbox/geojson-extent": "^0.3.2",
@@ -2862,9 +2862,9 @@
}
}
},
- "@nshmp/nshmp-utils": {
+ "@ghsc/nshmp-utils": {
"version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@nshmp/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
+ "resolved": "https://registry.npmjs.org/@ghsc/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
"integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
"requires": {
"@mapbox/geojson-extent": "^0.3.2",
diff --git a/example/package.json b/example/package.json
index 9655c43..985ed42 100644
--- a/example/package.json
+++ b/example/package.json
@@ -20,7 +20,7 @@
"@angular/platform-browser-dynamic": "~10.0.9",
"@angular/router": "~10.0.9",
"@nshmp/disagg-d3": "file:..",
- "@nshmp/nshmp-utils": "^1.2.5",
+ "@ghsc/nshmp-utils": "^1.2.5",
"geojson": "^0.5.0",
"rxjs": "~6.5.5",
"tslib": "^2.0.0",
diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts
index b48e1ba..2f00788 100644
--- a/example/src/app/app.component.ts
+++ b/example/src/app/app.component.ts
@@ -1,7 +1,7 @@
import { Component, ViewChild, ElementRef, OnInit, AfterViewInit } from '@angular/core';
import { DisaggResponse, Disaggregation, DisaggGraphView } from '@nshmp/disagg-d3/src/disagg';
import { Collection } from '@nshmp/disagg-d3/src/mvc';
-import { DeaggResponseData } from '@nshmp/nshmp-utils/nshmp';
+import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp';
import * as deagg from '../assets/deagg.json';
diff --git a/example/src/app/app.service.ts b/example/src/app/app.service.ts
index bf7d38d..9aacbfd 100644
--- a/example/src/app/app.service.ts
+++ b/example/src/app/app.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
-import { DeaggUsage, DeaggResponse } from '@nshmp/nshmp-utils/nshmp';
+import { DeaggUsage, DeaggResponse } from '@ghsc/nshmp-utils/nshmp';
import { throwError, Observable } from 'rxjs';
@Injectable({
diff --git a/package-lock.json b/package-lock.json
index 067aec2..f25c276 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "@nshmp/disagg-d3",
+ "name": "@ghsc/disagg-d3",
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
@@ -30,6 +30,17 @@
"js-tokens": "^4.0.0"
}
},
+ "@ghsc/nshmp-utils": {
+ "version": "2.0.1",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-2.0.1.tgz",
+ "integrity": "sha1-xapLYFECuFrkYMxnmPG4U0LnB1M=",
+ "requires": {
+ "@mapbox/geojson-extent": "^0.3.2",
+ "d3-format": "^1.4.4",
+ "mapbox-gl": "^1.11.1",
+ "plotly.js-dist": "^1.54.7"
+ }
+ },
"@mapbox/extent": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@mapbox/extent/-/extent-0.4.0.tgz",
@@ -112,17 +123,6 @@
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
- "@nshmp/nshmp-utils": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@nshmp/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
- "integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
- "requires": {
- "@mapbox/geojson-extent": "^0.3.2",
- "d3-format": "^1.4.4",
- "mapbox-gl": "^1.11.1",
- "plotly.js-dist": "^1.54.7"
- }
- },
"@phenomnomnominal/tsquery": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-4.1.0.tgz",
@@ -898,9 +898,9 @@
}
},
"plotly.js-dist": {
- "version": "1.54.7",
- "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.54.7.tgz",
- "integrity": "sha512-zcBc+VQ7lYLHiWWug9W2Aahi0NxBFynjClfmWOdW6atv4TJYK7XNB5Hxk94L7BH2dWHrNbkIHBxenRBKAmoC+Q=="
+ "version": "1.55.2",
+ "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.55.2.tgz",
+ "integrity": "sha512-1QBBIPnh/G+8w9h/6pr7DQGm3t/XZptskUxJQsqTJJ1uth4xsDj2ltkmzujI5cG4lZadurJnfrJbFof+LHiyHg=="
},
"potpack": {
"version": "1.0.1",
diff --git a/package.json b/package.json
index 090bf73..6da0e88 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "@ghsc/nshmp-disagg-d3",
+ "name": "@ghsc/disagg-d3",
"version": "0.0.1",
"description": "Disaggregation plots using D3, ported from hazdev",
"main": "src/index.js",
@@ -30,7 +30,7 @@
"typescript": "^4.0.2"
},
"dependencies": {
- "@nshmp/nshmp-utils": "^1.2.5",
+ "@ghsc/nshmp-utils": "^2.0.1",
"d3": "^3.5.17"
},
"husky": {
diff --git a/types/disagg/DisaggResponse.d.ts b/types/disagg/DisaggResponse.d.ts
index 07cf774..9a81cd4 100644
--- a/types/disagg/DisaggResponse.d.ts
+++ b/types/disagg/DisaggResponse.d.ts
@@ -1,4 +1,4 @@
-import { DeaggResponseData } from '@nshmp/nshmp-utils/nshmp';
+import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp';
import { Model } from '../mvc/Model';
/**
diff --git a/types/disagg/Disaggregation.d.ts b/types/disagg/Disaggregation.d.ts
index 41058f6..bc13c62 100644
--- a/types/disagg/Disaggregation.d.ts
+++ b/types/disagg/Disaggregation.d.ts
@@ -1,4 +1,4 @@
-import { DeaggResponseData } from '@nshmp/nshmp-utils/nshmp';
+import { DeaggResponseData } from '@ghsc/nshmp-utils/nshmp';
import { Model } from '../mvc/Model';
import { DisaggParameters } from './DisaggParameters';
--
GitLab
From c9585c342d0139de7712bf3d3c2519d4fce46615 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 8 Sep 2020 13:21:21 -0600
Subject: [PATCH 2/3] update ci
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64f8895..a953fc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+variables:
+ GITLAB_TOKEN: '${CI_JOB_TOKEN}'
+
stages:
- test
- publish
--
GitLab
From 4509d6b1526c919d1fc63262e11e2d5a421a9172 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Tue, 8 Sep 2020 13:26:20 -0600
Subject: [PATCH 3/3] update dependency on example
---
example/.npmrc | 2 ++
example/package-lock.json | 52 +++++++++++++++++++--------------------
example/package.json | 2 +-
3 files changed, 29 insertions(+), 27 deletions(-)
create mode 100644 example/.npmrc
diff --git a/example/.npmrc b/example/.npmrc
new file mode 100644
index 0000000..9292540
--- /dev/null
+++ b/example/.npmrc
@@ -0,0 +1,2 @@
+@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
+//code.usgs.gov/api/v4/packages/npm/:_authToken=${GITLAB_TOKEN}
diff --git a/example/package-lock.json b/example/package-lock.json
index 0159ce5..e077c78 100644
--- a/example/package-lock.json
+++ b/example/package-lock.json
@@ -1506,6 +1506,17 @@
"to-fast-properties": "^2.0.0"
}
},
+ "@ghsc/nshmp-utils": {
+ "version": "2.0.1",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1414/packages/npm/@ghsc/nshmp-utils/-/@ghsc/nshmp-utils-2.0.1.tgz",
+ "integrity": "sha1-xapLYFECuFrkYMxnmPG4U0LnB1M=",
+ "requires": {
+ "@mapbox/geojson-extent": "^0.3.2",
+ "d3-format": "^1.4.4",
+ "mapbox-gl": "^1.11.1",
+ "plotly.js-dist": "^1.54.7"
+ }
+ },
"@istanbuljs/schema": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
@@ -1710,7 +1721,7 @@
"@nshmp/disagg-d3": {
"version": "file:..",
"requires": {
- "@ghsc/nshmp-utils": "^1.2.5",
+ "@ghsc/nshmp-utils": "^2.0.1",
"d3": "^3.5.17"
},
"dependencies": {
@@ -1737,6 +1748,17 @@
"js-tokens": "^4.0.0"
}
},
+ "@ghsc/nshmp-utils": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@ghsc/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
+ "integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
+ "requires": {
+ "@mapbox/geojson-extent": "^0.3.2",
+ "d3-format": "^1.4.4",
+ "mapbox-gl": "^1.11.1",
+ "plotly.js-dist": "^1.54.7"
+ }
+ },
"@mapbox/extent": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@mapbox/extent/-/extent-0.4.0.tgz",
@@ -1819,17 +1841,6 @@
"resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz",
"integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q=="
},
- "@ghsc/nshmp-utils": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@ghsc/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
- "integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
- "requires": {
- "@mapbox/geojson-extent": "^0.3.2",
- "d3-format": "^1.4.4",
- "mapbox-gl": "^1.11.1",
- "plotly.js-dist": "^1.54.7"
- }
- },
"@phenomnomnominal/tsquery": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-4.1.0.tgz",
@@ -2862,17 +2873,6 @@
}
}
},
- "@ghsc/nshmp-utils": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@ghsc/nshmp-utils/-/nshmp-utils-1.2.5.tgz",
- "integrity": "sha512-dZUTJYGz2V7dqUPGKpCofw9OhbUtZYnap9j0QhQ6otvjURTEtntn6f3+ZDlh1drqUWBTmzzAqDBvvymOFndnXQ==",
- "requires": {
- "@mapbox/geojson-extent": "^0.3.2",
- "d3-format": "^1.4.4",
- "mapbox-gl": "^1.11.1",
- "plotly.js-dist": "^1.54.7"
- }
- },
"@schematics/angular": {
"version": "10.0.7",
"resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.7.tgz",
@@ -10120,9 +10120,9 @@
}
},
"plotly.js-dist": {
- "version": "1.54.7",
- "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.54.7.tgz",
- "integrity": "sha512-zcBc+VQ7lYLHiWWug9W2Aahi0NxBFynjClfmWOdW6atv4TJYK7XNB5Hxk94L7BH2dWHrNbkIHBxenRBKAmoC+Q=="
+ "version": "1.55.2",
+ "resolved": "https://registry.npmjs.org/plotly.js-dist/-/plotly.js-dist-1.55.2.tgz",
+ "integrity": "sha512-1QBBIPnh/G+8w9h/6pr7DQGm3t/XZptskUxJQsqTJJ1uth4xsDj2ltkmzujI5cG4lZadurJnfrJbFof+LHiyHg=="
},
"pnp-webpack-plugin": {
"version": "1.6.4",
diff --git a/example/package.json b/example/package.json
index 985ed42..eea1a28 100644
--- a/example/package.json
+++ b/example/package.json
@@ -19,8 +19,8 @@
"@angular/platform-browser": "~10.0.9",
"@angular/platform-browser-dynamic": "~10.0.9",
"@angular/router": "~10.0.9",
+ "@ghsc/nshmp-utils": "^2.0.1",
"@nshmp/disagg-d3": "file:..",
- "@ghsc/nshmp-utils": "^1.2.5",
"geojson": "^0.5.0",
"rxjs": "~6.5.5",
"tslib": "^2.0.0",
--
GitLab