Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
engine-strict=true
provenance=true
provenance=true
ignore-scripts=true
1 change: 0 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
"npm": ">=11"
},
"scripts": {
"postinstall": "node ./skip.js || run-s build:necessary",
"clean:build": "rimraf packages/*/dist packages/*/build",
"postclean:build": "npm run clean:types",
"clean:cache": "run-s clean:cache:*",
"clean:cache:eslint": "rimraf .eslintcache",
"clean:cache:jest": "jest --clearCache",
Expand All @@ -33,15 +31,14 @@
"analyze": "lerna run analyze",
"preview": "lerna run --scope=@deephaven/{code-studio,embed-widget} preview --stream",
"preview:app": "lerna run --scope=@deephaven/code-studio preview --stream",
"prestart": "npm run build:necessary",
"start": "run-p watch:types start:*",
"preview:embed-widget": "lerna run --scope=@deephaven/embed-widget preview --stream",
"dev": "run-p watch:types start:*",
"start": "run-s build:necessary dev",
"start:app": "lerna run start --scope=@deephaven/code-studio --stream",
"start:embed-widget": "lerna run start --scope=@deephaven/embed-widget --stream",
"pretest": "npm run build:necessary",
"test": "jest --watch --changedSince origin/main",
"test:debug": "node --inspect-brk node_modules/.bin/jest --config jest.config.unit.cjs --runInBand --watch",
"pretest:unit": "npm run pretest",
"test:unit": "jest --config jest.config.unit.cjs",
"test:unit": "npm run build:necessary && jest --config jest.config.unit.cjs",
"test:lint": "jest --config jest.config.lint.cjs",
"test:golden-layout": "lerna run test:ci --scope=@deephaven/golden-layout --stream",
"version-bump": "lerna version --conventional-commits --create-release github",
Expand Down
8 changes: 4 additions & 4 deletions packages/golden-layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"build": "cross-env NODE_ENV=production run-p build:*",
"build:sass": "sass --embed-sources --load-path=../../node_modules --style=compressed ./src:./dist ./scss:./css",
"build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.js,.tsx,.jsx\" --source-maps --root-mode upward",
"pretest": "npm run build",
"test": "karma start karma.conf.cjs",
"pretest:ci": "npm run pretest",
"test:ci": "karma start karma.conf.cjs --single-run"
"test": "run-s build test-start",
"test-start": "karma start karma.conf.cjs",
"test:ci": "run-s build test:ci-start",
"test:ci-start": "karma start karma.conf.cjs --single-run"
},
"repository": {
"type": "git",
Expand Down
6 changes: 0 additions & 6 deletions skip.js

This file was deleted.

7 changes: 3 additions & 4 deletions tests/docker-scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM alpine AS copy-packages
WORKDIR /work/
COPY . /tmp/web-client-ui
COPY package.json package-lock.json skip.js ./
COPY package.json package-lock.json ./
# cd first so the cp doesn't include /tmp/web-client-ui in the paths
RUN cd /tmp/web-client-ui && cp --parents ./packages/*/package.json /work/

Expand Down Expand Up @@ -50,9 +50,8 @@ COPY --from=copy-packages /work/ .
# Confirm node version is correct for debugging
RUN node --version

# Disable the postinstall script, or npm ci will try and build and the files won't be there
# We don't need the postinstall since we're going to rebuild right after
RUN SKIP_POSTINSTALL=1 npm ci
# Install npm packages
RUN npm ci

# Copy the web-client-ui src folder to the docker image
# We do this last because the source files are the most likely to change
Expand Down
Loading