Skip to content

Commit

Permalink
Merge pull request #94 from vuestorefront-community/dev
Browse files Browse the repository at this point in the history
Merging develop into main branch
  • Loading branch information
mattmaribojoc authored Sep 10, 2024
2 parents 0cca7bf + 33022da commit c132cec
Show file tree
Hide file tree
Showing 507 changed files with 163,012 additions and 29,119 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
Empty file added .config
Empty file.
7 changes: 0 additions & 7 deletions .czrc

This file was deleted.

36 changes: 28 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
"ecmaVersion": 2017,
"sourceType": "module"
},
"plugins": ["vue", "@typescript-eslint"],
"plugins": [
"vue",
"@typescript-eslint"
],
"env": {
"browser": true,
"commonjs": true,
Expand Down Expand Up @@ -95,7 +98,10 @@
}
],
"line-comment-position": 2,
"linebreak-style": [2, "unix"],
"linebreak-style": [
2,
"unix"
],
"lines-around-comment": 2,
"max-statements-per-line": 2,
"no-lonely-if": 2,
Expand All @@ -110,11 +116,20 @@
}
],
"operator-linebreak": 2,
"quote-props": [2, "as-needed"],
"quotes": [2, "single"],
"quote-props": [
2,
"as-needed"
],
"quotes": [
2,
"single"
],
"semi": 2,
"semi-spacing": 2,
"one-var": [2, "never"],
"one-var": [
2,
"never"
],
"eol-last": 2,
"newline-after-var": 0,
"no-var": 2,
Expand All @@ -136,10 +151,15 @@
}
},
{
"files": ["*.ts", "*.tsx"],
"files": [
"*.ts",
"*.tsx"
],
"rules": {
"@typescript-eslint/explicit-module-boundary-types": ["error"]
"@typescript-eslint/explicit-module-boundary-types": [
"error"
]
}
}
]
}
}
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @vuestorefront/integrations-team
25 changes: 25 additions & 0 deletions .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Install dependencies
description: Install and cache all project dependencies
runs:
using: 'composite'
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v1
with:
node-version: '20'

- name: Get node modules cache
id: yarn-cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-yarn-new-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
shell: bash
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: |
yarn --frozen-lockfile
18 changes: 17 additions & 1 deletion .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<<<<<<< HEAD
name: VSF Continuous Delivery

on:
workflow_dispatch:
push:
branches:
- sdk-migration

jobs:
release-packages:
name: "Release NPM Packages"
uses: vuestorefront/integrations-github-workflows/.github/workflows/continuous-delivery.yml@develop
secrets: inherit
=======
name: Release

on:
Expand Down Expand Up @@ -100,4 +115,5 @@ jobs:
- if: ${{ (inputs.enterprise == false) && (steps.changesets.outputs.hasChangesets == 'false') }}
name: Publish
run: yarn build && yarn changeset publish
run: yarn build && yarn changeset publish
>>>>>>> origin/main
18 changes: 17 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,33 @@ on:
workflow_call:
inputs:
enterprise:
<<<<<<< HEAD
description: 'Flag to use enterprise registry'
=======
description: "Flag to use enterprise registry"
>>>>>>> origin/main
type: boolean
required: false
default: false

node_version:
<<<<<<< HEAD
description: 'Node versions to test'
=======
description: "Node versions to test"
>>>>>>> origin/main
type: string
required: false
default: "['16']"

defaults:
run:
shell: bash
<<<<<<< HEAD

=======

>>>>>>> origin/main
env:
GCP_PROJECT_ID: 81559754996
GCP_PROJECT_NAME: sf-artifacts-prod
Expand Down Expand Up @@ -108,4 +120,8 @@ jobs:
packages/**/coverage
- name: Lint project
run: yarn lint
<<<<<<< HEAD
run: yarn lint
=======
run: yarn lint
>>>>>>> origin/main
84 changes: 0 additions & 84 deletions .github/workflows/docs-deployment.yaml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ coverage

# Editor directories and files
.idea
.vscode

# OS generated files
.DS_STORE
Expand Down
6 changes: 3 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lerna run --parallel precommit
npm test
4 changes: 0 additions & 4 deletions .husky/prepare-commit-msg

This file was deleted.

1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
12 changes: 7 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"[typescript]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": false,
},
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"vetur.format.defaultFormatter.html": "prettier",
"vetur.format.defaultFormatter.js": "prettier-eslint",
"vetur.validation.interpolation": true,
"editor.defaultFormatter": "octref.vetur",
"search.exclude": {
"**/docs/**": true,
"**/old-api-client/**": true,
},
}
}
23 changes: 0 additions & 23 deletions .vuestorefrontcloud/docker/docs/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions .vuestorefrontcloud/docker/docs/build-docker.sh

This file was deleted.

Loading

0 comments on commit c132cec

Please sign in to comment.