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

Refactor debug dashboard #226

Merged
merged 17 commits into from
Apr 8, 2019
Merged

Refactor debug dashboard #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
865045b
Refactor debug dashboard
tinder-rhsiao Mar 28, 2019
460c9a1
Stqrt to move to react compontn based dashboard
tinder-rhsiao Mar 28, 2019
cc5a555
Use react to render dashboard
tinder-rhsiao Mar 28, 2019
4453fc7
Load compiled file for now
tinder-rhsiao Mar 28, 2019
cc270a4
delete yarn file
roderickhsiao Mar 28, 2019
34be554
Delete functional file
tinder-rhsiao Mar 28, 2019
aa7e76f
Merge branch 'dashboard' of github.com:roderickhsiao/react-i13n into …
tinder-rhsiao Mar 28, 2019
064fcab
Try to reuse applied saucelab key
tinder-rhsiao Apr 1, 2019
980af88
Try chrome to see if functional tests pass
roderickhsiao Apr 2, 2019
7905d64
Update to latest browser and lower throttled
roderickhsiao Apr 2, 2019
8f4f77f
comment out IE and Safari to test build
roderickhsiao Apr 2, 2019
05ec3a0
Comment out edge
roderickhsiao Apr 2, 2019
8ab8d21
Add back safari
roderickhsiao Apr 2, 2019
27e6599
Change only throttled 1
roderickhsiao Apr 2, 2019
87af776
Update Gruntfile.js
roderickhsiao Apr 2, 2019
d4dcd87
Babel/eslint should be in devDependencies
tinder-rhsiao Apr 8, 2019
92a1a52
React 16.6.0 is enough for React.lazy
tinder-rhsiao Apr 8, 2019
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
4 changes: 4 additions & 0 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"env": {
"plugins": [
"dynamic-import-node",
"syntax-dynamic-import"
],
"test": {
"presets": [
"env",
Expand Down
18 changes: 9 additions & 9 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
module.exports = {
extends: [
'eslint-config-airbnb-base',
'eslint-config-airbnb-base/rules/strict'
].map(
require.resolve
),
extends: ['airbnb'],
rules: {
'comma-dangle': 0,
'func-names': 0,
Expand All @@ -14,11 +9,16 @@ module.exports = {
'no-plusplus': 0,
'no-underscore-dangle': 0,
'no-unused-expressions': 0,
'no-use-before-define': 0
'no-use-before-define': 0,
'import/no-named-as-default': 0,
'import/no-named-as-default-member': 0
},
env: {
browser: true,
node: true,
jasmine: true
}
jasmine: true,
es6: true
},
plugins: ['import', 'react'],
parser: 'babel-eslint'
};
65 changes: 40 additions & 25 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = function (grunt) {
dist: {
options: {
sourceMap: false,
plugins: [],
plugins: ['dynamic-import-node', 'syntax-dynamic-import'],
presets: [
[
'env',
Expand All @@ -109,6 +109,7 @@ module.exports = function (grunt) {
'dist-es': {
options: {
sourceMap: false,
plugins: ['dynamic-import-node', 'syntax-dynamic-import'],
presets: [
[
'env',
Expand All @@ -135,10 +136,25 @@ module.exports = function (grunt) {
]
},
functional: {
options: {
sourceMap: false,
plugins: ['dynamic-import-node', 'syntax-dynamic-import'],
presets: [
[
'env',
{
loose: true
}
],
'react'
]
},
files: [
{
expand: true,
src: ['<%= project.functional %>/**/*.jsx'],
cwd: '<%= project.functional %>',
src: ['**/*.jsx'],
dest: '<%= project.functional %>/',
extDot: 'last',
ext: '.js'
}
Expand Down Expand Up @@ -170,7 +186,7 @@ module.exports = function (grunt) {
main: './<%= project.functional %>/bootstrap.js'
},
output: {
path: './<%= project.functional %>/'
path: path.resolve(process.cwd(), projectConfig.functional)
Copy link
Contributor

Choose a reason for hiding this comment

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

👍 thx for fixing this, I noticed this is broken for a while

},
module: {
rules: [
Expand Down Expand Up @@ -209,6 +225,10 @@ module.exports = function (grunt) {
'saucelabs-mocha': {
all: {
options: {
// this is apply for open source project https://saucelabs.com/open-source
username: 'roderick.hsiao',
key: () => 'a7c8994f-a04b-4d04-808f-1090f5148079',

testname: 'react-i13n func test',
urls: ['http://127.0.0.1:9999/tests/functional/page.html'],

Expand All @@ -220,36 +240,31 @@ module.exports = function (grunt) {
},
throttled: 3,
browsers: [
{
browserName: 'internet explorer',
platform: 'Windows 7',
version: '9'
},
{
browserName: 'internet explorer',
platform: 'Windows 8',
version: '10'
},
{
browserName: 'internet explorer',
platform: 'Windows 8.1',
version: '11'
},
// {
// browserName: 'edge',
// platform: 'Windows 10',
// version: '16.16299'
// },
// {
// browserName: 'internet explorer',
// platform: 'Windows 10',
// version: '11.285'
// },
{
browserName: 'chrome',
platform: 'Windows 10',
version: '49'
version: '73'
},
{
browserName: 'firefox',
platform: 'Windows 7',
version: '50'
},
{
browserName: 'safari',
platform: 'OS X 10.11',
version: '10.0'
version: '66'
}
// {
// browserName: 'safari',
// platform: 'macOS 10.14',
// version: '12.0'
// }
]
}
}
Expand Down
Loading