Skip to content

Commit

Permalink
Merge pull request #122 from will-moore/vite.js
Browse files Browse the repository at this point in the history
Use vite.js instead of webpack
  • Loading branch information
jburel authored Jun 20, 2023
2 parents 0a59f21 + 1e72b67 commit 26a302a
Show file tree
Hide file tree
Showing 40 changed files with 1,506 additions and 5,019 deletions.
15 changes: 13 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
/node_modules/
.DS_Store
/omero_parade/static/omero_parade/js/bundle.js
/omero_parade/static/omero_parade/js/bundle.js.map
/omero_parade/static/omero_parade/js/*
*.pyc
dist
*.egg-info

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

dist-ssr
*.local
3 changes: 2 additions & 1 deletion .omeroci/app-deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

set -e
set -u
yum -y install https://rpm.nodesource.com/pub_6.x/el/7/x86_64/nodesource-release-el7-1.noarch.rpm
yum -y install epel-release
curl --silent --location https://rpm.nodesource.com/setup_16.x | sudo bash -
yum -y install nodejs
19 changes: 6 additions & 13 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ An OMERO.web app for filtering Data in OMERO.web centre panel.

For full details see `SUPPORT.md <https://github.com/ome/omero-parade/blob/master/SUPPORT.md>`_.


Requirements
------------

* OMERO 5.6.0 or newer
* Python 3.6 or newer
* OMERO.web 5.6.1 or newer.


Installing from PyPI
--------------------
Expand Down Expand Up @@ -50,26 +51,18 @@ Build

In order to build you need:

* npm version equal or greater to 3.0! npm version equal or greater than
5.2 is recommended!
* npm version equal or greater than `npm 8.19.4`.

::

$ npm install

To build an uncompressed version and automatically rebuild when source
files change, run:
To build and automatically rebuild when source files change, run:

::

$ npm run watch

To build an uncompressed version, run:

::

$ npm run build-dev

To build a compressed, minified version for production, run:

::
Expand Down Expand Up @@ -232,4 +225,4 @@ licensed under the terms of the GNU General Public License (GPL) v2 or later.
Copyright
---------

2019-2020, The Open Microscopy Environment
2019-2023, The Open Microscopy Environment
6 changes: 4 additions & 2 deletions omero_parade/templates/omero_parade/init.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
{% load static %}

<link rel="stylesheet" href="{% static 'omero_parade/css/parade.css' %}"></link>
<script src="{% static 'omero_parade/js/bundle.js' %}"></script>
<script>


<script type="module">
import omero_parade from '{% static 'omero_parade/js/bundle.js' %}';

$(function() {

Expand Down
Loading

0 comments on commit 26a302a

Please sign in to comment.