From c7f157db9c6c0a2f18739959d0626c2eb09cf8c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 23 Apr 2023 01:13:14 +0200 Subject: [PATCH] build: cleanup scripts usage with pnpm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- docker/Dockerfile | 4 ++-- package.json | 16 ++++++++-------- ui/web/README.md | 6 +++--- ui/web/package.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 14926f00..c2785752 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,7 +13,7 @@ RUN set -ex \ && pnpm set progress=false \ && pnpm config set depth 0 \ && pnpm install \ - && pnpm run build \ + && pnpm build \ && apk del .gyp # Build simulator dashboard @@ -25,7 +25,7 @@ RUN set -ex \ && pnpm set progress=false \ && pnpm config set depth 0 \ && pnpm install \ - && pnpm run build + && pnpm build FROM node:lts-alpine diff --git a/package.json b/package.json index 13f41a62..6b36570c 100644 --- a/package.json +++ b/package.json @@ -45,19 +45,19 @@ "preinstall": "node skip-preinstall.cjs || npx --yes only-allow pnpm", "prepare": "node prepare.cjs", "build-requirements": "node --no-warnings build-requirements.mjs", - "start": "pnpm run build && cross-env NODE_ENV=production node -r source-map-support/register dist/start.mjs", - "start:dev": "pnpm run build:dev && cross-env NODE_ENV=development node -r source-map-support/register dist/start.mjs", - "start:dev:debug": "pnpm run build:dev && cross-env NODE_ENV=development node -r source-map-support/register --inspect dist/start.mjs", + "start": "pnpm build && cross-env NODE_ENV=production node -r source-map-support/register dist/start.mjs", + "start:dev": "pnpm build:dev && cross-env NODE_ENV=development node -r source-map-support/register dist/start.mjs", + "start:dev:debug": "pnpm build:dev && cross-env NODE_ENV=development node -r source-map-support/register --inspect dist/start.mjs", "start:prof": "cross-env NODE_ENV=production node -r source-map-support/register --prof dist/start.mjs", "start:doctorprof": "cross-env NODE_ENV=production clinic doctor -- node -r source-map-support/register dist/start.mjs", "start:flameprof": "cross-env NODE_ENV=production clinic flame -- node -r source-map-support/register dist/start.mjs", "start:bubbleprof": "cross-env NODE_ENV=production clinic bubbleprof -- node -r source-map-support/register dist/start.mjs", "start:heapprofiler": "cross-env NODE_ENV=production clinic heapprofiler -- node -r source-map-support/register dist/start.mjs", - "rollup": "pnpm run build-requirements && rollup --config", - "build": "pnpm run rollup", - "build:cf": "pnpm run clean:node_modules && npx cross-env SKIP_PREINSTALL=1 npm install && pnpm run rollup", - "build:dev": "pnpm run rollup -- --environment BUILD:development", - "build:dev:watch": "pnpm run rollup -- --environment BUILD:development --watch", + "rollup": "pnpm build-requirements && rollup --config", + "build": "pnpm rollup", + "build:cf": "pnpm clean:node_modules && npx cross-env SKIP_PREINSTALL=1 npm install && pnpm rollup", + "build:dev": "pnpm rollup -- --environment BUILD:development", + "build:dev:watch": "pnpm rollup -- --environment BUILD:development --watch", "clean:dist": "npx rimraf dist", "clean:node_modules": "npx rimraf node_modules", "lint": "cross-env TIMING=1 eslint --cache --ext .js,.cjs,.mjs,.ts src", diff --git a/ui/web/README.md b/ui/web/README.md index 6e554a49..9bf60075 100644 --- a/ui/web/README.md +++ b/ui/web/README.md @@ -36,7 +36,7 @@ pnpm start #### Compiles and run for development ```shell -pnpm run serve +pnpm serve ``` #### Try it out @@ -51,11 +51,11 @@ For both options above you can then follow the link displayed in the terminal at ### Compiles and minifies for production ```shell -pnpm run build +pnpm build ``` ### Lints files ```shell -pnpm run lint +pnpm lint ``` diff --git a/ui/web/package.json b/ui/web/package.json index 7105014f..23e3acbd 100644 --- a/ui/web/package.json +++ b/ui/web/package.json @@ -10,7 +10,7 @@ }, "scripts": { "preinstall": "npx --yes only-allow pnpm", - "start": "pnpm run build && node start.js", + "start": "pnpm build && node start.js", "serve": "vue-cli-service serve", "build": "vue-cli-service build", "clean:dist": "npx rimraf dist", -- 2.34.1