@duetds/cli 2.6.11 → 2.7.0

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@duetds/cli",
-  "version": "2.6.11",
+  "version": "2.7.0",
   "description": "This package includes Duet Design System CLI.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "LocalTapiola Services Ltd <duetdesignsystem@lahitapiola.fi>",
   "main": "src/index.js",
   "bin": {
     "@duetds/cli": "bin/create-duet-app",
+    "cda": "bin/create-duet-app",
     "create-duet-app": "bin/create-duet-app"
   },
   "files": [
@@ -21,17 +22,15 @@
     "test:ci": "echo no cli tests yet"
   },
   "dependencies": {
-    "arg": "4.1.3",
-    "chalk": "3.0.0",
+    "arg": "5.0.1",
+    "chalk": "5.0.0",
     "esm": "3.2.25",
-    "execa": "4.0.0",
-    "inquirer": "7.0.4",
+    "inquirer": "8.2.0",
     "listr": "0.14.3",
-    "ncp": "2.0.0",
-    "pkg-install": "1.0.0"
+    "ncp": "2.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "82c1e6f02105189828663a62d980e570239f3e33"
+  "gitHead": "e010002361f155b3b27f8d7b52bc3c4ebdebd2e6"
 }

package/src/index.js

@@ -1,16 +1,28 @@
 import arg from "arg"
+import fs from "fs"
 import inquirer from "inquirer"
+
 import { createProject } from "./main"
 
+const isVersioned = ["angular", "react", "eleventy","eleventy-ssr","html"]
+const versionObject = isVersioned.reduce((a, v) => ({ ...a, [v]: v}), {})
+// load directory names of /templates/
+for (const [key, value] of Object.entries(versionObject)) {
+  const versions = fs.readdirSync(`./templates/${key}`).filter(f => !f.startsWith("."))
+  versionObject[key] =versions
+}
+
 function parseArgumentsIntoOptions(rawArgs) {
   const args = arg(
     {
       "--git": Boolean,
       "--install": Boolean,
       "--title": String,
+      "--version": String,
       "-g": "--git",
       "-i": "--install",
       "-t": "--title",
+      "-v": "--version",
     },
     {
       argv: rawArgs.slice(2),
@@ -21,6 +33,7 @@ function parseArgumentsIntoOptions(rawArgs) {
     title: args._[0],
     template: args._[0],
     runInstall: args["--install"] || true,
+    version: args["--version"] || false,
   }
 }
 
@@ -47,6 +60,13 @@ async function promptForMissingOptions(options) {
     })
   }
 
+  questions.push({
+    type: "list",
+    name: "version",
+    message: "Which version would you like to use?",
+    choices: (answers)=>(versionObject[answers.template.toLowerCase()])
+  })
+
   questions.push({
     type: "input",
     name: "title",
@@ -68,6 +88,7 @@ async function promptForMissingOptions(options) {
     ...options,
     template: options.template || answers.template,
     targetDirectory: options.title || answers.title,
+    version: options.version || answers.version,
     git: options.git || answers.git,
   }
 }

package/src/main.js

@@ -1,16 +1,15 @@
 import chalk from "chalk"
 import fs from "fs"
+import Listr from "listr"
 import ncp from "ncp"
 import path from "path"
 import { fileURLToPath } from "url"
 import { promisify } from "util"
-import execa from "execa"
-import Listr from "listr"
-import { projectInstall } from "pkg-install"
 
 const access = promisify(fs.access)
 const rename = promisify(fs.rename)
 const copy = promisify(ncp)
+const execSync = promisify(require("child_process").exec)
 
 async function copyTemplateFiles(options) {
   return copy(options.templateDirectory, options.targetDirectory, {
@@ -31,17 +30,14 @@ async function createDeployAutomation(options) {
 }
 
 async function initGit(options) {
-  const createRepo = await execa("git", ["init"], {
-    cwd: options.targetDirectory,
-  })
+
+  const createRepo = await execSync("git init", { encoding: "utf8", cwd: options.targetDirectory })
 
   if (createRepo.failed) {
     throw new Error("Failed to initialize git")
   }
 
-  const renameBranch = await execa("git", ["checkout", "-b", "main"], {
-    cwd: options.targetDirectory,
-  })
+  const renameBranch = await execSync("git checkout -b main", { encoding: "utf8", cwd: options.targetDirectory })
 
   if (renameBranch.failed) {
     throw new Error("Failed to create main branch")
@@ -57,7 +53,14 @@ export async function createProject(options) {
   // this normalises path in windows and unix environments
   const currentFilePath = fileURLToPath(import.meta.url)
 
-  const templateDir = path.resolve(currentFilePath, "..", "..", "templates", options.template.toLowerCase())
+  const templateDir = path.resolve(
+    currentFilePath,
+    "..",
+    "..",
+    "templates",
+    options.template.toLowerCase(),
+    options.version
+  )
   const actionsDir = path.join(path.resolve(currentFilePath, "..", ".."), ".github")
   const sharedDir = path.resolve(currentFilePath, "..", "..", "shared")
   options.templateDirectory = templateDir
@@ -72,7 +75,7 @@ export async function createProject(options) {
     process.exit(1)
   }
 
-    try {
+  try {
     await access(actionsDir, fs.constants.R_OK)
   } catch (err) {
     console.log(err)
@@ -83,15 +86,15 @@ export async function createProject(options) {
   const tasks = new Listr([
     {
       title: "Copy project files",
-      task: () => copyTemplateFiles(options),
+      task: async () => await copyTemplateFiles(options),
     },
     {
       title: "Copy Github Actions files",
-      task: () => copyActionsFiles(options),
+      task: async () => await copyActionsFiles(options),
     },
     {
       title: "Create build and deploy automation",
-      task: () => createDeployAutomation(options),
+      task: async () => await createDeployAutomation(options),
     },
     {
       title: "Configure git, npm, prettier, package.json",
@@ -104,15 +107,12 @@ export async function createProject(options) {
     },
     {
       title: "Initialize git",
-      task: () => initGit(options),
+      task: async () => await initGit(options),
       enabled: () => options.git,
     },
     {
       title: "Install dependencies",
-      task: () =>
-        projectInstall({
-          cwd: options.targetDirectory,
-        }),
+      task: async () => await execSync(`npm i --legacy-peer-deps`, { encoding: "utf8", cwd: options.targetDirectory }),
       skip: () => (!options.runInstall ? "Pass --install to automatically install dependencies" : undefined),
     },
   ])

package/templates/angular/12.2.16/.browserlistrc

@@ -0,0 +1,16 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR

package/templates/angular/12.2.16/.depcheckrc

@@ -0,0 +1,2 @@
+ignores: ["eslint*", "@angular-eslint/*","ngx-toastr","@types/*","husky","prettier", " @typescript-eslint/*"]
+skip-missing: true

package/templates/angular/12.2.16/.editorconfig

@@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

package/templates/angular/12.2.16/.eslintrc.json

@@ -0,0 +1,51 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "app",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "app",
+            "style": "kebab-case"
+          }
+        ],
+        "@angular-eslint/no-empty-lifecycle-method": "off"
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}

package/templates/angular/12.2.16/.prettierrc

@@ -0,0 +1,14 @@
+{
+  "printWidth": 120,
+  "singleQuote": false,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "semi": false,
+  "requirePragma": false,
+  "insertPragma": false,
+  "useTabs": false,
+  "tabWidth": 2,
+  "arrowParens": "avoid",
+  "proseWrap": "preserve"
+}

package/templates/angular/12.2.16/LICENSE.md

@@ -0,0 +1,29 @@
+# License
+
+## Authorization to access
+
+Subject to these terms of use, LocalTapiola Services Ltd, on behalf of itself and the companies belonging to the same financial conglomerate (hereafter, individually and collectively, “LocalTapiola”) hereby grants you a limited, non-exclusive, revocable license to access and use the Duet Design System (the “Package”) solely for the purpose of performing your duties for and on behalf of LocalTapiola (the “Purpose”).
+
+Except for the Purpose, you may not access or use the Package or reproduce, retransmit, disseminate, sell, publish, broadcast or use any of the information, content or materials available through it for any reason.
+
+By accessing and using this Package, you agree to be bound by these terms of use.
+
+## Copyright
+
+LocalTapiola reserves all copyrights, trademarks and other intellectual property rights in and to the Package and all content on the Package, as well as to any information or materials derived from them. All content and material available through the Package are the copyrighted property of LocalTapiola.
+
+## Trademarks
+
+“Duet Design System” is a registered trademark of LocalTapiola. All other marks, whether registered or not, that are associated with any LocalTapiola or Turva product or service are trademarks or service marks of LocalTapiola Services Ltd. All non-LocalTapiola names or marks, if any, appearing in the Package are the property of their respective owners.
+
+## Disclaimer
+
+The use of the Package is at the sole responsibility of the user. The Package is provided “as is” and “as available” without express or implied warranty or condition of any kind. LocalTapiola may at any time make changes to the Package or any of its features or functionalities. LocalTapiola also reserves the right to modify or discontinue, temporarily or permanently, functions and features of the Package, with or without notice, all without liability to you, except where prohibited by law, for any interruption, modification, or discontinuation of the Package or any of its features or functionalities.
+
+## Limitation of liability
+
+To the fullest extent permitted by law, LocalTapiola accepts no liability to user or any third party for any damages, including without limitation, indirect or consequential damages or any damages whatsoever arising from use or loss of use of the Package or its content.
+
+## Governing law
+
+These Terms and your use of the Package shall be governed by and construed in accordance with the substantive laws of Finland.

package/templates/angular/{README.md → 12.2.16/README.md}

@@ -1,6 +1,6 @@
-# Duet Angular Template
+# Duet Angular Example
 
-This an Angular project (generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.0.4) template for [Duet Design System](https://www.duetds.com). This starter template comes with support for [Duet Web Components](https://www.duetds.com/components/).
+An example app built with [@duetds/angular](https://www.npmjs.com/package/@duetds/angular), demonstrating basic form handling.
 
 ## Features
 
@@ -21,10 +21,12 @@ Run `ng generate component component-name` to generate a new component. You can
 
 Run `npm run build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
 
+## Notes
+This has been tested using latest node at version 17.6.0, you may need to use `npm i --legacy-peer-deps` in order to complete installation
 ## Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
 
 ## Copyright
 
-Copyright © 2020 LocalTapiola Services Ltd. For license, please see LICENSE.md.
+Copyright © 2020 LocalTapiola Services Ltd. For license, please see LICENSE.md.

package/templates/angular/{angular.json → 12.2.16/angular.json}

@@ -83,7 +83,8 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "duet-angular-template:build"
+            "browserTarget": "duet-angular-template:build",
+            "port": 4200
           },
           "configurations": {
             "production": {
@@ -98,10 +99,20 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
+        },
+        "test": {
+          "builder": "@angular-builders/jest:run",
           "options": {
-            "tsConfig": ["tsconfig.app.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": "tsconfig.spec.json",
+            "configPath" : "config/jest.base.ts",
+            "globalMocks": ["getComputedStyle", "doctype", "styleTransform", "matchMedia"]
           }
         }
       }

package/templates/angular/12.2.16/config/jest.base.ts

@@ -0,0 +1,17 @@
+const { pathsToModuleNameMapper } = require('ts-jest');
+const { compilerOptions } = require('../tsconfig.spec.json');
+
+module.exports = {
+  preset: 'jest-preset-angular',
+  roots: ['<rootDir>/src/'],
+  setupFilesAfterEnv: ["<rootDir>/config/jest.setup.ts"],
+  collectCoverage: true,
+  coverageReporters: ['html'],
+  coverageDirectory: 'coverage/my-app',
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
+    prefix: '<rootDir>/'
+  }),
+   testPathIgnorePatterns : [
+      "<rootDir>/src/tests/playwright/" 
+    ]
+};

package/templates/angular/12.2.16/config/jest.setup.ts

@@ -0,0 +1,24 @@
+import 'jest-preset-angular/setup-jest';
+
+
+Object.defineProperty(window, 'CSS', {value: null});
+Object.defineProperty(window, 'getComputedStyle', {
+  value: () => {
+    return {
+      display: 'none',
+      appearance: ['-webkit-appearance']
+    };
+  }
+});
+
+Object.defineProperty(document, 'doctype', {
+  value: '<!DOCTYPE html>'
+});
+Object.defineProperty(document.body.style, 'transform', {
+  value: () => {
+    return {
+      enumerable: true,
+      configurable: true
+    };
+  }
+});

package/templates/angular/12.2.16/package.file

@@ -0,0 +1,58 @@
+{
+  "name": "duet-angular-template",
+  "version": "13.2.4",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng lint; npm run serve",
+    "serve": "ng serve --host=0.0.0.0 --poll 500 --disableHostCheck=true",
+    "serve:daemon": "ng serve --host=0.0.0.0 --poll 500 --disableHostCheck=true &",
+    "build": "ng build",
+    "test": "ng test --watch=true --source-map=true --code-coverage --browsers Chrome",
+    "test:ci": "DEBUG=pw:webserver npx playwright test",
+    "lint": "ng lint"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "12.2.16",
+    "@angular/common": "12.2.16",
+    "@angular/compiler": "12.2.16",
+    "@angular/core": "12.2.16",
+    "@angular/forms": "12.2.16",
+    "@angular/platform-browser": "12.2.16",
+    "@angular/platform-browser-dynamic": "12.2.16",
+    "@angular/router": "12.2.16",
+    "@duetds/angular": "latest",
+    "@duetds/css": "latest",
+    "@duetds/icons": "latest",
+    "@duetds/tokens": "latest",
+    "rxjs": "7.5.4",
+    "tslib": "2.3.1",
+    "zone.js": "0.11.4"
+  },
+  "devDependencies": {
+    "@angular-builders/jest": "12.1.2",
+    "@angular-devkit/build-angular": "12.2.16",
+    "@angular-eslint/builder": "12.7.0",
+    "@angular-eslint/eslint-plugin": "12.7.0",
+    "@angular-eslint/eslint-plugin-template": "12.7.0",
+    "@angular-eslint/schematics": "12.7.0",
+    "@angular-eslint/template-parser": "12.7.0",
+    "@angular/cli": "12.2.16",
+    "@angular/compiler-cli": "12.2.16",
+    "@playwright/test": "1.19.2",
+    "@types/jest": "27.4.1",
+    "@types/node": "17.0.21",
+    "@typescript-eslint/eslint-plugin": "5.13.0",
+    "@typescript-eslint/parser": "5.13.0",
+    "codelyzer": "6.0.2",
+    "eslint": "8.10.0",
+    "eslint-config-prettier": "8.4.0",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-prefer-arrow": "1.2.3",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-unused-imports": "2.0.0",
+    "jest": "27.5.1",
+    "ts-node": "10.6.0",
+    "typescript": "4.3.5"
+  }
+}

package/templates/angular/12.2.16/playwright.config.ts

@@ -0,0 +1,26 @@
+// playwright.config.ts
+import { PlaywrightTestConfig, devices } from '@playwright/test';
+
+const config: PlaywrightTestConfig = {
+  testDir:"src/tests/playwright",
+  retries: process.env.CI ? 2 : 0,
+  use: {
+    trace: 'on-first-retry',
+    viewport: { width: 2080, height: 2020 },
+    ignoreHTTPSErrors: true,    
+    video: 'on-first-retry'
+  },
+  webServer: {
+    command: 'npx ng serve',
+    url:"http://localhost:4200/#/",
+    timeout: 120 * 1000,
+    reuseExistingServer: false
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    }
+  ],
+};
+export default config;

package/templates/angular/12.2.16/src/app/agreement.model.ts

@@ -0,0 +1,3 @@
+export class Agreement {
+  constructor(public readonly label: string, public readonly price: number) {}
+}

package/templates/angular/12.2.16/src/app/app-routing.module.ts

@@ -0,0 +1,11 @@
+import { NgModule } from "@angular/core"
+import { Routes, RouterModule } from "@angular/router"
+import { IndexPageComponent } from "./index-page/index-page.component"
+
+const routes: Routes = [{ path: "", component: IndexPageComponent }]
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes, { scrollPositionRestoration: "enabled", useHash: true })],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}

package/templates/angular/{src → 12.2.16/src}/app/app.component.ts

@@ -3,7 +3,7 @@ import { Component } from "@angular/core"
 @Component({
   selector: "app-root",
   templateUrl: "./app.component.html",
-  styleUrls: ["./app.component.scss"],
+  styleUrls: ["./app.component.scss"]
 })
 export class AppComponent {
   constructor() {}

package/templates/angular/{src → 12.2.16/src}/app/app.module.ts

@@ -6,22 +6,16 @@ import { AppRoutingModule } from "./app-routing.module"
 import { AppComponent } from "./app.component"
 import { FormsModule, ReactiveFormsModule } from "@angular/forms"
 import { IndexPageComponent } from "./index-page/index-page.component"
-import { InjuriesPageComponent } from "./injuries-page/injuries-page.component"
-import { InsurancePageComponent } from "./insurance-page/insurance-page.component"
 import { HeaderComponent } from "./header/header.component"
 import { FooterComponent } from "./footer/footer.component"
+import { InvestmentAmountComponent } from './investment-amount/investment-amount.component';
+import { InvestmentOriginComponent } from './investment-origin/investment-origin.component';
+import { SummaryComponent } from './summary/summary.component'
 
 @NgModule({
-  declarations: [
-    AppComponent,
-    IndexPageComponent,
-    InjuriesPageComponent,
-    InsurancePageComponent,
-    HeaderComponent,
-    FooterComponent,
-  ],
+  declarations: [AppComponent, IndexPageComponent, HeaderComponent, FooterComponent, InvestmentAmountComponent, InvestmentOriginComponent, SummaryComponent],
   imports: [BrowserModule, FormsModule, ReactiveFormsModule, DuetComponents, AppRoutingModule],
   providers: [],
-  bootstrap: [AppComponent],
+  bootstrap: [AppComponent]
 })
 export class AppModule {}

package/templates/angular/12.2.16/src/app/currency-formatter.service.ts

@@ -0,0 +1,12 @@
+import { Injectable } from "@angular/core"
+import { currencyFormatFI } from "../utils/string.utils"
+
+@Injectable({
+  providedIn: "root"
+})
+export class CurrencyFormatterService {
+
+  format(value: number) {
+    return currencyFormatFI.format(value)
+  }
+}

package/templates/angular/12.2.16/src/app/footer/footer.component.html

@@ -0,0 +1,22 @@
+<duet-footer
+  variation="simple"
+  language="fi"
+  [menu]="[
+    {
+      label: 'Turvallisuus ja käyttöehdot',
+      href: '#',
+      external: 'true'
+    },
+    {
+      label: 'Evästeet',
+      href: '#',
+      external: 'true'
+    },
+    {
+      label: 'Henkilötietojen käsittely',
+      href: '#',
+      external: 'true'
+    }
+  ]"
+>
+</duet-footer>

package/templates/angular/{src → 12.2.16/src}/app/footer/footer.component.ts

@@ -3,7 +3,7 @@ import { Component } from "@angular/core"
 @Component({
   selector: "app-footer",
   templateUrl: "./footer.component.html",
-  styleUrls: ["./footer.component.scss"],
+  styleUrls: ["./footer.component.scss"]
 })
 export class FooterComponent {
   constructor() {}

package/templates/angular/12.2.16/src/app/header/header.component.html

@@ -0,0 +1 @@
+<duet-header logo-href="" [back]="{ label: 'Takaisin', href: '/' }"></duet-header>

package/templates/angular/12.2.16/src/app/header/header.component.ts

@@ -0,0 +1,10 @@
+import { Component } from "@angular/core"
+
+@Component({
+  selector: "app-header",
+  templateUrl: "./header.component.html",
+  styleUrls: ["./header.component.scss"]
+})
+export class HeaderComponent {
+  constructor() {}
+}