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.

Sign up for GitHub

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

Jump to bottom

Prepare release #73

Merged
merged 2 commits into from Jan 4, 2020
Merged

Prepare release #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
294547d
WIP
kristenmills Jan 4, 2020
1cc0b67
The rest
kristenmills Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions .eslintrc.js
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ module.exports = {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-expressions': 'error',
'@typescript-eslint/no-unused-expressions': 'error',
'@typescript-eslint/no-unused-vars': [
'error',
{
Expand Down Expand Up @@ -77,6 +77,7 @@ module.exports = {
'react/jsx-no-bind': 'off',
'react/jsx-props-no-spreading': 'off',
'react/no-array-index-key': 'off',
'react/prop-types': 'off',
'react/state-in-constructor': ['error', 'never'],
'react/static-property-placement': 'off',

Expand All @@ -94,13 +95,4 @@ module.exports = {
},
],
},

overrides: [
{
files: ['*.tsx', '*.ts'],
rules: {
'react/prop-types': 'off',
},
},
],
};
1 change: 1 addition & 0 deletions babel.config.js
View file
Open in desktop
Expand Up @@ -52,6 +52,7 @@ module.exports = function config(api) {
modules: 'commonjs',
},
],
'@babel/preset-typescript',
],
},
},
Expand Down
14 changes: 6 additions & 8 deletions package.json
View file
Open in desktop
Expand Up @@ -11,9 +11,9 @@
"lint:css": "stylelint './src/**/*.js'",
"test": "NODE_ENV=test jest",
"test:watch": "jest --watch",
"release:bump": "NODE_ENV=release babel-node ./scripts/bump-version.js",
"release:upload": "NODE_ENV=release babel-node ./scripts/create-release.js",
"deploy:status": "NODE_ENV=release babel-node ./scripts/set-deployment-status.js"
"release:bump": "NODE_ENV=release babel-node --extensions .ts ./scripts/bump-version.ts",
"release:upload": "NODE_ENV=release babel-node --extensions .ts ./scripts/create-release.ts",
"deploy:status": "NODE_ENV=release babel-node --extensions .ts ./scripts/set-deployment-status.ts"
},
"repository": {
"type": "git",
Expand All @@ -40,6 +40,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.7.7",
"@emotion/babel-preset-css-prop": "^10.0.14",
"@octokit/rest": "^16.33.0",
"@testing-library/jest-dom": "^4.2.4",
Expand All @@ -58,11 +59,11 @@
"@types/react-router-dom": "^5.1.0",
"@types/react-test-renderer": "^16.9.1",
"@types/react-virtualized": "^9.21.7",
"@types/semver": "^6.2.0",
"@types/semver-compare": "^1.0.1",
"@types/uuid": "^3.4.6",
"@typescript-eslint/eslint-plugin": "^2.9.0",
"@typescript-eslint/parser": "^2.9.0",
"@zeit/ncc": "^0.20.5",
"babel-eslint": "^9.0.0",
"babel-loader": "^8.0.0",
"babel-plugin-dynamic-import-node": "^1.2.0",
Expand Down Expand Up @@ -110,7 +111,7 @@
"url-loader": "^0.6.2",
"webpack": "^4.36.1",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.3.6",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.7.2"
},
"dependencies": {
Expand All @@ -127,14 +128,12 @@
"core-js": "^3.1.4",
"emotion-theming": "^10.0.19",
"formik": "^2.1.1",
"history": "^4.9.0",
"humps": "^2.0.1",
"jss": "^9.8.7",
"jss-preset-default": "^4.5.0",
"normalize.css": "^8.0.1",
"oboe": "^2.1.4",
"polished": "^3.4.2",
"prop-types": "^15.7.2",
"qs": "^6.7.0",
"react": "^16.12.0",
"react-dom": "^16.8.6",
Expand All @@ -144,7 +143,6 @@
"react-router-dom": "^5.1.2",
"react-virtualized": "^9.21.1",
"regenerator-runtime": "^0.13.3",
"reselect": "^3.0.1",
"semver": "^5.7.0",
"semver-compare": "^1.0.0",
"typeface-roboto": "0.0.54",
Expand Down
5 changes: 2 additions & 3 deletions scripts/bump-version.js → scripts/bump-version.ts
View file
Open in desktop
Expand Up @@ -4,11 +4,10 @@ import path from 'path';

const args = process.argv.slice(2);

const config = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json')));
const config = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json') as string));

if (args[0] === 'dev') {
// change this to patch once we hit 2.0.0
config.version = `${semver.inc(config.version, 'prerelease')}.dev`;
config.version = `${semver.inc(config.version, 'patch')}.dev`;
} else if (args[0] === 'release') {
config.version = config.version.replace(/.dev$/, '');
}
Expand Down
2 changes: 0 additions & 2 deletions scripts/create-release.js → scripts/create-release.ts
View file
Open in desktop
Expand Up @@ -14,8 +14,6 @@ async function run() {
prerelease: false,
});

debug(data);

const fileStream = fs.createReadStream('/tmp/dist.zip');
const stats = fs.statSync('/tmp/dist.zip');
const headers = {
Expand Down
11 changes: 10 additions & 1 deletion scripts/set-deployment-status.js → scripts/set-deployment-status.ts
View file
Open in desktop
@@ -1,8 +1,17 @@
import { setFailed } from '@actions/core';
import { GitHub, context } from '@actions/github';

type Status =
| "error"
| "failure"
| "inactive"
| "in_progress"
| "queued"
| "pending"
| "success";

async function run() {
const state = process.argv[2];
const state = process.argv[2] as Status;

const { repo, payload } = context;
const { repos } = new GitHub(process.env.GITHUB_TOKEN, { previews: ['flash'] });
Expand Down
2 changes: 0 additions & 2 deletions server.js
View file
Open in desktop
Expand Up @@ -22,5 +22,3 @@ server.listen(process.env.PORT || 8000, process.env.HOST || '0.0.0.0', (err) =>
}
console.log(`Listening at ${process.env.HOST || 'localhost'}:${process.env.PORT || 8000}`);
});

server.c
41 changes: 30 additions & 11 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -424,6 +424,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/plugin-syntax-typescript@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b"
integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/plugin-transform-arrow-functions@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
Expand Down Expand Up @@ -692,6 +699,15 @@
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"

"@babel/plugin-transform-typescript@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636"
integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg==
dependencies:
"@babel/helper-create-class-features-plugin" "^7.7.4"
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-typescript" "^7.7.4"

"@babel/plugin-transform-unicode-regex@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
Expand Down Expand Up @@ -768,6 +784,14 @@
"@babel/plugin-transform-react-jsx-self" "^7.7.4"
"@babel/plugin-transform-react-jsx-source" "^7.7.4"

"@babel/preset-typescript@^7.7.7":
version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.7.tgz#69ddea54e8b4e491ccbf94147e673b2ac6e11e2e"
integrity sha512-Apg0sCTovsSA+pEaI8efnA44b9x4X/7z4P8vsWMiN8rSUaM4y4+Shl5NMWnMl6njvt96+CEb6jwpXAKYAVCSQA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-transform-typescript" "^7.7.4"

"@babel/register@^7.7.7":
version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.7.tgz#46910c4d1926b9c6096421b23d1f9e159c1dcee1"
Expand Down Expand Up @@ -1564,6 +1588,11 @@
resolved "https://registry.yarnpkg.com/@types/semver-compare/-/semver-compare-1.0.1.tgz#17d1dc62c516c133ab01efb7803a537ee6eaf3d5"
integrity sha512-wx2LQVvKlEkhXp/HoKIZ/aSL+TvfJdKco8i0xJS3aR877mg4qBHzNT6+B5a61vewZHo79EdZavskGnRXEC2H6A==

"@types/semver@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a"
integrity sha512-1OzrNb4RuAzIT7wHSsgZRlMBlNsJl+do6UblR7JMW4oB7bbR+uBEYtUh7gEc/jM84GGilh68lSOokyM/zNUlBA==

"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
Expand Down Expand Up @@ -1828,11 +1857,6 @@
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

"@zeit/ncc@^0.20.5":
version "0.20.5"
resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.5.tgz#a41af6e6bcab4a58f4612bae6137f70bce0192e3"
integrity sha512-XU6uzwvv95DqxciQx+aOLhbyBx/13ky+RK1y88Age9Du3BlA4mMPCy13BGjayOrrumOzlq1XV3SD/BWiZENXlw==

abab@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
Expand Down Expand Up @@ -8850,11 +8874,6 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=

reselect@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=

resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
Expand Down Expand Up @@ -10464,7 +10483,7 @@ webpack-bundle-analyzer@^3.3.2:
opener "^1.5.1"
ws "^6.0.0"

webpack-cli@^3.3.6:
webpack-cli@^3.3.10:
version "3.3.10"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==
Expand Down