Bump Node to v16 inside Docker container (#1077)

* decrement eslint version instead of bumping eslint-loader * bump nodejs version in dockerfile and github actions * Fix vendoring for staticfiles --------- Co-authored-by: Jake Rosenberg <[email protected]> Co-authored-by: Jake Rosenberg <[email protected]>
DesignSafe-CI · Jul 25, 2023 · a4ff9f9 · a4ff9f9
1 parent 417fe05
commit a4ff9f9
Show file tree

Hide file tree

Showing 10 changed files with 1,503 additions and 1,116 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,7 +52,7 @@ jobs:
  - name: Setup Node.js for use with actions
  uses: actions/setup-node@v1
  with:
- node-version: 12.x
+ node-version: 16.x
 
  - uses: actions/cache@v1
  with:

diff --git a/conf/docker/Dockerfile b/conf/docker/Dockerfile
@@ -27,8 +27,8 @@ RUN apt-get update && apt-get install -y \
  git \
  vim
 
-# install node 12.x
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+# install node 16.x
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
 RUN apt-get install -y nodejs
 
 RUN pip install poetry
@@ -49,3 +49,6 @@ USER tg458981
 RUN echo "prefix=~/.npm-global" >> ~/.npmrc
 
 WORKDIR /srv/www/designsafe
+
+RUN npm ci
+RUN npm run build
diff --git a/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2 b/designsafe/apps/applications/templates/designsafe/apps/applications/index.j2
@@ -25,7 +25,6 @@
 <script type="text/javascript" src="{% static 'vendor/objectpath/lib/ObjectPath.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/schema-form.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/bootstrap-decorator.js' %}"></script>
-<script type="text/javascript" src="{% static 'vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-xeditable/dist/js/xeditable.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/codemirror/lib/codemirror.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-ui-codemirror/src/ui-codemirror.js' %}"></script>

diff --git a/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2 b/designsafe/apps/workspace/templates/designsafe/apps/workspace/index.j2
@@ -40,7 +40,6 @@
 <script type="text/javascript" src="{% static 'vendor/objectpath/lib/ObjectPath.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/schema-form.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-schema-form/dist/bootstrap-decorator.js' %}"></script>
-<script type="text/javascript" src="{% static 'vendor/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/angular-xeditable/dist/js/xeditable.js' %}"></script>
 <script src="{% static 'vendor/angular-ui-codemirror/src/ui-codemirror.js' %}"></script>
 {% endaddtoblock %}

diff --git a/designsafe/settings/common_settings.py b/designsafe/settings/common_settings.py
@@ -248,7 +248,6 @@
  ('vendor/font-awesome', os.path.join(BASE_DIR, 'node_modules', 'font-awesome')),
  ('vendor/angular-toastr', os.path.join(BASE_DIR, 'node_modules', 'angular-toastr')),
  ('vendor/slick-carousel', os.path.join(BASE_DIR, 'node_modules', 'slick-carousel')),
- ('vendor/angular-drag-and-drop-lists', os.path.join(BASE_DIR, 'node_modules', 'angular-drag-and-drop-lists')),
  ('vendor/angular-xeditable', os.path.join(BASE_DIR, 'node_modules', 'angular-xeditable')),
  ('vendor/leaflet-measure', os.path.join(BASE_DIR, 'node_modules', 'leaflet-measure')),
  ('vendor/exif-js', os.path.join(BASE_DIR, 'node_modules', 'exif-js')),

diff --git a/designsafe/static/scripts/applications/app.js b/designsafe/static/scripts/applications/app.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import angular from 'angular';
 import _ from 'underscore';
+import dndlists from 'angular-drag-and-drop-lists';
 
 import './services/apps-wizard-service';
 

diff --git a/designsafe/static/scripts/workspace/app.js b/designsafe/static/scripts/workspace/app.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import angular from 'angular';
 import _ from 'underscore';
+import dndlists from 'angular-drag-and-drop-lists';
 
 
 import { agaveFilePicker } from '../workspace/directives/agave-file-picker';

diff --git a/designsafe/static/styles/ng-designsafe-ef.css b/designsafe/static/styles/ng-designsafe-ef.css
@@ -755,7 +755,7 @@ a[ng-click]:hover {
 
 @font-face {
 font-family: 'DesignSafe-Apps';
- src: url('/static/fonts/DesignSafe-App-Icons.ttf') format('truetype');
+ src: url('/static/fonts/Tools-and-Applications-Icons.ttf') format('truetype');
  font-weight: normal;
  font-style: normal;
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
  "clean-webpack-plugin": "^3.0.0",
  "css-loader": "^5.0.0",
  "elasticdump": "^3.3.7",
- "eslint": "^7.2.0",
+ "eslint": "^6.0.0",
  "eslint-config-airbnb-base": "^14.2.0",
  "eslint-config-prettier": "^6.7.0",
  "eslint-config-standard": "^14.1.0",