Skip to content

Commit

Permalink
Merge branch 'feature/component-optimisation' into 'develop'
Browse files Browse the repository at this point in the history 
Feature/component optimisation

See merge request olaris/olaris-react!60
  • Loading branch information
@benj3
benj3 committed May 31, 2020
2 parents 5b5c5e8 + 45a5506 commit 1f78080
Show file tree
Hide file tree
Showing 28 changed files with 3,853 additions and 3,951 deletions.
388 changes: 194 additions & 194 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,194 +1,194 @@
{
"name": "olaris",
"version": "0.3.3",
"private": true,
"homepage": "/olaris/app",
"dependencies": {
"@apollo/react-hooks": "^3.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-regular-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/react-fontawesome": "^0.1.3",
"@videojs/http-streaming": "git+https://gitlab.com/olaris/videojs-http-streaming.git#olaris",
"apollo-cache-inmemory": "^1.2.4",
"apollo-client": "^2.5.1",
"apollo-link": "^1.2.11",
"apollo-link-error": "^1.1.12",
"apollo-link-http": "^1.5.4",
"axios": "^0.19.0",
"bfj": "7.0.1",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"chalk": "2.4.2",
"connected-react-router": "^6.3.2",
"css-loader": "3.2.0",
"dotenv": "8.1.0",
"dotenv-expand": "5.1.0",
"file-loader": "4.2.0",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"fs-extra": "8.1.0",
"graphql": "^14.5.8",
"graphql-tag": "^2.9.2",
"history": "^4.10.1",
"html-webpack-plugin": "4.0.0-alpha.2",
"jest": "24.9.0",
"jwt-decode": "^2.2.0",
"lodash": "^4.17.10",
"mini-css-extract-plugin": "0.8.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"pnp-webpack-plugin": "1.5.0",
"polished": "^3.4.1",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-loader": "3.0.0",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.1",
"prop-types": "^15.6.2",
"react": "^16.8.0",
"react-alert": "^5.5.0",
"react-animations": "^1.0.0",
"react-apollo": "^3.1.1",
"react-app-polyfill": "^1.0.3",
"react-autosuggest": "^9.3.4",
"react-custom-scrollbars": "^4.2.1",
"react-dev-utils": "^9.0.4",
"react-device-detect": "^1.9.10",
"react-dom": "^16.10.0",
"react-lazyload": "^2.3.0",
"react-load-script": "^0.0.6",
"react-player-controls": "^1.1.0",
"react-redux": "^7.1.1",
"react-router": "^5.1.1",
"react-router-dom": "^5.1.1",
"react-router-prop-types": "^1.0.4",
"react-select": "^3.0.5",
"react-slick": "^0.25.2",
"react-tooltip": "^3.11.1",
"redux": "^4.0.1",
"redux-responsive": "^4.3.8",
"resolve": "1.12.0",
"shortid": "^2.2.15",
"style-loader": "1.0.0",
"styled-components": "^4.4.0",
"terser-webpack-plugin": "2.1.1",
"universal-cookie": "^4.0.2",
"url-loader": "2.1.0",
"video.js": "git+https://gitlab.com/olaris/video.js.git#olaris",
"videojs-contrib-quality-levels": "^2.0.9",
"videojs-http-source-selector": "git+https://gitlab.com/olaris/videojs-http-source-selector.git",
"videojs-overlay": "^2.1.4"
},
"devDependencies": {
"babel-eslint": "10.0.3",
"babel-jest": "24.9.0",
"babel-loader": "8.0.6",
"babel-plugin-module-resolver": "^3.1.1",
"babel-plugin-named-asset-import": "^0.3.4",
"babel-preset-react-app": "^9.0.2",
"eslint": "6.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.3.0",
"eslint-loader": "3.0.2",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"eslint-plugin-react-hooks": "^2.1.2",
"node-sass-chokidar": "^1.3.5",
"npm-run-all": "^4.1.5",
"sass-loader": "^8.0.0",
"webpack": "4.41.0",
"webpack-dev-server": "3.8.1",
"webpack-manifest-plugin": "2.1.2",
"workbox-webpack-plugin": "4.3.1",
"flow-bin": "^0.111.0",
"flow-typed": "^2.6.2"
},
"scripts": {
"build-css": "node-sass-chokidar src/ -o src/",
"watch-css": "npm run build-css && node-sass-chokidar src/Styles -o src/Styles --watch --recursive",
"start-js": "node scripts/start.js",
"dev": "npm-run-all -p watch-css start-js",
"build-js": "node scripts/build.js",
"build": "npm-run-all build-css build-js",
"test": "node scripts/test.js --env=jsdom",
"lint": "eslint .",
"flow": "flow",
"flow-typed": "flow-typed install"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/*.d.ts"
],
"resolver": "jest-pnp-resolver",
"setupFiles": [
"react-app-polyfill/jsdom"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testURL": "http://localhost",
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/*.d.ts"
],
"resolver": "jest-pnp-resolver",
"setupFiles": [
"react-app-polyfill/jsdom"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testURL": "http://localhost",
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"moduleNameMapper": {
"^react-native$": "react-native-web",
"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
},
"moduleFileExtensions": [
"web.js",
"js",
"web.ts",
"ts",
"web.tsx",
"tsx",
"json",
"web.jsx",
"jsx",
"node"
]
},
"eslintConfig": {
"extends": "react-app"
}
}
}
{
"name": "olaris",
"version": "0.3.3",
"private": true,
"homepage": "/olaris/app",
"dependencies": {
"@apollo/react-hooks": "^3.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-regular-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
"@fortawesome/react-fontawesome": "^0.1.3",
"@videojs/http-streaming": "git+https://gitlab.com/olaris/videojs-http-streaming.git#olaris",
"apollo-cache-inmemory": "^1.2.4",
"apollo-client": "^2.5.1",
"apollo-link": "^1.2.11",
"apollo-link-error": "^1.1.12",
"apollo-link-http": "^1.5.4",
"axios": "^0.19.0",
"bfj": "7.0.1",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"chalk": "2.4.2",
"connected-react-router": "^6.3.2",
"css-loader": "3.2.0",
"dotenv": "8.1.0",
"dotenv-expand": "5.1.0",
"file-loader": "4.2.0",
"fork-ts-checker-webpack-plugin-alt": "0.4.14",
"fs-extra": "8.1.0",
"graphql": "^14.5.8",
"graphql-tag": "^2.9.2",
"history": "^4.10.1",
"html-webpack-plugin": "4.0.0-alpha.2",
"jest": "24.9.0",
"jwt-decode": "^2.2.0",
"lodash": "^4.17.10",
"mini-css-extract-plugin": "0.8.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"pnp-webpack-plugin": "1.5.0",
"polished": "^3.4.1",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-loader": "3.0.0",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.1",
"prop-types": "^15.6.2",
"react": "^16.8.0",
"react-alert": "^5.5.0",
"react-animations": "^1.0.0",
"react-apollo": "^3.1.1",
"react-app-polyfill": "^1.0.3",
"react-autosuggest": "^9.3.4",
"react-custom-scrollbars": "^4.2.1",
"react-dev-utils": "^9.0.4",
"react-device-detect": "^1.9.10",
"react-dom": "^16.10.0",
"react-lazyload": "^2.3.0",
"react-load-script": "^0.0.6",
"react-player-controls": "^1.1.0",
"react-redux": "^7.1.1",
"react-router": "^5.1.1",
"react-router-dom": "^5.1.1",
"react-router-prop-types": "^1.0.4",
"react-select": "^3.0.5",
"react-slick": "^0.25.2",
"react-tooltip": "^3.11.1",
"redux": "^4.0.1",
"redux-responsive": "^4.3.8",
"resolve": "1.12.0",
"shortid": "^2.2.15",
"style-loader": "1.0.0",
"styled-components": "^4.4.0",
"terser-webpack-plugin": "2.1.1",
"universal-cookie": "^4.0.2",
"url-loader": "2.1.0",
"video.js": "git+https://gitlab.com/olaris/video.js.git#olaris",
"videojs-contrib-quality-levels": "^2.0.9",
"videojs-http-source-selector": "git+https://gitlab.com/olaris/videojs-http-source-selector.git",
"videojs-overlay": "^2.1.4"
},
"devDependencies": {
"babel-eslint": "10.0.3",
"babel-jest": "24.9.0",
"babel-loader": "8.0.6",
"babel-plugin-module-resolver": "^3.1.1",
"babel-plugin-named-asset-import": "^0.3.4",
"babel-preset-react-app": "^9.0.2",
"eslint": "6.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.3.0",
"eslint-loader": "3.0.2",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"eslint-plugin-react-hooks": "^2.1.2",
"node-sass-chokidar": "^1.3.5",
"npm-run-all": "^4.1.5",
"sass-loader": "^8.0.0",
"webpack": "4.41.0",
"webpack-dev-server": "3.8.1",
"webpack-manifest-plugin": "2.1.2",
"workbox-webpack-plugin": "4.3.1",
"flow-bin": "^0.111.0",
"flow-typed": "^2.6.2"
},
"scripts": {
"build-css": "node-sass-chokidar src/ -o src/",
"watch-css": "npm run build-css && node-sass-chokidar src/Styles -o src/Styles --watch --recursive",
"start-js": "node scripts/start.js",
"dev": "npm-run-all -p watch-css start-js",
"build-js": "node scripts/build.js",
"build": "npm-run-all build-css build-js",
"test": "node scripts/test.js --env=jsdom",
"lint": "eslint .",
"flow": "flow",
"flow-typed": "flow-typed install"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/*.d.ts"
],
"resolver": "jest-pnp-resolver",
"setupFiles": [
"react-app-polyfill/jsdom"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testURL": "http://localhost",
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,ts,tsx}",
"!src/**/*.d.ts"
],
"resolver": "jest-pnp-resolver",
"setupFiles": [
"react-app-polyfill/jsdom"
],
"testMatch": [
"<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
"<rootDir>/src/**/?(*.)(spec|test).{js,jsx,ts,tsx}"
],
"testEnvironment": "jsdom",
"testURL": "http://localhost",
"transform": {
"^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
"^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"moduleNameMapper": {
"^react-native$": "react-native-web",
"^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
},
"moduleFileExtensions": [
"web.js",
"js",
"web.ts",
"ts",
"web.tsx",
"tsx",
"json",
"web.jsx",
"jsx",
"node"
]
},
"eslintConfig": {
"extends": "react-app"
}
}
}
Loading

0 comments on commit 1f78080

Please sign in to comment.