@jakubmazanec/carson-templates 2.1.0-unstable.f120647 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "2.1.0-unstable.f120647",
+  "version": "2.1.0",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",

package/templates/projects/remix-app/Dockerfile.ejs

@@ -6,7 +6,19 @@ strategy: overwrite
 let lines = [];
 
 for (let project of workspace.projects) {
-  lines.push(`COPY --chown=nodeuser ${project.relativePath} ${project.relativePath}`);
+  if (project.config.deployment?.appName) {
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/build /workspace/${project.relativePath}/build`);
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/node_modules /workspace/${project.relativePath}/node_modules`);
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/package.json /workspace/${project.relativePath}/package.json`);
+  } else {
+    if (project.packageJson.bin) {
+      lines.push(`COPY --from=build /workspace/${project.relativePath}/bin /workspace/${project.relativePath}/bin`);
+    }
+
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/build /workspace/${project.relativePath}/build`);
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/node_modules /workspace/${project.relativePath}/node_modules`);
+    lines.push(`COPY --from=build /workspace/${project.relativePath}/package.json /workspace/${project.relativePath}/package.json`);
+  }
 }
 -%>
 #
@@ -17,34 +29,41 @@ for (let project of workspace.projects) {
 # Run `npx carson update workspace` to regenerate.
 #
 
-FROM node:20-alpine
+# Base stage
+FROM node:20-slim as base
 
-# Create a new user and change directory ownership
-RUN adduser --disabled-password  --home /app  --uid 12000  --gecos '' nodeuser
-RUN chown -R nodeuser /app
-USER nodeuser
+WORKDIR /workspace
 
-WORKDIR /app
+ENV NODE_ENV=production
 
-# Copy files
-# We need to copy files needed for installing dependencies, app, and its direct and indirect dependencies that are located in the same workspace
-COPY --chown=nodeuser package.json package.json
-COPY --chown=nodeuser package-lock.json package-lock.json
-<%- lines.join('\n') %>
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to install dependencies
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3
 
 # Install dependencies
-RUN npm ci --omit dev --ignore-scripts
+COPY --link package-lock.json package.json ./
+RUN npm ci --include=dev --ignore-scripts
 
-# Delete .npmrc. It is needed for npm install, but contains token and we don't want to leave that in a docker image.
-RUN rm .npmrc
+# Copy the workspace
+COPY --link . .
 
-# Add stuff to process.env
-ENV IS_DOCKER=true
-ENV TZ=Europe/Prague
-ENV NODE_ENV=production
-ENV NODE_OPTIONS=--enable-source-maps
+# Build
+RUN npm run build
+
+# Remove development dependencies
+RUN npm prune --omit=dev
+
+# Final stage for app image
+FROM base
 
-WORKDIR /app/<%- project.relativePath %>
+# Copy files
+COPY --from=build /workspace/node_modules /workspace/node_modules
+<%- lines.join('\n') %>
 
+# Start the server
+WORKDIR /workspace/apps/somewhere
 EXPOSE 5000
 ENTRYPOINT ["npm", "start"]

package/templates/projects/remix-app/package.json.ejs

@@ -25,7 +25,6 @@ let developmentDependencies = [
   '@types/react-dom',
   '@vitest/coverage-v8',
   'autoprefixer',
-  'cross-env',
   'del-cli',
   'eslint',
   'happy-dom',

package/templates/workspace/.dockerignore.ejs

@@ -8,8 +8,14 @@ let lines = [];
 
 for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
-    lines.push(`!${project.relativePath}/${BUILD_DIRECTORY}/**`);
+    lines.push(`!${project.relativePath}/app/**`);
+    lines.push(`!${project.relativePath}/public/**`);
+    lines.push(`!${project.relativePath}/env.d.ts`);
     lines.push(`!${project.relativePath}/package.json`);
+    lines.push(`!${project.relativePath}/postcss.config.cjs`);
+    lines.push(`!${project.relativePath}/tailwind.config.ts`);
+    lines.push(`!${project.relativePath}/tsconfig.json`);
+    lines.push(`!${project.relativePath}/vite.config.ts`);
 
   } else {
     if (project.packageJson.bin) {
@@ -23,6 +29,7 @@ for (let project of workspace.projects) {
 
 lines.push('!/package-lock.json');
 lines.push('!/package.json');
+lines.push('!/turbo.json');
 -%>
 #
 # DO NOT EDIT!
@@ -40,5 +47,5 @@ lines.push('!/package.json');
 # except files that are allowed to be in the Docker image
 <%- lines.join('\n') %>
 
-# we also need .npmrc with token; don't worry, it's deleted during Docker image creation
+# we might also need .npmrc with token
 !.npmrc

package/templates/workspace/.github/workflows/release-pull-request.yaml.ejs

@@ -104,6 +104,13 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: 'true' # must be string, not boolean
 <%
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+-%>
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+<%
+}
+
 for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
 -%>
@@ -112,7 +119,8 @@ for (let project of workspace.projects) {
         run:
           npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-unstable
         env:
-          FLY_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   }
 }

package/templates/workspace/.github/workflows/release.yaml.ejs

@@ -123,6 +123,13 @@ jobs:
         run: |
           git push --follow-tags
 <%
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+-%>
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+<%
+}
+
 for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
 -%>
@@ -131,7 +138,8 @@ for (let project of workspace.projects) {
         run:
           npm run deploy --workspace <%- project.name %>
         env:
-          FLY_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   }
 }
@@ -248,6 +256,13 @@ for (let project of workspace.projects) {
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: 'true' # must be string, not boolean
 <%
+if (workspace.projects.some((project) => project.config.deployment?.appName)) {
+-%>
+
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+<%
+}
+
 for (let project of workspace.projects) {
   if (project.config.deployment?.appName) {
 -%>
@@ -256,7 +271,8 @@ for (let project of workspace.projects) {
         run:
           npm run deploy --workspace <%- project.name %> -- --app <%- project.config.deployment?.appName %>-next
         env:
-          FLY_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_ACCESS_TOKEN: ${{ secrets.FLY_TOKEN }}
+          FLY_API_TOKEN: ${{ secrets.FLY_TOKEN }}
 <%
   }
 }

package/templates/workspace/.gitignore.ejs

@@ -254,4 +254,5 @@ web_modules/
 # Project specific files
 
 ## Build folders
+apps/**/<%- BUILD_DIRECTORY %>
 packages/**/<%- BUILD_DIRECTORY %>