Skip to content

Commit

Permalink
Merge pull request #822 from OutSystems/rc2.17.0-odc
Browse files Browse the repository at this point in the history
ROU-4430 - [OSUI] Migrate OS UI v2.17.0 to ODC
  • Loading branch information
BenOsodrac authored Sep 27, 2023
2 parents 2930feb + 98890a7 commit d2a28aa
Show file tree
Hide file tree
Showing 151 changed files with 7,022 additions and 910 deletions.
112 changes: 74 additions & 38 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,96 +8,129 @@
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
"plugin:prettier/recommended" // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 12
},
"plugins": ["@typescript-eslint", "prettier"],
"plugins": [
"@typescript-eslint",
"prettier"
],
"rules": {
"@typescript-eslint/member-ordering": [
"warn",
{
"default": {
"memberTypes": [
"signature",
"field",
"signature",
"field",
"method"
],
],
"order": "alphabetically"
},
"interfaces": {
"memberTypes": [
"signature",
"field",
"field",
"method"
],
"order": "alphabetically"
},
"classes": {
"memberTypes": [
"signature",
"private-field",
"signature",
"private-field",
"protected-field",
"public-field",
"constructor",
"private-method",
"protected-method",
"public-method",
"public-field",
"constructor",
"private-method",
"protected-method",
"public-method",
"abstract-method"
],
],
"order": "alphabetically"
}
}
}
],
"@typescript-eslint/explicit-member-accessibility": [
"warn",
{
"ignoredMethodNames": ["constructor"]
"ignoredMethodNames": [
"constructor"
]
}
],
"@typescript-eslint/naming-convention": [
"error",
{
"selector": "function",
"format": ["StrictPascalCase"],
"modifiers": ["exported"]
"format": [
"StrictPascalCase"
],
"modifiers": [
"exported"
]
},
{
"selector": "class",
"format": ["StrictPascalCase"]
"selector": "class",
"format": [
"StrictPascalCase"
]
},
{
"selector": "classProperty",
"format": ["strictCamelCase"],
"format": [
"strictCamelCase"
],
"leadingUnderscore": "require",
"modifiers": ["private"]
"modifiers": [
"private"
]
},
{
"selector": "classProperty",
"format": ["strictCamelCase"],
"format": [
"strictCamelCase"
],
"leadingUnderscore": "forbid",
"modifiers": ["public", "protected"]
"modifiers": [
"public",
"protected"
]
},
{
"selector": "classMethod",
"format": ["strictCamelCase"],
"format": [
"strictCamelCase"
],
"leadingUnderscore": "require",
"modifiers": ["private"]
"modifiers": [
"private"
]
},
{
"selector": "classMethod",
"format": ["strictCamelCase"],
"format": [
"strictCamelCase"
],
"leadingUnderscore": "forbid",
"modifiers": ["public", "protected"]
"modifiers": [
"public",
"protected"
]
},
{
"selector": "interface",
"format": ["UPPER_CASE", "StrictPascalCase"],
"prefix": ["I"]
}
"format": [
"UPPER_CASE",
"StrictPascalCase"
],
"prefix": [
"I"
]
}
],
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-namespace": "off",
Expand All @@ -110,10 +143,10 @@
"no-extend-native": "error",
"no-inner-declarations": "off",
"no-multiple-empty-lines": [
"warn",
{
"max": 1,
"maxEOF": 0
"warn",
{
"max": 1,
"maxEOF": 0
}
],
"no-template-curly-in-string": "warn",
Expand All @@ -122,12 +155,15 @@
"no-prototype-builtins": "off",
//"no-use-before-define": "error",
"no-var": "error",
"one-var": ["warn", "never"],
"one-var": [
"warn",
"never"
],
//"quotes": ["error", "single"], //ecaping quotes on prettier https://github.com/prettier/prettier/issues/973
"semi": [
"error",
"always"
],
"yoda": "warn"
}
}
}
24 changes: 24 additions & 0 deletions .github/workflows/DocsDeployManually.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: docs-deploy-manually

on:
workflow_dispatch:

jobs:
deploy-doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: main

- uses: actions/setup-node@v3

- name: Push files into github page
uses: GuillaumeFalourd/copy-push-files@v1

with:
source_files: docs/*
remote_repository: https://github.com/outsystems-ui-docs/outsystems-ui-docs.github.io
access_token: ${{ secrets.UICOMPONENTSDOCS }}
target_branch: main
commit_message: Deploy documentation.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: release-npm-manually
name: npm-deploy-manually

on:
workflow_dispatch:
Expand Down
52 changes: 26 additions & 26 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,6 @@ jobs:
target_branch: 'main'
commit_message_template: 'Merged rc${{ steps.split-lts-tag.outputs._1 }} into main. [skip ci]'

delete-rc:
needs: merge-rc
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: main

- uses: actions/setup-node@v3

- name: Get tags versions
id: get-tags
uses: JinoArch/get-latest-tag@latest

- name: Get lts version
id: split-lts-tag
uses: jungwinter/split@v2
with:
msg: '${{ steps.get-tags.outputs.latestTag }}'
separator: 'v'

- name: Delete rc${{ steps.split-lts-tag.outputs._1 }}
shell: bash
run: |
git push origin -d rc${{ steps.split-lts-tag.outputs._1 }}
compile-prod:
needs: merge-rc
runs-on: ubuntu-latest
Expand Down Expand Up @@ -139,3 +113,29 @@ jobs:
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_UICOMPONENTS}}

delete-rc:
needs: [deploy-doc, publish-npm]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: main

- uses: actions/setup-node@v3

- name: Get tags versions
id: get-tags
uses: JinoArch/get-latest-tag@latest

- name: Get lts version
id: split-lts-tag
uses: jungwinter/split@v2
with:
msg: '${{ steps.get-tags.outputs.latestTag }}'
separator: 'v'

- name: Delete rc${{ steps.split-lts-tag.outputs._1 }}
shell: bash
run: |
git push origin -d rc${{ steps.split-lts-tag.outputs._1 }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OutSystems UI · v2.16.0
# OutSystems UI · v2.17.0

![GitHub License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg) ![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)

Expand Down
Loading

0 comments on commit d2a28aa

Please sign in to comment.