npm - @fmidev/smartmet-alert-client - Versions diffs - 4.0.0-beta.7 → 4.0.0 - Mend

@fmidev/smartmet-alert-client 4.0.0-beta.7 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (50) hide show

package/Jenkinsfile +1 -1
package/README.md +14 -10
package/dist/index.dark.html +5 -0
package/dist/index.html +0 -1
package/dist/index.js +50 -66
package/dist/index.js.map +1 -1
package/dist/index.relative.html +2 -2
package/dist/index.start.html +3 -3
package/package.json +10 -14
package/postcss.config.js +3 -3
package/public/index.dark.html +5 -0
package/public/index.relative.html +2 -2
package/public/index.start.html +3 -3
package/screenshot.png +0 -0
package/src/App.vue +21 -12
package/src/assets/img/warning/forest-fire-weather.svg +2 -2
package/src/assets/img/warning/sea-wave-height.svg +2 -2
package/src/assets/img/warning/sea-wind-legend.svg +3 -4
package/src/assets/img/warning/sea-wind.svg +3 -3
package/src/assets/img/warning/traffic-weather.svg +4 -5
package/src/components/AlertClient.vue +40 -15
package/src/components/DaySmall.vue +128 -20
package/src/components/Days.vue +25 -9
package/src/components/DescriptionWarning.vue +5 -1
package/src/components/GrayScaleToggle.vue +10 -0
package/src/components/Legend.vue +48 -10
package/src/components/MapLarge.vue +143 -27
package/src/components/MapSmall.vue +10 -10
package/src/components/PopupRow.vue +1 -1
package/src/components/Region.vue +32 -7
package/src/components/Warning.vue +31 -2
package/src/components/Warnings.vue +40 -12
package/src/locales/en.json +178 -178
package/src/locales/fi.json +178 -178
package/src/locales/sv.json +2 -2
package/src/main.js +16 -20
package/src/mixins/config.js +30 -49
package/src/mixins/utils.js +10 -2
package/src/scss/colors.scss +6 -6
package/src/scss/constants.scss +7 -5
package/src/scss/themes/dark-gray.scss +34 -0
package/src/scss/themes/dark.scss +1 -5
package/src/scss/themes/light-gray.scss +33 -34
package/src/scss/themes/light.scss +6 -8
package/src/scss/warningImages.scss +76 -29
package/test/snapshot.test.js +20 -112
package/vite.config.js +4 -2
package/.nvmrc +0 -1
package/Jenkinsfile.beta +0 -111
package/ssr/index.mjs +0 -40

package/test/snapshot.test.js CHANGED Viewed

@@ -1,118 +1,26 @@
-import fs, { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
-import { JSDOM } from 'jsdom'
-import path from 'path'
-import { expect, it } from 'vitest'
-import Vue from 'vue'
-import { createRenderer } from 'vue-server-renderer'
-import format from 'xml-formatter'
-import XMLHttpRequest from 'xmlhttprequest-ssl'
+var fs = require('fs-extra');
+const { chromium } = require("playwright");
+const timers = require("node:timers/promises");
-import SmartMetAlertClient from '../dist/SmartMetAlertClient.umd'
+let browser = null;
+const url = "";
-global.XMLHttpRequest = XMLHttpRequest
+(async () => {
+  browser = await chromium.launch();
+  let page = await browser.newPage();
+  await page.setViewportSize({ width: 1280, height: 1000 });
+  await page.goto(url);
-const svgPath = './test/svg'
-if (!existsSync(svgPath)) {
-  mkdirSync(svgPath)
-}
+  await timers.setTimeout(5000);
+  await page.screenshot({ path: `./pic-${(new Date()).toISOString()}.png` });
-const dateTimes = new Set()
+  const html = await page.content()
+  const result = await page.locator("svg#finland-large");
+  const text = await result.evaluate((el) => el.outerHTML);
-const getAllDateTimes = function (dirPath) {
-  const files = fs.readdirSync(dirPath)
-  files.forEach(function (file) {
-    if (fs.statSync(dirPath + '/' + file).isDirectory()) {
-      getAllDateTimes(dirPath + '/' + file)
-    } else {
-      const parts = file.split('-')
-      if (parts.length > 0 && parts[0].length === 14) {
-        dateTimes.add(parts[0])
-      }
-    }
-  })
-}
+  await result.screenshot({ path: `./map-${(new Date()).toISOString()}.png` });
+  console.log(text);
-getAllDateTimes(import.meta.env.VITE_DATA_DIRECTORY)
-const data = Array.from(dateTimes)
-  .sort()
-  .map((dateTime) => {
-    const basePath =
-      import.meta.env.VITE_DATA_DIRECTORY +
-      path.sep +
-      dateTime.substr(0, 4) +
-      path.sep +
-      dateTime.substr(4, 2) +
-      path.sep +
-      dateTime.substr(6, 2) +
-      path.sep +
-      dateTime +
-      '-'
-    return {
-      dateTime,
-      weatherUpdateTime: `${basePath}weather_update_time.json`,
-      floodUpdateTime: `${basePath}flood_update_time.json`,
-      weatherFinlandActiveAll: `${basePath}weather_finland_active_all.json`,
-      floodFinlandActiveAll: `${basePath}flood_finland_active_all.fi.json`,
-    }
-  })
-for (let i = 0; i < data.length; i++) {
-  const weatherUpdateTime = JSON.parse(
-    readFileSync(data[i].weatherUpdateTime, 'utf8')
-  )
-  const floodUpdateTime = JSON.parse(
-    readFileSync(data[i].floodUpdateTime, 'utf8')
-  )
-  const weatherFinlandActiveAll = JSON.parse(
-    readFileSync(data[i].weatherFinlandActiveAll, 'utf8')
-  )
-  const floodFinlandActiveAll = JSON.parse(
-    readFileSync(data[i].floodFinlandActiveAll, 'utf8')
-  )
-  const renderer = createRenderer({
-    template: (result) => `<!DOCTYPE html>
-    <html lang="en">
-      <head><link rel="stylesheet" href="./dist/SmartMetAlertClient.css"></head>
-      <body>${result}</body>
-    </html>
-    `,
-  })
-  it(`renders warning map ${data[i].dateTime}`, async () => {
-    const vm = new Vue({
-      el: '#app',
-      render(h) {
-        return h(SmartMetAlertClient, {
-          props: {
-            language: 'fi',
-            currentDate: [
-              weatherUpdateTime.features[0].properties.update_time,
-              floodUpdateTime.features[0].properties.update_time,
-            ]
-              .sort()
-              .reverse()[0],
-            warnings: {
-              weather_update_time: weatherUpdateTime,
-              weather_finland_active_all: weatherFinlandActiveAll,
-              flood_update_time: floodUpdateTime,
-              flood_finland_active_all: floodFinlandActiveAll,
-            },
-          },
-        })
-      },
-    })
-    const html = await renderer.renderToString(vm)
-    const dom = new JSDOM(html)
-    const element = dom.window.document.getElementById('finland-large')
-    const svg = format(element.outerHTML)
-    writeFileSync(path.join(svgPath, `${data[i].dateTime}.svg`), svg)
-    expect(svg).toMatchSnapshot()
-  })
-}
+  await browser.close();
+})();

package/vite.config.js CHANGED Viewed

@@ -1,11 +1,12 @@
 // vite.config.js
 import vue from '@vitejs/plugin-vue'
-import path from 'path'
+import { fileURLToPath, URL } from 'node:url'
 import { visualizer } from 'rollup-plugin-visualizer'
 import { BootstrapVueNextResolver } from 'unplugin-vue-components/resolvers'
 import Components from 'unplugin-vue-components/vite'
 import { defineConfig } from 'vite'
 import banner from 'vite-plugin-banner'
+import { vueAdoptedStylesheetsPlugin } from 'vue-adopted-stylesheets'
 import pkg from './package.json'
@@ -18,6 +19,7 @@ export default defineConfig({
     Components({
       resolvers: [BootstrapVueNextResolver()],
     }),
+    vueAdoptedStylesheetsPlugin(),
     banner(
       `/**\n * name: ${pkg.name}\n * version: v${pkg.version}\n * description: ${pkg.description}\n * author: ${pkg.author}\n * homepage: ${pkg.homepage}\n */`
     ),
@@ -25,7 +27,7 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, './src'),
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
   },
   build: {

package/.nvmrc DELETED Viewed

	@@ -1 +0,0 @@
1	- v14

package/Jenkinsfile.beta DELETED Viewed

@@ -1,111 +0,0 @@
-#!groovy
-def packageVersion = "undefined"
-def deployUserAndHost = "${params.deployUserAndHost}"
-def deployBaseDirectory = "${params.deployBaseDirectory}"
-def buildNode = "${params.buildNode}"
-pipeline {
-    agent {
-        node {
-            label "${buildNode}"
-        }
-    }
-    tools {
-        nodejs 'nodejs-18'
-    }
-    options {
-        disableConcurrentBuilds()
-        buildDiscarder(logRotator(numToKeepStr: '3'))
-    }
-    stages {
-        stage('Configure http proxy') {
-            when { expression { env.HTTP_PROXY != '' } }
-            steps {
-                sh "npm config set proxy ${env.HTTP_PROXY}"
-            }
-        }
-        stage('Configure https proxy') {
-            when { expression { env.HTTPS_PROXY != '' } }
-            steps {
-                sh "npm config set https-proxy ${env.HTTPS_PROXY}"
-            }
-        }
-        stage('Install') {
-            steps {
-                sh "env"
-                sh "npm --version"
-                sh "node --version"
-                sh "rm --recursive --force node_modules"
-                sh "npm install"
-            }
-        }
-        stage('Build') {
-            steps {
-                sh "npm run build"
-            }
-        }
-        stage('Test') {
-            steps {
-                sh "docker stop docker_chromium_1 || true && docker rm docker_chromium_1 || true"
-                sh "npm test || echo \"Some or all tests failed\""
-            }
-        }
-        stage('Determine version from package.json') {
-            steps {
-                script {
-                     packageVersion = sh(returnStdout: true, script: 'jq --raw-output .version package.json').trim()
-                }
-            }
-        }
-        stage('Require unique deploy directory') {
-            steps {
-                sh "ssh ${deployUserAndHost} \"if [ -d ${deployBaseDirectory}/${packageVersion} ]; then echo deploy directory already exists; exit 1; fi\""
-            }
-        }
-        stage('Deploy') {
-            steps {
-                sh "chmod --verbose --recursive u+r+w+X,g+r-w+X,o-r-w-x dist/"
-                sh "ssh ${deployUserAndHost} \"mkdir --parents --mode=750 ${deployBaseDirectory}/${packageVersion}\""
-                sh "scp -rp dist/* ${deployUserAndHost}:${deployBaseDirectory}/${packageVersion}/"
-            }
-        }
-        stage('Publish package to npmjs.com') {
-            environment {
-                NPM_TOKEN = credentials('npm-token')
-            }
-            steps {
-                sh 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN > .npmrc'
-                sh 'npm publish'
-                sh 'rm .npmrc'
-            }
-        }
-    }
-    post {
-        success {
-            slackSend(message: "Success ${env.JOB_NAME} ${packageVersion} (<${env.BUILD_URL}|Open>)")
-        }
-        unstable {
-            slackSend(message: "Unstable ${env.JOB_NAME} ${packageVersion} (<${env.BUILD_URL}|Open>)")
-        }
-        failure {
-            slackSend(message: "Failure ${env.JOB_NAME} ${packageVersion} (<${env.BUILD_URL}|Open>)")
-        }
-        changed {
-            slackSend(message: "Changed ${env.JOB_NAME} ${packageVersion} (<${env.BUILD_URL}|Open>)")
-        }
-    }
-}

package/ssr/index.mjs DELETED Viewed

@@ -1,40 +0,0 @@
-import fs from 'fs'
-import Vue from 'vue'
-import { createRenderer } from 'vue-server-renderer'
-import XMLHttpRequest from 'xmlhttprequest-ssl'
-import SmartMetAlertClient from '../dist/SmartMetAlertClient.umd'
-global.XMLHttpRequest = XMLHttpRequest
-const renderer = createRenderer({
-  template: (result) => `<!DOCTYPE html>
-    <html lang="en">
-      <head><link rel="stylesheet" href="./dist/SmartMetAlertClient.css"></head>
-      <body>${result}</body>
-    </html>
-    `,
-})
-const vm = new Vue({
-  el: '#app',
-  render(h) {
-    return h(SmartMetAlertClient, {
-      props: {
-        language: 'fi',
-      },
-    })
-  },
-})
-renderer
-  .renderToString(vm)
-  .then((html) => {
-    fs.writeFile('out.html', html, (err) => {
-      if (err) {
-        return console.error(err)
-      }
-    })
-  })
-  .catch((err) => {
-    console.error(err)
-  })