cc-core-cli 1.0.153 → 1.0.156

package/bin/index.js

@@ -72,6 +72,15 @@ if (action === 'upgrade') {
       return !IGNORE_FILES.find(f => name.includes(f))
     }
   })
+  try {
+    const pkgTemplate = jsonfile.readFileSync(`${__dirname}/../template/${project}/package.json`);
+    const pkgExisting = jsonfile.readFileSync('./package.json');
+    pkgExisting.dependencies = {...(pkgExisting.dependencies || {}),...(pkgTemplate.dependencies || {})};;
+    pkgExisting.devDependencies = {...(pkgExisting.devDependencies || {}),...(pkgTemplate.devDependencies || {})};
+    jsonfile.writeFileSync('./package.json', pkgExisting, { spaces: 2 });
+  } catch (e) {
+    return false
+  }
   spinner.succeed('(1/2) Copying files!')
   spinner.start('(2/2) Running npm install!')
   exec('npm install', (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.153",
+  "version": "1.0.156",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/admin/Dockerfile

@@ -1,10 +1,13 @@
-FROM node:22-alpine
+FROM node:18.20.0-alpine3.18
 
 RUN mkdir /app
 WORKDIR /app
 
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
+
 COPY package.json .
-COPY .npmrc .
 COPY . .
 RUN npm install --production
 

package/template/admin/buildspec.yml

@@ -0,0 +1,27 @@
+version: 0.2
+
+phases:
+  pre_build:
+    commands:
+      - echo Logging in to Amazon ECR...
+      - $(aws ecr get-login --no-include-email --region ap-southeast-1)
+      - REPOSITORY_URI=$ECR_URI
+      - COMMIT_HASH=$(echo $CODEBUILD_RESOLVED_SOURCE_VERSION | cut -c 1-7)
+      - IMAGE_TAG=${COMMIT_HASH:=latest}
+  build:
+    commands:
+      - echo logging in dockerhub...
+      - docker login -u $dockeruser -p $dockerpassword
+      - echo Build started on `date`
+      - echo Building the Docker image...
+      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH --build-arg NPM_TOKEN="$SHOPSTACK_TOKEN" .
+      - docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
+  post_build:
+    commands:
+      - echo Build completed on `date`
+      - echo Pushing the Docker image...
+      - docker push $REPOSITORY_URI:$IMAGE_TAG
+      - echo Writing image definitions file...
+      - printf '[{"name":"%s","imageUri":"%s"}]' $IMAGE_CONTAINER_NAME $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
+artifacts:
+    files: imagedefinitions.json

package/template/admin_v3/Dockerfile

@@ -1,15 +1,15 @@
-FROM node:22-alpine
+FROM node:18.20.0-alpine3.18
 
 RUN mkdir /app
 WORKDIR /app
 
-COPY package.json .
-RUN npm install
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
 
+COPY package.json .
 COPY . .
-
-ARG commit_hash
-ENV BUILD_ID ${commit_hash}
+RUN npm install --production
 
 RUN npm run build
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "production"]

package/template/admin_v3/buildspec.yml

@@ -0,0 +1,27 @@
+version: 0.2
+
+phases:
+  pre_build:
+    commands:
+      - echo Logging in to Amazon ECR...
+      - $(aws ecr get-login --no-include-email --region ap-southeast-1)
+      - REPOSITORY_URI=$ECR_URI
+      - COMMIT_HASH=$(echo $CODEBUILD_RESOLVED_SOURCE_VERSION | cut -c 1-7)
+      - IMAGE_TAG=${COMMIT_HASH:=latest}
+  build:
+    commands:
+      - echo logging in dockerhub...
+      - docker login -u $dockeruser -p $dockerpassword
+      - echo Build started on `date`
+      - echo Building the Docker image...
+      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH --build-arg NPM_TOKEN="$SHOPSTACK_TOKEN" .
+      - docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
+  post_build:
+    commands:
+      - echo Build completed on `date`
+      - echo Pushing the Docker image...
+      - docker push $REPOSITORY_URI:$IMAGE_TAG
+      - echo Writing image definitions file...
+      - printf '[{"name":"%s","imageUri":"%s"}]' $IMAGE_CONTAINER_NAME $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
+artifacts:
+    files: imagedefinitions.json

package/template/core/Dockerfile

@@ -5,13 +5,19 @@ RUN apk add --no-cache build-base g++ cairo-dev jpeg-dev pango-dev giflib-dev
 RUN apk add --update --repository http://dl-3.alpinelinux.org/alpine/edge/testing libmount ttf-dejavu ttf-droid ttf-freefont ttf-liberation fontconfig
 
 WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
+
+
 COPY package.json .
-COPY .npmrc .
 COPY . .
-RUN npm install -g @nestjs/cli && npm install
-RUN npm run build
 
+RUN cat .npmrc
 
+RUN npm install -g @nestjs/cli && npm install
+RUN npm run build
 
 FROM node:22.14.0-alpine3.20 as production
 
@@ -45,8 +51,12 @@ RUN fc-cache -f -v
 RUN fc-list | grep "Sarabun"
 
 WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
+
 COPY package.json .
-COPY .npmrc .
 COPY . .
 RUN npm install --only=production
 COPY --from=development /usr/src/app/dist ./dist
@@ -57,4 +67,4 @@ RUN find /usr/local/lib/node_modules -name "package-lock.json" -type f -delete
 RUN find /usr/src/app/node_modules -name "yarn.lock" -type f -delete
 RUN find /usr/src/app/node_modules -name "package-lock.json" -type f -delete
 
-CMD ["npm", "run", "start:prod"]
+CMD ["npm", "run", "start:prod"]

package/template/core/buildspec.yml

@@ -14,9 +14,7 @@ phases:
       - docker login -u $dockeruser -p $dockerpassword
       - echo Build started on `date`
       - echo Building the Docker image...
-      - sed -i "s|{{SHOPSTACK_TOKEN}}|$SHOPSATCK_TOKEN|g" .npmrc
-      - cat .npmrc
-      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH .
+      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH --build-arg NPM_TOKEN="$SHOPSTACK_TOKEN" .
       - docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
   post_build:
     commands:
@@ -26,4 +24,4 @@ phases:
       - echo Writing image definitions file...
       - printf '[{"name":"%s","imageUri":"%s"}]' $IMAGE_CONTAINER_NAME $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
 artifacts:
-    files: imagedefinitions.json
+    files: imagedefinitions.json

package/template/core_v3/Dockerfile

@@ -5,13 +5,19 @@ RUN apk add --no-cache build-base g++ cairo-dev jpeg-dev pango-dev giflib-dev
 RUN apk add --update --repository http://dl-3.alpinelinux.org/alpine/edge/testing libmount ttf-dejavu ttf-droid ttf-freefont ttf-liberation fontconfig
 
 WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
+
+
 COPY package.json .
-COPY .npmrc .
 COPY . .
-RUN npm install -g @nestjs/cli && npm install
-RUN npm run build
 
+RUN cat .npmrc
 
+RUN npm install -g @nestjs/cli && npm install
+RUN npm run build
 
 FROM node:22.14.0-alpine3.20 as production
 
@@ -45,8 +51,12 @@ RUN fc-cache -f -v
 RUN fc-list | grep "Sarabun"
 
 WORKDIR /usr/src/app
+
+ARG NPM_TOKEN
+RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc \
+    && echo "@shopstack:registry=https://registry.npmjs.org/" >> .npmrc
+
 COPY package.json .
-COPY .npmrc .
 COPY . .
 RUN npm install --only=production
 COPY --from=development /usr/src/app/dist ./dist
@@ -57,4 +67,4 @@ RUN find /usr/local/lib/node_modules -name "package-lock.json" -type f -delete
 RUN find /usr/src/app/node_modules -name "yarn.lock" -type f -delete
 RUN find /usr/src/app/node_modules -name "package-lock.json" -type f -delete
 
-CMD ["npm", "run", "start:prod"]
+CMD ["npm", "run", "start:prod"]

package/template/core_v3/buildspec.yml

@@ -14,9 +14,7 @@ phases:
       - docker login -u $dockeruser -p $dockerpassword
       - echo Build started on `date`
       - echo Building the Docker image...
-      - sed -i "s|{{SHOPSTACK_TOKEN}}|$SHOPSATCK_TOKEN|g" .npmrc
-      - cat .npmrc
-      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH .
+      - docker build --no-cache -t $REPOSITORY_URI:latest --build-arg commit_hash=$COMMIT_HASH --build-arg NPM_TOKEN="$SHOPSTACK_TOKEN" .
       - docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
   post_build:
     commands:
@@ -26,4 +24,4 @@ phases:
       - echo Writing image definitions file...
       - printf '[{"name":"%s","imageUri":"%s"}]' $IMAGE_CONTAINER_NAME $REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json
 artifacts:
-    files: imagedefinitions.json
+    files: imagedefinitions.json