Skip to content

Commit

Permalink
Update npm version to 8.19.2
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Marston <[email protected]>
  • Loading branch information
richardmarston committed Jan 13, 2023
1 parent a192d77 commit 62cc137
Show file tree
Hide file tree
Showing 25 changed files with 12 additions and 12,451 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY cimsvg /pintura/cimsvg
COPY index.html Makefile package-lock.json package.json /pintura/

WORKDIR /pintura
RUN npm install -g npm@8.14.0
RUN npm install -g npm@8.19.2
RUN npm run build

FROM nginx
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ COPY images /pintura/images
COPY test/ /pintura/test
COPY cimmenu /pintura/cimmenu
COPY cimsvg /pintura/cimsvg
COPY index.html Makefile package-lock.json package.json /pintura/
COPY buildFlags.sh index.html Makefile package-lock.json package.json /pintura/

WORKDIR /pintura
RUN npm install -g npm@8.14.0
RUN npm install -g npm@8.19.2
RUN npm run build-dev

FROM nginx
Expand Down
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
# Pintura

## Running in nginx server mode

### Install Docker

```bash
$ sudo apt-get update
$ sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common
$ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
$ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
$ sudo apt-get update
$ sudo apt-get install -y docker-ce
$ sudo usermod -aG docker $USER
$ exit # You have to log out and back in to apply the group change in the previous step
```
## Getting Started

### Build Docker image

Expand Down
4 changes: 2 additions & 2 deletions cimmenu/cgmes/createCgmesIndex.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const fg = require("fast-glob");
const path = require("path");
import fg from "fast-glob";
import path from "path";
const stream = fg.stream([ "./src/*.js" ]);
const entries = [];

Expand Down
1 change: 1 addition & 0 deletions cimmenu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"build": "npm install && npm run createIndex && npm run package",
"build-dev": "npm install && export ROLLUP_FLAGS=' --sourcemap inline'; export ESLINT_FLAGS=' --rule no-console:off '; npm config set mode development && npm run build"
},
"type": "module",
"dependencies": {
"@babel/preset-env": "*",
"@babel/preset-react": "*",
Expand Down
4 changes: 2 additions & 2 deletions cimmenu/templates/createIndex.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const fg = require("fast-glob");
const path = require("path");
import fg from "fast-glob";
import path from "path";
const stream = fg.stream(["**/*.handlebars"]);
const entries = [];

Expand Down
4 changes: 3 additions & 1 deletion cimsvg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
"build": "rollup -c ${ROLLUP_FLAGS}",
"test": ""
},
"type": "module",
"dependencies": {
"@babel/preset-env": "*",
"@babel/preset-react": "*",
"@rollup/plugin-babel": "*",
"@rollup/plugin-replace": "*",
"rollup-plugin-handlebars-plus": "*",
"rollup-plugin-string": "*",
"rollup-plugin-svgo": "*"
"rollup-plugin-svgo": "*",
"rollup": "*"
}
}
Loading

0 comments on commit 62cc137

Please sign in to comment.