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

Project "Jiffy Lube": TypeScript, Continuous Integration, React 16.13, etc. #131

Merged
merged 70 commits into from
Aug 23, 2020
Merged
Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
d308287
github config and vscode settings
jdpigeon Jun 21, 2020
824b322
webpack
jdpigeon Jun 21, 2020
4faad36
Updated package.json
jdpigeon Jun 21, 2020
57b81c1
tsconfig
jdpigeon Jun 21, 2020
7760992
scripts and test
jdpigeon Jun 22, 2020
27b267a
everything else
jdpigeon Jun 22, 2020
9e1fb53
deps
jdpigeon Jun 22, 2020
aae9015
prepping for conversion
jdpigeon Jun 22, 2020
07f16d5
flow -> ts
jdpigeon Jun 22, 2020
6c7410b
prettier
jdpigeon Jun 22, 2020
ec212c7
more flow -ts
jdpigeon Jun 23, 2020
dc51ea3
Updated app root files
jdpigeon Jun 23, 2020
08178d6
updated routes
jdpigeon Jun 23, 2020
3efd627
added redux thunk back
jdpigeon Jun 25, 2020
914e9c4
Ran prettier
jdpigeon Jun 25, 2020
074a274
started adding ts and eslint rules
jdpigeon Jun 25, 2020
95b42b9
Started fixing things!
jdpigeon Jun 25, 2020
75cdb11
Object -> object
jdpigeon Jun 27, 2020
2ee02d0
updated constants to enum
peter7cole Jun 27, 2020
d51e9e0
Merge branch 'dano/boilerplate' of https://github.com/makebrainwaves/…
peter7cole Jun 27, 2020
09c14e3
Refactored Device Reducer to use toolkit
jdpigeon Jun 27, 2020
593ec0b
Updated experiment actions and reducer
jdpigeon Jul 11, 2020
ecd36ef
turned off default export rule
jdpigeon Jul 19, 2020
96adea6
Added typesafe actions
jdpigeon Jul 19, 2020
d338472
Finished experiment epics and refactored to use typesafe actions
jdpigeon Jul 19, 2020
29a312f
Updated jupyter redux tree
jdpigeon Jul 19, 2020
c4c43c0
updated await pipe
jdpigeon Jul 26, 2020
0277678
Post breaky changes with Teon
jdpigeon Jul 26, 2020
1fd968a
Some more changes
jdpigeon Jul 26, 2020
c3bdd7c
Merge branch 'master' of github.com:makebrainwaves/BrainWaves into da…
jdpigeon Jul 27, 2020
55897bd
Fixed a lot more errors
jdpigeon Jul 28, 2020
f0da762
Fixed a few more errors
jdpigeon Jul 28, 2020
b8e42d6
late night ASMR bug fixing
jdpigeon Jul 29, 2020
bc2f408
ASMR and error fixes
jdpigeon Jul 30, 2020
99e5ee0
work done on existing red errors only
peter7cole Jul 31, 2020
03b6082
Merge pull request #133 from makebrainwaves/peter
jdpigeon Aug 2, 2020
08c1047
fixed a few more errors
jdpigeon Aug 8, 2020
d38b042
Fixed last of the warnings
jdpigeon Aug 9, 2020
13bad5d
updated deps to match v.13 boilerplate
jdpigeon Aug 9, 2020
a55e19e
Removed some files from exclude tsconfig
jdpigeon Aug 9, 2020
5ab998c
updated internals and webpack configs
jdpigeon Aug 9, 2020
2eb02a7
updated app index and main
jdpigeon Aug 9, 2020
2b3485b
other minor updates
jdpigeon Aug 9, 2020
f8fb603
Fixed some build issues after upgrade and upgraded yarn lock
jdpigeon Aug 9, 2020
1229659
removed typescript-eslint rules
jdpigeon Aug 9, 2020
12c2fe2
Updated store
jdpigeon Aug 9, 2020
68d9191
Ran lint-fix
jdpigeon Aug 9, 2020
11d7eb2
Updated eslint and some configs
jdpigeon Aug 9, 2020
e83d424
Fixed errors with brittle file reading of previous experiments
jdpigeon Aug 14, 2020
f83cf40
Cleaning things up; Removing jspsych references; unmounted epics
jdpigeon Aug 14, 2020
56e5b47
Refactored ExperimentWindow
jdpigeon Aug 14, 2020
d3ef6d0
small left over changes
jdpigeon Aug 17, 2020
ea7e909
object -> Record<string,any>
jdpigeon Aug 17, 2020
7572f5e
fixed Redux
jdpigeon Aug 17, 2020
3567792
fixing last error
jdpigeon Aug 17, 2020
ff64c84
pinned react types version
jdpigeon Aug 17, 2020
fb77af6
HashHistory -> History
jdpigeon Aug 17, 2020
318bc7d
Removed some onerous ts rules
jdpigeon Aug 19, 2020
1e59a25
Fixing things
jdpigeon Aug 19, 2020
616bd6b
Fixed more errors; refactoring becoming clear
jdpigeon Aug 19, 2020
c02a780
Fixed all of the typescript errors while listening to mouth noises
jdpigeon Aug 20, 2020
994dcbf
Update app/utils/labjs/protocols/faceshouses.ts
jdpigeon Aug 21, 2020
e0ed7e6
Update .github/workflows/test.yml
jdpigeon Aug 21, 2020
8a3f56a
Addressed comments
jdpigeon Aug 21, 2020
5ad82f8
Merge branch 'dano/boilerplate' of https://github.com/makebrainwaves/…
jdpigeon Aug 21, 2020
814f486
fixed missing parenthesis in teons elegant faceshouse stimulus refactor
jdpigeon Aug 21, 2020
f5993cc
v0.14.0
jdpigeon Aug 21, 2020
99e1dbb
Massaged the import
jdpigeon Aug 21, 2020
35368fb
v0.14.1
jdpigeon Aug 21, 2020
961e165
Fixed out of bounds experiment window and broken start experiment button
jdpigeon Aug 22, 2020
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
6 changes: 1 addition & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ app/node_modules
# OSX
.DS_Store

# flow-typed
flow-typed/npm/*
!flow-typed/npm/module_vx.x.x.js

# App packaged
release
app/main.prod.js
Expand All @@ -50,4 +46,4 @@ main.js.map

.idea
npm-debug.log.*
.*.dockerfile
.*.dockerfile
12 changes: 8 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@ app/node_modules
# OSX
.DS_Store

# flow-typed
flow-typed/npm/*
!flow-typed/npm/module_vx.x.x.js

# App packaged
release
app/*.main.prod.js
app/main.prod.js
app/main.prod.js.map
app/renderer.prod.js
Expand All @@ -51,3 +48,10 @@ main.js.map
.idea
npm-debug.log.*
__snapshots__

# Package.json
package.json
.travis.yml
*.css.d.ts
*.sass.d.ts
*.scss.d.ts
105 changes: 36 additions & 69 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,84 +1,51 @@
module.exports = {
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module',
allowImportExportEverywhere: true,
},
extends: ['airbnb', 'prettier'],
env: {
browser: true,
node: true,
},
extends: 'erb/typescript',
rules: {
'arrow-parens': ['off'],
'compat/compat': 'error',
'consistent-return': 'off',
'comma-dangle': 'off',
'generator-star-spacing': 'off',
'flowtype/object-type-delimiter': 'off',
'flowtype/no-weak-types': 'warn',
'import/no-unresolved': 'error',
'@typescript-eslint/ban-ts-comment': 'warn',
'@typescript-eslint/no-use-before-define': 'off',
'@typescript-eslint/naming-convention': 'off',
'consistent-return': 'warn',
'dot-notation': 'off',
'import/no-extraneous-dependencies': 'off',
'jsx-a11y/anchor-is-valid': 'off',
'no-console': 'off',
'no-use-before-define': 'off',
'no-multi-assign': 'off',
'import/prefer-default-export': 'off',
'jsx-a11y/anchor-is-valid': 'warn',
'jsx-a11y/click-events-have-key-events': 'warn',
'lines-between-class-members': 'off',
'max-classes-per-file': 'off',
'no-param-reassign': 'off',
'no-plusplus': 'off',
'no-param-reassign': 'warn',
'promise/param-names': 'error',
'promise/always-return': 'error',
'promise/catch-or-return': 'error',
'promise/no-native': 'off',
'prefer-destructuring': 'off',
'react/no-will-update-set-state': 'warn',
'react/no-did-mount-set-state': 'warn',
'react/no-did-update-set-state': 'warn',
'react/sort-comp': [
'error',
{
order: ['type-annotations', 'static-methods', 'lifecycle', 'everything-else', 'render'],
},
],
'react/jsx-no-bind': 'off',
'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
'react/prefer-stateless-function': 'off',
'linebreak-style': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'flowtype/boolean-style': ['error', 'boolean'],
'flowtype/define-flow-type': 'warn',
'flowtype/delimiter-dangle': 'off',
'flowtype/generic-spacing': ['error', 'never'],
'flowtype/no-primitive-constructor-types': 'error',
'flowtype/no-weak-types': 'warn',
'flowtype/object-type-delimiter': ['off'],
'flowtype/require-parameter-type': 'off',
'flowtype/require-return-type': 'off',
'flowtype/require-valid-file-annotation': 'off',
'flowtype/semi': ['error', 'always'],
'flowtype/space-after-type-colon': ['error', 'always'],
'flowtype/space-before-generic-bracket': ['error', 'never'],
'flowtype/space-before-type-colon': ['error', 'never'],
'flowtype/union-intersection-spacing': ['error', 'always'],
'flowtype/use-flow-type': 'error',
'flowtype/valid-syntax': 'error',
'react/no-will-update-set-state': 'warn',
'no-restricted-syntax': 'off',
'prefer-destructuring': 'warn',
'promise/no-return-wrap': 'warn',
'react/destructuring-assignment': 'off',
'react/jsx-props-no-spreading': 'warn',
'react/jsx-wrap-multilines': 'off',
'react/jsx-curly-newline': 'off',
'react/jsx-one-expression-per-line': 'off',
'import/order': 'off',
'max-classes-per-file': 'off',
'dot-notation': 'off',
'linebreak-style': 0,
'import/prefer-default-export': 0,
'react/jsx-props-no-spreading': 'off',
'react/jsx-wrap-multilines': 'off',
'react/no-access-state-in-setstate': 'warn',
'react/no-array-index-key': 'off',
'react/no-did-update-set-state': 'warn',
'react/no-will-update-set-state': 'warn',
'react/prop-types': 'off',
'react/static-property-placement': 'off',
},
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
project: './tsconfig.json',
tsconfigRootDir: __dirname,
createDefaultProgram: true,
},
plugins: ['flowtype', 'import', 'promise', 'compat', 'react'],
settings: {
'import/resolver': {
// See https://github.com/benmosher/eslint-plugin-import/issues/1396#issuecomment-575727774 for line below
node: {},
webpack: {
config: require.resolve('./webpack.config.eslint.js'),
config: require.resolve('./configs/webpack.config.eslint.js'),
},
},
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
},
};
28 changes: 0 additions & 28 deletions .flowconfig

This file was deleted.

6 changes: 6 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
requiredHeaders:
- Prerequisites
- Expected Behavior
- Current Behavior
- Possible Solution
- Your Environment
36 changes: 36 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Test

on: push

jobs:
release:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-10.14, windows-2019, ubuntu-18.04]
jdpigeon marked this conversation as resolved.
Show resolved Hide resolved

steps:
- name: Check out Git repository
uses: actions/checkout@v1

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 13

- name: yarn install
run: |
yarn install

- name: yarn test
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
yarn package-ci
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are packaged artifacts only generated with the merge or should we see them listed under the artifact section on the testing page for github actions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this CI setup doesn't attach artifacts to actions, but to Github releases. Once CI completes next, we should see app installers automatically attached to this draft release https://github.com/makebrainwaves/BrainWaves/releases/tag/v0.14.0

yarn lint
yarn tsc

# Failing because virtual framebuffer not installed
# yarn build-e2e
# yarn test-e2e
61 changes: 9 additions & 52 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,77 +1,34 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Jupyter stuff
.ipynb_checkpoints
__pycache__


# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Auto-generated files
#yarn.lock
#package-lock.json

# flow-typed
flow-typed/npm

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/
app/utils/pyodide/src/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

# next.js build output
.next
# OSX
.DS_Store

# App packaged
release
Expand All @@ -82,13 +39,13 @@ app/renderer.prod.js.map
app/style.css
app/style.css.map
dist
app/dist
dll
dll/renderer.dev.dll.js
dll/renderer.json
main.js
main.js.map

.idea
npm-debug.log.*
*.css.d.ts
*.sass.d.ts
*.scss.d.ts
keys.js
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

9 changes: 0 additions & 9 deletions .prettierrc.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .stylelintrc

This file was deleted.

42 changes: 0 additions & 42 deletions .travis.yml

This file was deleted.

Loading