Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major upgrade to dependencies #301

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 10.18.1
- name: install dependencies
run: yarn install --frozen-lockfile --non-interactive
- name: build
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "6"
- "10.18.1"

sudo: false
dist: trusty
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ In the spirit of free software, everyone is encouraged to help improve this proj
You will need the following things properly installed on your computer.

- [Git](https://git-scm.com/)
- [Node.js](https://nodejs.org/) (with NPM)
- [Node.js](https://nodejs.org/) (with NPM) **version ^10.18.1**
- [Ember CLI](https://ember-cli.com/)

(You can use [NVM](https://github.com/nvm-sh/nvm) to manage node versions on your computer)

## Local development

- Clone this repo `git clone git@github.com:NYCPlanning/labs-citymap.git`
Expand Down
24 changes: 8 additions & 16 deletions app/components/lookup-layer-group.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
import Component from '@ember/component';
import { service } from '@ember-decorators/service';
// import { computed } from '@ember-decorators/object';
import { argument } from '@ember-decorators/argument';
import { type } from '@ember-decorators/argument/type';
import { required } from '@ember-decorators/argument/validation';
import { inject as service } from '@ember/service';


export default class LookupLayerGroupComponent extends Component {
constructor() {
super();
export default Component.extend({
init(...args) {
this._super(...args);

const recordIdentifier = this.get('for');
const foundRecord = this.get('store').peekRecord('layer-group', recordIdentifier);
if (foundRecord) {
this.set('model', foundRecord);
}
}
},

@service store;
store: service(),

@required
@argument
@type('string')
for = '';
}
for: '',
});
2 changes: 1 addition & 1 deletion app/components/tooltip-renderer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { computed } from '@ember-decorators/object';
import { argument } from '@ember-decorators/argument';
import mustache from 'npm:mustache';
import mustache from 'mustache';

export default class TooltipRenderer extends Component {
@computed('feature', 'template')
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import QueryParams from 'ember-parachute';
import carto from 'cartobox-promises-utility/utils/carto';
import mapboxgl from 'mapbox-gl';
import fetch from 'fetch';
import turfBbox from 'npm:@turf/bbox';
import turfBbox from '@turf/bbox';
import { service } from '@ember-decorators/service';
import { alias } from '@ember-decorators/object/computed';
import precisionRound from '../utils/precision-round';
Expand Down
2 changes: 0 additions & 2 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,3 @@
@import 'modules/_m-search';
@import 'modules/_m-custom-controls';
@import 'modules/_m-noui';
//
@import "ember-power-select";
4 changes: 2 additions & 2 deletions app/styles/layouts/_l-default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ body {
}

.map-container {
@include xy-cell-static(full,false,0);
@include xy-cell(full,false,0);

position: relative;
z-index: 1;
Expand Down Expand Up @@ -150,7 +150,7 @@ body {
}

@include breakpoint(medium down) {
@include xy-cell-static(full,false,0);
@include xy-cell(full,false,0);
}

@include breakpoint(large) {
Expand Down
6 changes: 3 additions & 3 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ module.exports = function(defaults) {
'ember-cli-babel': {
includePolyfill: true,
},
babel: {
plugins: ['transform-object-rest-spread'],
},
sourcemaps: {
enabled: true,
extensions: ['js'],
Expand All @@ -27,6 +24,9 @@ module.exports = function(defaults) {
'ember-cli-foundation-6-sass': {
foundationJs: 'all',
},
'ember-cli-template-lint': {
testGenerator: 'qunit' // or 'mocha', etc.
}
});

// Use `app.import` to add additional libraries to the generated
Expand Down
3 changes: 3 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[build]
command = "yarn build --environment=staging"

[context.deploy-preview]
environment = { NODE_VERSION = "10.18.1" }

[context.master]
command = "yarn build --environment=production"
89 changes: 48 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,79 +19,86 @@
"devDependencies": {
"@ember-decorators/argument": "0.8.18",
"@ember-decorators/babel-transforms": "^2.0.0",
"@fortawesome/ember-fontawesome": "^0.1.5",
"@fortawesome/free-regular-svg-icons": "^5.1.0",
"@fortawesome/free-solid-svg-icons": "^5.3.1",
"broccoli-asset-rev": "^2.4.5",
"@fortawesome/ember-fontawesome": "^0.2.1",
"@fortawesome/free-regular-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.13.0",
"broccoli-asset-rev": "^3.0.0",
"broccoli-clean-css": "~1.1.0",
"ember-ajax": "^3.0.0",
"ember-browserify": "1.2.2",
"ember-cli": "~3.1.0-beta.1",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.6.0",
"ember-cli-clipboard": "^0.9.0",
"ember-ajax": "^4.0.0",
"ember-auto-import": "1.2.19",
"ember-clean-project": "1.0.1",
"ember-cli": "~3.5.1",
"ember-cli-accounting": "2.0.2",
"ember-cli-app-version": "^3.2.0",
"ember-cli-code-coverage": "1.0.0-beta.7",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-babel": "^7.1.3",
"ember-cli-clipboard": "^0.9.0",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-dropzonejs": "1.2.0",
"ember-cli-eslint": "^5.0.0",
"ember-cli-foundation-6-sass": "^0.0.25",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^2.0.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-netlify": "^0.1.0",
"ember-cli-numeral": "^1.0.0",
"ember-cli-nouislider": "^0.14.1",
"ember-cli-qunit": "^4.1.1",
"ember-qunit": "^4.1.2",
"ember-cli-sass": "^6.0.0",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "0.7.5",
"ember-cli-uglify": "^2.0.0",
"ember-composable-helpers": "2.1.0",
"ember-concurrency": "0.8.17",
"ember-data": "^3.3.0",
"ember-cli-uglify": "^2.1.0",
"ember-composability-tools": "^0.0.10",
"ember-composable-helpers": "^2.0.3",
"ember-concurrency": "^0.8.17",
"ember-data": "~3.5.0",
"ember-decorators": "2.0.0",
"ember-export-application-global": "^2.0.0",
"ember-fetch": "3.4.5",
"ember-load-initializers": "^1.0.0",
"ember-fetch": "^6.2.2",
"ember-load-initializers": "^2.0.0",
"ember-macro-helpers": "1.0.0",
"ember-mapbox-gl": "0.9.1",
"ember-mapbox-gl": "^0.12.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-metrics": "0.12.1",
"ember-metrics": "^0.13",
"ember-moment": "^7.7.0",
"ember-parachute": "0.3.7",
"ember-power-select": "^1.9.6",
"ember-promise-helpers": "1.0.6",
"ember-resolver": "^4.0.0",
"ember-source": "~3.0.0",
"ember-tooltips": "^3.0.0-beta.2",
"ember-promise-helpers": "^1.0.3",
"ember-resolver": "^5.0.1",
"ember-source": "~3.5.1",
"ember-tooltips": "^3.1.0",
"ember-truth-helpers": "2.0.0",
"ember-welcome-page": "^3.0.0",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-ember": "^6.0.1",
"labs-ember-search": "NYCPlanning/labs-ember-search",
"labs-ui": "^0.0.7",
"loader.js": "^4.2.3",
"mapbox-gl": "^0.45.0"
"labs-ui": "^0.0.26",
"loader.js": "^4.7.0",
"mapbox-gl": "^0.52.0-beta.1"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
"node": "^10.18.1"
},
"dependencies": {
"@turf/bbox": "^6.0.1",
"babel-eslint": "^9.0.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-es2015": "6.24.1",
"babel-preset-stage-2": "6.24.1",
"babelify": "8.0.0",
"cartobox-promises-utility": "nycplanning/cartobox-promises-utility",
"change-case": "3.0.2",
"ember-mapbox-composer": "0.0.5",
"eslint-config-airbnb": "16.1.0",
"ember-mapbox-composer": "^0.0.23",
"eslint-config-airbnb-base": "^13.0.0",
"eslint-plugin-ember-best-practices": "1.1.1",
"eslint-plugin-import": "2.10.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jsx-a11y": "6.0.3",
"eslint-plugin-react": "7.7.0",
"foundation-sites": "^6.3.1",
"typedarray": "0.0.6"
"foundation-sites": "~6.4.3",
"typedarray": "0.0.6",
"mustache": "3.0.1"
},
"resolutions": {
"ember-power-select": "^2.3.4"
},
"ember-addon": {
"paths": [
Expand Down
Loading