Merge pull request #20 from pxblue/feature/resolve-merge-conflicts

Update Demo Dependencies

.circleci/config.yml

@@ -10,4 +10,37 @@ jobs:
           command: yarn
       - run:
           name: Verify Artifacts
-          command: yarn test
+          command: yarn test
+
+  publish:
+    docker:
+      - image: circleci/node:12.9.1-browsers
+    steps:
+      - checkout
+      - run:
+          name: Authenticate with registry
+          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
+      - run:
+          name: Publish @pxblue/mapbox
+          command:  |
+            MASTER_VERSION=`node -p "require('./package.json').version"`
+            NPM_LATEST_VERSION=`npm show @pxblue/mapbox version`
+            if ! [ $MASTER_VERSION == $NPM_LATEST_VERSION ];
+            then
+                npm publish
+            else
+                echo "Latest version is already published."
+            fi
+
+workflows:
+  version: 2
+  mapbox:
+    jobs:
+      - build
+      - publish:
+          requires:
+            - build
+          filters:
+            branches:
+              only:
+                - master

.npmignore

@@ -24,6 +24,7 @@ react-demo/
 .env.development.local
 .env.test.local
 .env.production.local
+.idea
 
 npm-debug.log*
 yarn-debug.log*

PUBLISHING.md

@@ -0,0 +1,11 @@
+# Publishing Instructions
+
+To update the version number, edit the version in `package.json`.
+
+To publish a new package through NPM, run the following commands from the root folder:
+
+```
+npm publish --tag <alpha | beta>
+```
+
+> The above command should only be run for `alpha` or `beta` packages. This repo's CircleCI will automatically publish latest packages from the master branch.

angular-demo/angular.json

@@ -24,8 +24,8 @@
             ],
             "styles": [
               "src/styles.scss",
-              "./node_modules/@pxblue/themes/angular/theme.scss",
-              "./node_modules/typeface-open-sans",
+              "./node_modules/@pxblue/angular-themes/theme.scss",
+              "./node_modules/@pxblue/angular-themes/open-sans.scss",
               "./node_modules/mapbox-gl/dist/mapbox-gl.css",
               "./node_modules/@mapbox/mapbox-gl-geocoder/lib/mapbox-gl-geocoder.css"
             ],

angular-demo/package.json

@@ -25,18 +25,16 @@
     "@angular/platform-browser-dynamic": "8.2.5",
     "@mapbox/mapbox-gl-draw": "^1.1.2",
     "@mapbox/mapbox-gl-geocoder": "^4.4.1",
-    "@pxblue/angular-components": "1.1.1",
-    "@pxblue/colors": "1.0.13",
+    "@pxblue/angular-themes": "^6.0.1",
+    "@pxblue/colors": "^3.0.0",
     "@pxblue/mapbox": "^1.0.1",
-    "@pxblue/ng-progress-icons": "1.1.4",
-    "@pxblue/themes": "2.1.0",
+    "@pxblue/ng-progress-icons": "^1.2.1",
     "@types/mapbox-gl": "^0.54.3",
     "core-js": "2.6.9",
     "mapbox-gl": "^1.3.1",
     "ngx-mapbox-gl": "3.3.1",
     "rxjs": "6.4.0",
     "tslib": "1.10.0",
-    "typeface-open-sans": "0.0.75",
     "zone.js": "0.9.1"
   },
   "devDependencies": {