diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fba1c03e..8be1f515 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,14 +9,14 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: 'CodeQL' on: push: - branches: [ master ] + branches: [master] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - cron: '36 1 * * 2' @@ -28,40 +28,40 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.prettierrc b/.prettierrc index 91f264de..b193cb40 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,8 +1,8 @@ { "singleQuote": true, - "svelteSortOrder": "scripts-markup-styles", + "svelteSortOrder": "options-scripts-markup-styles", "svelteBracketNewLine": false, "useTabs": true, "trailingComma": "none", "printWidth": 100 -} \ No newline at end of file +} diff --git a/cypress.json b/cypress.json index ab3ea207..ce918fd9 100644 --- a/cypress.json +++ b/cypress.json @@ -1,8 +1,8 @@ { - "$schema": "https://on.cypress.io/cypress.schema.json", - "baseUrl": "http://localhost:3000", - "pluginsFile": "./cypress/plugins/index.cjs", - "viewportWidth": 1440, - "viewportHeight": 768, - "snapshotFileName": "./cypress/snapshots.js" -} \ No newline at end of file + "$schema": "https://on.cypress.io/cypress.schema.json", + "baseUrl": "http://localhost:3000", + "pluginsFile": "./cypress/plugins/index.cjs", + "viewportWidth": 1440, + "viewportHeight": 768, + "snapshotFileName": "./cypress/snapshots.js" +} diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json index 02e42543..0ff2d645 100644 --- a/cypress/fixtures/example.json +++ b/cypress/fixtures/example.json @@ -1,5 +1,5 @@ { - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" } diff --git a/package.json b/package.json index e3093b82..90756013 100644 --- a/package.json +++ b/package.json @@ -1,65 +1,65 @@ { - "name": "mermaid-live-editor", - "version": "2.0.10", - "scripts": { - "dev": "svelte-kit dev", - "build": "svelte-kit build", - "preview": "svelte-kit preview", - "lint": "prettier --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .", - "format": "prettier --write --plugin-search-dir=. .", - "pre-commit": "lint-staged", - "postinstall": "husky install" - }, - "devDependencies": { - "@cypress/snapshot": "^2.1.7", - "@sveltejs/adapter-static": "^1.0.0-next.11", - "@sveltejs/kit": "^1.0.0-next.109", - "@types/mermaid": "^8.2.5", - "@typescript-eslint/eslint-plugin": "^4.19.0", - "@typescript-eslint/parser": "^4.19.0", - "autoprefixer": "^10.2.5", - "cssnano": "^5.0.1", - "cypress": "^7.3.0", - "eslint": "^7.27.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-cypress": "^2.11.3", - "eslint-plugin-jest": "^24.3.6", - "eslint-plugin-postcss-modules": "^1.2.1", - "eslint-plugin-svelte3": "^3.2.0", - "eslint-plugin-tailwindcss": "^1.8.0", - "husky": "^6.0.0", - "jest": "^26.6.3", - "lint-staged": "^11.0.0", - "postcss": "^8.2.10", - "postcss-load-config": "^3.0.1", - "prettier": "~2.2.1", - "prettier-plugin-svelte": "^2.2.0", - "svelte": "^3.34.0", - "svelte-preprocess": "^4.7.1", - "tailwindcss": "^2.1.1", - "tslib": "^2.0.0", - "typescript": "^4.0.0" - }, - "type": "module", - "dependencies": { - "@analytics/google-analytics": "^0.5.2", - "@macfja/svelte-persistent-store": "^1.1.0", - "analytics": "^0.7.5", - "js-base64": "^3.6.1", - "mermaid": "^8.10.1", - "moment": "^2.29.1", - "monaco-editor": "^0.24.0", - "random-word-slugs": "^0.0.2" - }, - "lint-staged": { - "*.{ts,svelte,js,css,md}": [ - "prettier --plugin-search-dir=. --write", - "eslint --ignore-path .gitignore " - ] - }, - "volta": { - "node": "14.16.1", - "yarn": "1.22.10", - "npm": "7.11.2" - } + "name": "mermaid-live-editor", + "version": "2.0.10", + "scripts": { + "dev": "svelte-kit dev", + "build": "svelte-kit build", + "preview": "svelte-kit preview", + "lint": "prettier --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .", + "format": "prettier --write --plugin-search-dir=. .", + "pre-commit": "lint-staged", + "postinstall": "husky install" + }, + "devDependencies": { + "@cypress/snapshot": "^2.1.7", + "@sveltejs/adapter-static": "^1.0.0-next.11", + "@sveltejs/kit": "^1.0.0-next.109", + "@types/mermaid": "^8.2.5", + "@typescript-eslint/eslint-plugin": "^4.19.0", + "@typescript-eslint/parser": "^4.19.0", + "autoprefixer": "^10.2.5", + "cssnano": "^5.0.1", + "cypress": "^7.3.0", + "eslint": "^7.27.0", + "eslint-config-prettier": "^8.1.0", + "eslint-plugin-cypress": "^2.11.3", + "eslint-plugin-jest": "^24.3.6", + "eslint-plugin-postcss-modules": "^1.2.1", + "eslint-plugin-svelte3": "^3.2.0", + "eslint-plugin-tailwindcss": "^1.8.0", + "husky": "^6.0.0", + "jest": "^26.6.3", + "lint-staged": "^11.0.0", + "postcss": "^8.2.10", + "postcss-load-config": "^3.0.1", + "prettier": "~2.2.1", + "prettier-plugin-svelte": "^2.2.0", + "svelte": "^3.34.0", + "svelte-preprocess": "^4.7.1", + "tailwindcss": "^2.1.1", + "tslib": "^2.0.0", + "typescript": "^4.0.0" + }, + "type": "module", + "dependencies": { + "@analytics/google-analytics": "^0.5.2", + "@macfja/svelte-persistent-store": "^1.1.0", + "analytics": "^0.7.5", + "js-base64": "^3.6.1", + "mermaid": "^8.10.1", + "moment": "^2.29.1", + "monaco-editor": "^0.24.0", + "random-word-slugs": "^0.0.2" + }, + "lint-staged": { + "*.{ts,svelte,js,css,md}": [ + "prettier --plugin-search-dir=. --write", + "eslint --ignore-path .gitignore " + ] + }, + "volta": { + "node": "14.16.1", + "yarn": "1.22.10", + "npm": "7.11.2" + } } diff --git a/postcss.config.cjs b/postcss.config.cjs index 7093fb12..483734f1 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -1,22 +1,23 @@ -const tailwindcss = require("tailwindcss"); -const autoprefixer = require("autoprefixer"); -const cssnano = require("cssnano"); +const tailwindcss = require('tailwindcss'); +const autoprefixer = require('autoprefixer'); +const cssnano = require('cssnano'); const mode = process.env.NODE_ENV; -const dev = mode === "development"; +const dev = mode === 'development'; module.exports = { plugins: [ // Some plugins, like postcss-nested, need to run before Tailwind - + tailwindcss, - + // But others, like autoprefixer, need to run after autoprefixer, - - !dev && cssnano({ - preset: "default", - }), - ], + + !dev && + cssnano({ + preset: 'default' + }) + ] };