Skip to content

Commit 203f7fd

Browse files
author
Luciano Nooijen
committed
Merge branch 'release/2.6.0'
2 parents 92a17f5 + 1dde126 commit 203f7fd

File tree

143 files changed

+8818
-5293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+8818
-5293
lines changed

‎.eslintrc.js‎

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,56 @@
11
module.exports = {
2-
parser: '@typescript-eslint/parser',
3-
extends: [
2+
parser: '@typescript-eslint/parser',
3+
extends: [
44
'plugin:@typescript-eslint/recommended',
55
'airbnb',
66
'plugin:prettier/recommended',
77
'prettier',
88
'prettier/react',
99
'prettier/@typescript-eslint',
1010
],
11-
plugins: [
12-
"jest",
13-
"security",
14-
"prettier"
15-
],
16-
parserOptions: {
17-
ecmaVersion: 2018,
18-
sourceType: 'module',
19-
ecmaFeatures: {
20-
jsx: true,
11+
plugins: ['jest', 'security', 'prettier', 'react'],
12+
parserOptions: {
13+
ecmaVersion: 2018,
14+
sourceType: 'module',
15+
ecmaFeatures: {
16+
jsx: true,
2117
},
2218
},
2319
rules: {
24-
"@typescript-eslint/explicit-function-return-type": 0,
25-
"@typescript-eslint/no-var-requires": 0,
26-
"global-require": 0,
27-
"import/no-dynamic-require": 0,
28-
"prettier/prettier" : ["error"],
20+
'react/jsx-props-no-spreading': 0,
21+
'no-use-before-define': 'off',
22+
'@typescript-eslint/no-use-before-define': ['error'],
23+
'react/prop-types': 0,
24+
'@typescript-eslint/explicit-function-return-type': 0,
25+
'@typescript-eslint/no-var-requires': 0,
26+
'@typescript-eslint/no-empty-interface': 0,
27+
'react/jsx-filename-extension': [
28+
2,
29+
{ extensions: ['.js', '.jsx', '.ts', '.tsx'] },
30+
],
31+
'global-require': 0,
32+
'import/no-dynamic-require': 0,
33+
'prettier/prettier': ['error'],
34+
'import/extensions': [
35+
'error',
36+
'ignorePackages',
37+
{
38+
js: 'never',
39+
jsx: 'never',
40+
ts: 'never',
41+
tsx: 'never',
42+
},
43+
],
2944
},
3045
env: {
3146
jest: true,
3247
browser: true,
33-
}
48+
},
49+
settings: {
50+
'import/resolver': {
51+
node: {
52+
extensions: ['.js', '.jsx', '.ts', '.tsx'],
53+
},
54+
},
55+
},
3456
};

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ build_node:
1414
before_script:
1515
- yarn install --production --frozen-lockfile
1616
script:
17-
- yarn run build --prefix-paths bytecode-website
17+
- yarn run build
1818
- mv public build
19-
artifacts:
20-
paths:
21-
- build/
2219

2320
lint:
2421
stage: test
@@ -27,39 +24,3 @@ lint:
2724
script:
2825
- yarn run lint
2926

30-
test_jest:
31-
stage: test
32-
before_script:
33-
- yarn install --frozen-lockfile
34-
script:
35-
- yarn run test:ci
36-
37-
release_docker:
38-
stage: release
39-
image: docker:19.03.1
40-
services:
41-
- docker:19.03.1-dind
42-
variables:
43-
DOCKER_HOST: tcp://docker:2375
44-
DOCKER_TLS_CERTDIR: ""
45-
before_script:
46-
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
47-
script:
48-
- docker pull $CI_REGISTRY_IMAGE:latest || true
49-
- docker build --tag $CI_REGISTRY_IMAGE:latest .
50-
- docker push $CI_REGISTRY_IMAGE:latest
51-
only:
52-
- master
53-
54-
pages:
55-
image: alpine:3.9
56-
stage: deploy
57-
dependencies:
58-
- build_node
59-
script:
60-
- rm -rf public
61-
- mv build public
62-
artifacts:
63-
paths:
64-
- public
65-

‎.prettierrc‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 2.6.0 (2021-01-12)
9+
10+
### Added:
11+
12+
* Support for TypeScript
13+
* Dearly case
14+
15+
### Changed:
16+
17+
* Website is now written mostly in TypeScript, fully typed
18+
819
## 2.5.15 (2020-12-17)
920

1021
### Added:

‎gatsby-config.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@ module.exports = {
2626
useMozJpeg: false,
2727
stripMetadata: true,
2828
defaultQuality: 75,
29-
plugins: [
30-
{
31-
resolve: `gatsby-remark-images`,
32-
options: {
33-
maxWidth: 1000,
34-
},
35-
},
36-
],
29+
},
30+
},
31+
{
32+
resolve: `gatsby-remark-images`,
33+
options: {
34+
maxWidth: 1000,
3735
},
3836
},
3937
{

‎gatsby-node.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ exports.createPages = async ({ actions, graphql }) => {
5757
data.allMdx.edges.forEach(edge => {
5858
const { id } = edge.node;
5959
const { slug } = edge.node.fields;
60-
const template = path.resolve(`./src/templates/BlogpostTemplate.jsx`);
60+
const template = path.resolve(`./src/templates/BlogpostTemplate.tsx`);
6161
actions.createPage({
6262
path: slug,
6363
component: template,

‎package.json‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "bytecode-website",
33
"private": false,
44
"description": "The Bytecode Digital Agency website, released as free software",
5-
"version": "v2.5.15",
5+
"version": "v2.6.0",
66
"author": "Luciano Nooijen <luciano@bytecode.nl>",
77
"keywords": [
88
"bytecode"
@@ -21,14 +21,19 @@
2121
"reinstall": "rm -rf node_modules && yarn"
2222
},
2323
"dependencies": {
24-
"@mdx-js/mdx": "^1.0.14",
25-
"@mdx-js/react": "^1.0.6",
26-
"axios": "^0.19.0",
27-
"babel-preset-gatsby": "^0.2.13",
28-
"change-case": "^4.1.1",
29-
"gatsby": "^2.18.21",
24+
"@mdx-js/mdx": "^1.6.22",
25+
"@mdx-js/react": "^1.6.22",
26+
"@types/jest": "^26.0.19",
27+
"@types/node": "^14.14.12",
28+
"@types/react": "^17.0.0",
29+
"@types/react-router-dom": "^5.1.6",
30+
"@types/uuid": "^8.3.0",
31+
"axios": "^0.21.0",
32+
"babel-preset-gatsby": "^0.8.0",
33+
"change-case": "^4.1.2",
34+
"gatsby": "^2.29.1",
3035
"gatsby-image": "^2.2.18",
31-
"gatsby-mdx": "^0.6.2",
36+
"gatsby-mdx": "^0.6.3",
3237
"gatsby-plugin-babel": "^1.0.0",
3338
"gatsby-plugin-manifest": "^2.2.16",
3439
"gatsby-plugin-offline": "^3.0.5",
@@ -40,33 +45,37 @@
4045
"gatsby-remark-images": "^3.1.42",
4146
"gatsby-source-filesystem": "^2.1.22",
4247
"gatsby-transformer-sharp": "^2.3.12",
43-
"polished": "^3.2.0",
44-
"prop-types": "^15.7.2",
45-
"react": "^16.12.0",
46-
"react-dom": "^16.12.0",
47-
"react-grid-system": "^4.4.3",
48-
"react-helmet": "^5.2.1",
49-
"styled-components": "^5.0.0",
48+
"polished": "^4.0.5",
49+
"react": "^17.0.1",
50+
"react-dom": "^17.0.1",
51+
"react-grid-system": "^7.1.1",
52+
"react-helmet": "^6.1.0",
53+
"styled-components": "^5.2.1",
5054
"styled-components-style-utils": "^1.2.1",
5155
"to-style": "^1.3.3",
52-
"yarn": "^1.17.3"
56+
"uuid": "^8.3.2",
57+
"yarn": "^1.22.10"
5358
},
5459
"devDependencies": {
55-
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
56-
"@typescript-eslint/eslint-plugin": "^2.2.0",
57-
"@typescript-eslint/parser": "^2.16.0",
58-
"eslint": "^6.3.0",
59-
"eslint-config-airbnb": "^18.0.1",
60-
"eslint-config-prettier": "^6.2.0",
61-
"eslint-plugin-import": "^2.18.2",
62-
"eslint-plugin-jest": "^22.17.0",
63-
"eslint-plugin-jsx-a11y": "^6.2.3",
64-
"eslint-plugin-prettier": "^3.1.0",
65-
"eslint-plugin-react": "^7.14.3",
60+
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
61+
"@types/react-dom": "^17.0.0",
62+
"@types/react-helmet": "^6.1.0",
63+
"@types/styled-components": "^5.1.5",
64+
"@typescript-eslint/eslint-plugin": "^4.9.1",
65+
"@typescript-eslint/parser": "^4.9.1",
66+
"eslint": "^7.15.0",
67+
"eslint-config-airbnb": "^18.2.1",
68+
"eslint-config-prettier": "^7.0.0",
69+
"eslint-plugin-import": "^2.22.1",
70+
"eslint-plugin-jest": "^24.1.3",
71+
"eslint-plugin-jsx-a11y": "^6.4.1",
72+
"eslint-plugin-prettier": "^3.2.0",
73+
"eslint-plugin-react": "^7.21.5",
6674
"eslint-plugin-security": "^1.4.0",
67-
"jest": "^24.9.0",
68-
"prettier": "^1.18.2",
69-
"typescript": "^3.7.4"
75+
"jest": "^26.6.3",
76+
"prettier": "^2.2.1",
77+
"ts-migrate": "^0.1.10",
78+
"typescript": "^4.1.2"
7079
},
7180
"repository": {
7281
"type": "git",

‎src/components/ArrowButton.jsx‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/components/Button.jsx‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)