Skip to content

Commit

Permalink
merge from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
craigrbarnes committed Jan 16, 2025
2 parents 00e81fc + 7c5637a commit 0d46d28
Show file tree
Hide file tree
Showing 77 changed files with 11,655 additions and 5,256 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
node_modules
packages/core/node_modules
packages/core/dist
packages/frontend/node_modules
packages/frontend/dist
packages/tools/node_modules
packages/tools/dist
packages/sampleCommons/node_modules
packages/sampleCommons/.next
packages/sampleCommons/.swc
.git
.nx
docs
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
run: npm -v
- name: Install modules

run: npm ci
run: npm ci --include=optional
- name: Run ESLint
run: npm run lint
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,3 @@ yarn-error.log*
packages/sampleCommons/config/canine
packages/sampleCommons/config/midrc
packages/sampleCommons/config/heal
/packages/frontend/.rollup.cache/
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COPY packages/frontend/package.json ./packages/frontend/
COPY packages/sampleCommons/package.json ./packages/sampleCommons/

# Install dependencies
RUN npm ci
RUN npm ci --include=optional

# Install additional dependencies
RUN npm install \
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN addgroup --system --gid 1001 nextjs && \

# Copy built artifacts from builder
COPY --from=builder --chown=nextjs:nextjs /gen3 .

RUN apk add --no-cache bash
# Set environment variables
ENV PORT=3000
ENV NODE_ENV=production
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packages": ["packages/*"],
"version": "0.10.68"
"version": "0.10.73"
}
24 changes: 1 addition & 23 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"build": {
"cache": true,
"dependsOn": []
"dependsOn": ["^build"]
},
"build:clean": {
"dependsOn": [
Expand Down Expand Up @@ -50,28 +50,6 @@
"dev": {
"dependsOn": [
]
},
"rollup": {
"dependsOn": [
]
},
"copy-tailwind": {
"dependsOn": []
},
"start": {
"dependsOn": []
},
"build:colors": {
"dependsOn": []
},
"build:icons": {
"dependsOn": []
},
"getSchema": {
"dependsOn": []
},
"getDRSToHostname": {
"dependsOn": []
}
}
}
Loading

0 comments on commit 0d46d28

Please sign in to comment.