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.

Sign up for GitHub

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

Upgrade dependencies to latest stable versions #228

Merged
merged 5 commits into from
Sep 15, 2022
Merged

Upgrade dependencies to latest stable versions #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
728707c
#225: Upgrade most package.json dependencies
bstein Aug 30, 2022
f800900
#225: Upgrade babel, eslint, and rollup packages
bstein Sep 6, 2022
c8d7c77
#225: Upgrade non-angular app/package.json dependencies
bstein Sep 7, 2022
e21e03f
#225: Upgrade angular dependencies
bstein Sep 9, 2022
ea206d6
#225: Round of minor upgrades
bstein Sep 14, 2022
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
3 changes: 0 additions & 3 deletions .babelrc
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"extends": "eslint:recommended",
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaFeatures": {
"modules": true
}
},
"env": {
"browser": true,
"es6": true,
"jasmine": true,
"node": true
},
"ecmaFeatures": {
"modules": true
},
"plugins": ["lodash"],
"plugins": ["angular", "lodash"],
"globals": {
"_": true,
"inject": true,
Expand Down
28 changes: 14 additions & 14 deletions app/app/analysis/analysis_algorithmic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-sm-12">
<uib-accordion close-others="false">
<uib-accordion-group class="algorithm-custom" is-open="advancedArguments.open">
<div uib-accordion-group class="panel-default algorithm-custom" is-open="advancedArguments.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
ng-class="{'glyphicon-chevron-down': advancedArguments.open, 'glyphicon-chevron-right': !advancedArguments.open}"></i>
Expand Down Expand Up @@ -84,15 +84,15 @@
<input class="form-control" type="number" ng-model="timeoutUploadResults" ng-change="analysis.setTimeoutUploadResults(timeoutUploadResults)">
</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>

<div class="row">
<div class="col-sm-12">
<uib-accordion close-others="false">
<uib-accordion-group class="algorithm-custom" is-open="settings.open">
<div uib-accordion-group class="panel-default algorithm-custom" is-open="settings.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
ng-class="{'glyphicon-chevron-down': settings.open, 'glyphicon-chevron-right': !settings.open}"></i>
Expand Down Expand Up @@ -138,15 +138,15 @@
</div>
</div>

</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>

<div class="row">
<div class="col-sm-12">
<uib-accordion close-others="false">
<uib-accordion-group class="algorithm-custom" is-open="filesToInclude.open">
<div uib-accordion-group class="panel-default algorithm-custom" is-open="filesToInclude.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
ng-class="{'glyphicon-chevron-down': filesToInclude.open, 'glyphicon-chevron-right': !filesToInclude.open}"></i>
Expand Down Expand Up @@ -193,15 +193,15 @@
</div>
</div>

</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>

<div class="row pad-bot-20">
<div class="col-sm-12">
<uib-accordion close-others="false">
<uib-accordion-group class="algorithm-custom" is-open="serverScriptsAccordionOpen">
<div uib-accordion-group class="panel-default algorithm-custom" is-open="serverScriptsAccordionOpen">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
ng-class="{'glyphicon-chevron-down': serverScriptsAccordionOpen, 'glyphicon-chevron-right': !serverScriptAccordionOpen}"></i>
Expand Down Expand Up @@ -254,7 +254,7 @@
</div>
</div>

</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -279,7 +279,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
<div class="analysis-custom">
<div class="full-width margin-top-20">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in osMeasures" class="analysis-custom" id="{{measure.instanceId}}"
<div uib-accordion-group ng-repeat="measure in osMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}"
is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
Expand Down Expand Up @@ -596,7 +596,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
<span class="glyphicon glyphicon-alert red-button"></span>&nbsp;<span>{{'analysis.algorithmic.warning' | translate}}</span>
</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -616,7 +616,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
<div class="analysis-custom">
<div class="full-width margin-top-20">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in epMeasures" class="analysis-custom" id="{{measure.instanceId}}"
<div uib-accordion-group ng-repeat="measure in epMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}"
is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
Expand Down Expand Up @@ -935,7 +935,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
<span class="glyphicon glyphicon-alert red-button"></span>&nbsp;<span>{{'analysis.algorithmic.warning' | translate}}</span>
</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -955,7 +955,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
<div class="analysis-custom">
<div class="full-width margin-top-20">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in repMeasures" class="analysis-custom" id="{{measure.instanceId}}"
<div uib-accordion-group ng-repeat="measure in repMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}"
is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button"
Expand Down Expand Up @@ -1275,7 +1275,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
<span class="glyphicon glyphicon-alert red-button"></span>&nbsp;<span>{{'analysis.algorithmic.warning' | translate}}</span>
</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
24 changes: 12 additions & 12 deletions app/app/analysis/analysis_manual.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
<div class="full-width margin-top-20">

<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in osMeasures" class="analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<div uib-accordion-group ng-repeat="measure in osMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.open, 'glyphicon-chevron-right': !measure.open}"></i>
{{measure.display_name}}
Expand Down Expand Up @@ -53,7 +53,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
<div class="col-sm-12">
<div class="analysis-descriptions">
<uib-accordion>
<uib-accordion-group is-open="measure.descOpen">
<div uib-accordion-group class="panel-default" is-open="measure.descOpen">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.descOpen, 'glyphicon-chevron-right': !measure.descOpen}"></i>
Descriptions
Expand All @@ -66,7 +66,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
<div class="col-sm-2"><label>Modeler Description</label></div>
<div class="col-sm-10">{{measure.modeler_description}}</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -83,7 +83,7 @@ <h5 class="inline measure-type" translate>analysis.openstudioMeasures</h5>
</div>
</div>
<div ng-attr-id="{{'grid_' + measure.instanceId}}" ui-if="gridOptions[measure.instanceId].data.length>0" ui-grid="gridOptions[measure.instanceId]" ui-grid-edit ui-grid-cellnav ui-grid-auto-resize ui-grid-resize-columns ui-grid-pinning class="grid" ng-style="getTableHeight(measure.instanceId)"></div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -100,7 +100,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
<div class="analysis-custom">
<div class="full-width margin-top-20">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in epMeasures" class="analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<div uib-accordion-group ng-repeat="measure in epMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.open, 'glyphicon-chevron-right': !measure.open}"></i>
{{measure.display_name}}
Expand Down Expand Up @@ -137,7 +137,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
<div class="col-sm-12">
<div class="analysis-descriptions">
<uib-accordion>
<uib-accordion-group is-open="measure.descOpen">
<div uib-accordion-group class="panel-default" is-open="measure.descOpen">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.descOpen, 'glyphicon-chevron-right': !measure.descOpen}"></i>
Descriptions
Expand All @@ -150,7 +150,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
<div class="col-sm-2"><label>Modeler Description</label></div>
<div class="col-sm-10">{{measure.modeler_description}}</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -167,7 +167,7 @@ <h5 class="inline measure-type" translate>analysis.energyplusMeasures</h5>
</div>
</div>
<div ng-attr-id="{{ 'grid_' + measure.instanceId}}" ui-if="gridOptions[measure.instanceId].data.length>0" ui-grid="gridOptions[measure.instanceId]" ui-grid-edit ui-grid-cellnav ui-grid-auto-resize ui-grid-resize-columns ui-grid-pinning class="grid" ng-style="getTableHeight(measure.instanceId)"></div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -184,7 +184,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
<div class="analysis-custom">
<div class="full-width margin-top-20">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="measure in repMeasures" class="analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<div uib-accordion-group ng-repeat="measure in repMeasures" class="panel-default analysis-custom" id="{{measure.instanceId}}" is-open="measure.open">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.open, 'glyphicon-chevron-right': !measure.open}"></i>
{{measure.display_name}}
Expand Down Expand Up @@ -221,7 +221,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
<div class="col-sm-12">
<div class="analysis-descriptions">
<uib-accordion>
<uib-accordion-group is-open="measure.descOpen">
<div uib-accordion-group class="panel-default" is-open="measure.descOpen">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5 black-button" ng-class="{'glyphicon-chevron-down': measure.descOpen, 'glyphicon-chevron-right': !measure.descOpen}"></i>
Descriptions
Expand All @@ -234,7 +234,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
<div class="col-sm-2"><label>Modeler Description</label></div>
<div class="col-sm-10">{{measure.modeler_description}}</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand All @@ -251,7 +251,7 @@ <h5 class="inline measure-type" translate>analysis.reportingMeasures</h5>
</div>
</div>
<div ng-attr-id="{{'grid_' +measure.instanceId}}" ui-if="gridOptions[measure.instanceId].data.length>0" ui-grid="gridOptions[measure.instanceId]" ui-grid-edit ui-grid-cellnav ui-grid-auto-resize ui-grid-resize-columns ui-grid-pinning class="grid" ng-style="getTableHeight(measure.instanceId)"></div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
4 changes: 2 additions & 2 deletions app/app/bcl/bcl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ <h3 class="modal-title" translate>bcl.title</h3>
<div class="bcl-custom">
<div class="bcl-custom panel-body">
<uib-accordion close-others="false">
<uib-accordion-group ng-repeat="cat1 in categories" is-open="cat1.open" class="bcl-custom">
<div uib-accordion-group ng-repeat="cat1 in categories" is-open="cat1.open" class="panel-default bcl-custom">
<uib-accordion-heading>
<i class="pull-left glyphicon pad-right-5" ng-class="{'glyphicon-chevron-down': cat1.open, 'glyphicon-chevron-right': !cat1.open}"></i>
<div class="checkbox bcl-cb">
Expand All @@ -71,7 +71,7 @@ <h3 class="modal-title" translate>bcl.title</h3>
</div>
</div>
</div>
</uib-accordion-group>
</div>
</uib-accordion>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/app/index.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ export function config($logProvider, $translateProvider, toastrConfig) {
toastrConfig.positionClass = 'toast-top-right';
toastrConfig.preventDuplicates = false; // need duplicates on BCL library view
toastrConfig.progressBar = true;
toastrConfig.toastClass = 'toastr-text';
toastrConfig.toastClass = 'toast toastr-text';

}
4 changes: 3 additions & 1 deletion app/app/index.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**********************************************************************************************************************/
// Electron
import contextMenu from '../electron/context_menu'; // eslint-disable-line no-unused-vars
import { contextMenu } from '../electron/context_menu';
contextMenu();

import {config} from './index.config';
import {routerConfig} from './index.route';
Expand Down Expand Up @@ -77,6 +78,7 @@ import {StatusBarController} from '../app/status_bar/statusBarController';
angular.module('PAT', ['ngAnimate', 'ngSanitize', 'ngMessages', 'ngAria', 'ngResource', 'pascalprecht.translate', 'ui.router', 'ui.router.stateHelper', 'ui.bootstrap', 'ui.checkbox', 'toastr', 'ui.grid', 'ui.grid.autoResize', 'ui.grid.cellNav', 'ui.grid.edit', 'ui.grid.resizeColumns', 'ui.grid.selection', 'ui.grid.pinning'])
.config(config)
.config(routerConfig)
.config(['$locationProvider', $locationProvider => $locationProvider.hashPrefix('')])
.run(runBlock)
.controller('NavController', NavController)
.controller('ModalBclController', ModalBclController)
Expand Down
8 changes: 3 additions & 5 deletions app/app/main/dependencyManagerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
import { app } from '@electron/remote';
import jetpack from 'fs-jetpack';
import AdmZip from 'adm-zip';
import https from 'https';
import os from 'os';
import path from 'path';
import url from 'url';
const env = jetpack.cwd(app.getAppPath()).read('env.json', 'json');
const manifest = jetpack.cwd(app.getAppPath()).read('manifest.json', 'json');

import { getEnv } from '../../env';
const env = getEnv(app.getAppPath());

export class DependencyManager {

Expand Down
Loading