generator-reshow 0.17.70 → 0.17.72

package/generators/docker/templates/install-packages.sh

@@ -28,7 +28,7 @@ echo "###"
 echo ""
 echo $UPGRADE
 
-apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL --upgrade $UPGRADE
+apk add --virtual .build-deps $BUILD_DEPS && apk add $INSTALL --upgrade $UPGRADE || exit 2
 
 #/* put your install code here */#
 

package/generators/gitlab-docker/__tests__/Test.js

@@ -18,6 +18,7 @@ describe("!! gitlab-docker !!", () => {
         isReady: true,
         description: "foo-desc",
         keyword: "foo-keyword",
+        tags: "",
       },
     });
   });
@@ -33,7 +34,7 @@ describe("!! gitlab-docker !!", () => {
   });
 
   it("should have file", () => {
-    assert.file([".gitlab-ci.yml", ".gitlab-trigger.yml"]);
+    assert.file([".gitlab-ci.yml", ".gitlab/.gitlab-trigger.yml"]);
   });
 
   it("should have content", () => {

package/generators/gitlab-docker/index.js

@@ -26,15 +26,17 @@ module.exports = class extends YoGenerator {
    * https://github.com/SBoudrias/Inquirer.js
    */
   async prompting() {
-    const {
-      handleAnswers,
-      promptChainAll,
-    } = YoHelper(this);
+    const { handleAnswers, promptChainAll } = YoHelper(this);
 
     const prompts = [
       ...commonPrompt.mainName(this),
       ...commonPrompt.desc(this),
       ...commonDockerPrompt(this),
+      {
+        type: "input",
+        name: "tags",
+        message: "Please input your gitlab tags and separate by comma",
+      },
     ];
 
     const answers = await promptChainAll(prompts);
@@ -51,15 +53,26 @@ module.exports = class extends YoGenerator {
   writing() {
     this.env.options.nodePackageManager = "yarn";
     this.options.skipInstall = true;
-    const { cp,  chMainName } = YoHelper(this);
+    const { cp, chMainName } = YoHelper(this);
 
     // handle change to new folder
     chMainName(this.mainName);
 
+    if (this.payload.tags) {
+      let tags = this.payload.tags;
+      if (tags.split) {
+        tags = this.payload.tags.split(",");
+        this.payload.tags = tags;
+      }
+      this.payload.tagJson = JSON.stringify(tags.map((item) => item.trim()));
+    } else {
+      this.payload.tagJson = "";
+    }
+
     // handle copy file
     cp("Dockerfile", null, this.payload);
     cp("README.md", null, this.payload);
     cp(".gitlab-ci.yml", null, this.payload);
-    cp(".gitlab-trigger.yml", null, this.payload);
+    cp(".gitlab/.gitlab-trigger.yml", null, this.payload);
   }
 };

package/generators/gitlab-docker/templates/.gitlab-ci.yml

@@ -6,22 +6,20 @@ stages:
   - deploy
 
 variables:
-  LATEST_TAG: <%= verPrefix %>0.0.0
+  LATEST_TAG: 0.0.0
   LAST_IMAGE_STORE: ./last-image
 
 .parallel:
   parallel:
     matrix:
-      - dockerTag: [<%= verPrefix %>0.0.0]
+      - dockerTag: [0.0.0]
 
 default:
   before_script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   after_script:
     - docker logout
-  tags:
-    - swarm-cluster
-    - docker
+  tags: <%= tagJson %> 
 
 # https://docs.gitlab.com/ee/ci/yaml/index.html
 info-section:
@@ -29,8 +27,8 @@ info-section:
   stage: info
   script:
     - echo "Display Information"
+    - export
     - date
-    - echo "$CI_PIPELINE_ID"
 
 pre-test:
   stage: test
@@ -50,7 +48,8 @@ build-docker-image:
     - echo $IMAGE_NAME > $LAST_IMAGE_STORE
     - echo $IMAGE_NAME
     - echo 'Start build docker images:' $dockerTag
-    - DOCKER_BUILDKIT=1 docker build -f Dockerfile --target $dockerTag -t $IMAGE_NAME .
+    # - DOCKER_BUILDKIT=1 docker build -f Dockerfile --target $dockerTag -t $IMAGE_NAME .
+    - DOCKER_BUILDKIT=1 docker build -f Dockerfile -t $IMAGE_NAME .
     - docker images | head -10 || trap '' PIPE
     - docker push $IMAGE_NAME
   artifacts:
@@ -62,7 +61,7 @@ e2e-test:
   needs: ["build-docker-image"]
   trigger:
     include:
-      - local: .gitlab-trigger.yml
+      - local: .gitlab/.gitlab-trigger.yml
 
 put-to-stable:
   extends: .parallel

package/generators/library/templates/package.json

@@ -21,14 +21,16 @@
     "reshow-unit": "*"
   },
   "scripts": {
-    "clean": "find ./build -name '*.*' | xargs rm -rf",
-    "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --root-mode upward",
-    "build:es": "BABEL_ENV=es babel src -d build/es/src --root-mode upward",
-    "build": "npm run clean && npm run build:cjs && npm run build:es",
-    "mochaFor": "mocha -r jsdom-global/register",
-    "mocha": "npm run mochaFor -- 'build/cjs/**/__tests__/*.js'",
+    "build:cjs": "BABEL_ENV=cjs babel src -d build/cjs/src --ignore /**/__tests__ --root-mode upward",
+    "build:es": "BABEL_ENV=es babel src -d build/es/src --out-file-extension .mjs --root-mode upward",
+    "build:type": "npx -p typescript tsc src/*.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --declarationDir types",
+    "build": "npm run clean && npm run build:cjs && npm run build:es && npm run build:type",
+    "mochaFor": "mocha -r global-jsdom/register",
+    "mocha": "npm run mochaFor -- 'build/es/**/__tests__/*.mjs'",
+    "test:report": "npm run build && npm run mochaFor -- --reporter mocha-junit-reporter --reporter-options mochaFile=./test_output/mocha.xml 'build/es/**/__tests__/*.mjs'",
     "test": "npm run build && npm run mocha",
     "prepublishOnly": "npm run test"
   },
-  "files": ["build", "package.json", "README.md"]
+  "types": "./types/index.d.ts",
+  "files": ["types", "build", "package.json", "README.md"]
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.17.70",
+  "version": "0.17.72",
   "name": "generator-reshow",
   "repository": {
     "type": "git",