Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move crawler to own repo #167

Merged
merged 2 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ insert_final_newline = true
# Change these settings to your own preference
indent_style = tab

[*.{yaml,md,json,xml}]
[*.{yaml,yml,md,json,xml,properties}]
indent_size = 2
indent_style = space

Expand Down
24 changes: 24 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Ignore specific files
_config.yml
CNAME

# Ignore build output folders
/docs/**
/webapp/**

# Ignore files by extension
/**/*.svg
/**/*.png
/**/*.md

# Ignore files by folders
/src/font-awesome/**

# Additionally ignore files for linting
/**/*.html
/**/*.css
/**/*.json
/**/*.xml
/**/*.properties
/**/*.yaml
/**/*.yml
3 changes: 1 addition & 2 deletions packages/ui/.eslintrc.json → .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:@typescript-eslint/recommended-requiring-type-checking"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": ["./tsconfig.json", "./packages/ui/tsconfig.json"],
"project": ["./tsconfig.json"],
"sourceType": "module"
},
"ignorePatterns": ["*.xml", "*.properties", "src/font-awesome/**"],
"plugins": ["@typescript-eslint"],
"rules": {
"@typescript-eslint/no-unsafe-assignment": "warn",
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/new_package.md

This file was deleted.

10 changes: 2 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: build

on:
schedule:
- cron: "50 3 * * *" # runs every day at 03:50 UTC to avoid high loads
push:
branches: [main]
workflow_dispatch:

env:
HUSKY_SKIP: true
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

jobs:
Expand All @@ -26,17 +25,12 @@ jobs:
- name: yarn
run: |
yarn
- name: crawl data
run: |
yarn workspace crawler build
- run: |
yarn workspace ui build
yarn build
- name: Commit/Push build to docs branch
run: |
git config --global user.name 'marianfoo'
git config --global user.email '[email protected]'
git add docs -f
git add packages/ui/src/model/data.json
git add packages/ui/src/model/versions.json
git commit -m "chore: build"
git push origin HEAD:docs --force
5 changes: 5 additions & 0 deletions .husky/skip.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if (process.env.HUSKY_SKIP) {
process.exit(0);
} else {
process.exit(1);
}
File renamed without changes.
14 changes: 9 additions & 5 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Ignore specific files
_config.yml
CNAME

# Ignore build output folders
/docs/**
/webapp/**

# Ignore files by extension
/**/*.md
/**/*.svg
/**/*.png
/**/*.md

# Ignore folders
/docs/**
/packages/ui/src/font-awesome/**
/packages/ui/webapp/**
# Ignore files by folders
/src/font-awesome/**
11 changes: 2 additions & 9 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,13 @@
"useTabs": true,
"overrides": [
{
"files": ["*.yaml", "*.yml", "*.md", "*.json", "*.xml"],
"files": ["*.yaml", "*.yml", "*.md", "*.json", "*.xml", "*.properties"],
"options": {
"useTabs": false,
"tabWidth": 2,
"keySeparator": "=",
"xmlWhitespaceSensitivity": "ignore"
}
},
{
"files": ["*.properties"],
"options": {
"useTabs": false,
"tabWidth": 2,
"keySeparator": "="
}
}
]
}
59 changes: 46 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bestofui5-website",
"version": "0.15.0",
"description": "bestofui5-website monorepo",
"description": "bestofui5-website - UI5 Application",
"private": true,
"author": "Marian Zeis",
"license": "Apache-2.0",
Expand All @@ -10,31 +10,67 @@
"url": "https://github.com/ui5-community/bestofui5-website.git"
},
"scripts": {
"prepare": "husky install",
"prepare": "node ./.husky/skip.js || husky install",
"clean": "rm -rf docs",
"build": "yarn workspaces run build",
"start": "yarn workspace ui start",
"start:dist": "yarn workspace ui start:dist",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"build": "npm-run-all build:ts build:ui5",
"build:opt": "npm-run-all build:ts build:ui5:opt",
"build:ts": "babel src --out-dir webapp --source-maps true --extensions \".ts,.js\" --copy-files",
"build:ui5": "ui5 build self-contained --all --clean-dest --dest docs",
"start": "npm-run-all --parallel watch:ts start:ui5",
"watch:ts": "babel src --out-dir webapp --source-maps true --extensions \".ts,.js\" --copy-files --watch",
"watch:controls": "npx @ui5/ts-interface-generator",
"start:ui5": "ui5 serve --port 8080 -o index.html",
"start:dist": "ui5 serve --port 8080 -o index.html --config ui5-dist.yaml",
"ts-typecheck": "tsc --noEmit",
"lint": "eslint src",
"lint:staged": "lint-staged",
"lint:commit": "commitlint -e",
"lint": "yarn workspaces run lint",
"lint:staged": "yarn workspaces run lint:staged",
"prettier": "prettier --write .",
"prettier:staged": "pretty-quick --staged --verbose",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"hooks:pre-commit": "npm-run-all --sequential prettier:staged lint:staged",
"hooks:pre-push": "npm-run-all --sequential lint:commit"
},
"dependencies": {
"chart.js": "^3.7.1",
"ui5-cc-md": "^0.0.6"
},
"devDependencies": {
"@babel/cli": "^7.17.6",
"@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11",
"@babel/preset-typescript": "^7.16.7",
"@commitlint/cli": "^16.2.3",
"@commitlint/config-conventional": "^16.2.1",
"@prettier/plugin-xml": "^2.0.1",
"@openui5/ts-types-esm": "1.101.0",
"@types/chart.js": "2.9.36",
"@types/jquery": "3.5.14",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"@ui5/cli": "^2.14.8",
"@ui5/ts-interface-generator": "^0.4.2",
"babel-preset-transform-ui5": "^7.0.5",
"conventional-changelog-cli": "^2.2.2",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.13.0",
"husky": "^7.0.4",
"lint-staged": "^12.4.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"prettier-plugin-properties": "^0.1.0",
"pretty-quick": "^3.1.3"
"pretty-quick": "^3.1.3",
"typescript": "^4.6.3",
"ui5-middleware-livereload": "^0.5.11",
"ui5-tooling-modules": "^0.3.0",
"xml-formatter": "^2.6.1"
},
"ui5": {
"dependencies": [
"ui5-tooling-modules",
"ui5-middleware-livereload",
"ui5-cc-md"
]
},
"config": {
"commitizen": {
Expand All @@ -45,8 +81,5 @@
"extends": [
"@commitlint/config-conventional"
]
},
"workspaces": [
"packages/*"
]
}
}
23 changes: 0 additions & 23 deletions packages/crawler/.eslintrc.json

This file was deleted.

39 changes: 0 additions & 39 deletions packages/crawler/package.json

This file was deleted.

Loading