Skip to content

Commit

Permalink
6.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mgusmano committed Mar 21, 2019
1 parent a9718b6 commit 58109fb
Show file tree
Hide file tree
Showing 50 changed files with 1,785 additions and 2,090 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -446,7 +446,7 @@ function MyComponent() {
Select your toolkit, theme, and packages using [@sencha/ext-react-webpack-plugin](https://github.com/sencha/ext-react/tree/master/packages/ext-react-webpack-plugin). The plugin scans your code and only includes the classes you need in the final bundle. Here's an example:

```JavaScript
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin');
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin');

module.exports = {
...
Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-classic-boilerplate/package.json
Expand Up @@ -55,7 +55,7 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-webpack-plugin": "~6.7.1",
"babel-loader": "^8.0.4",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-classic-boilerplate/webpack.config.js
@@ -1,7 +1,7 @@
const webpack = require('webpack')
const path = require('path')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin')
const portfinder = require('portfinder')
const sourcePath = path.join(__dirname, './src')

Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-classic-demo/package.json
Expand Up @@ -55,7 +55,7 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-webpack-plugin": "~6.7.1",
"babel-loader": "^8.0.4",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-classic-demo/webpack.config.js
@@ -1,7 +1,7 @@
const webpack = require('webpack')
const path = require('path')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin')
const portfinder = require('portfinder')
const sourcePath = path.join(__dirname, './src')

Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-classic-renderwhenready/package.json
Expand Up @@ -56,7 +56,7 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-webpack-plugin": "~6.7.1",
"babel-loader": "^8.0.0",
"copy-webpack-plugin": "^4.5.2",
"cross-env": "^5.2.0",
Expand Down
@@ -1,7 +1,7 @@
const webpack = require('webpack');
const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin')
const portfinder = require('portfinder')
const sourcePath = path.join(__dirname, './src');

Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-conference-app/package.json
Expand Up @@ -68,7 +68,7 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-webpack-plugin": "~6.7.1",
"babel-loader": "^8.0.2",

"cross-env": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-conference-app/webpack.config.js
@@ -1,7 +1,7 @@
const webpack = require('webpack')
const path = require('path')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin')
const portfinder = require('portfinder')
const sourcePath = path.join(__dirname, './src')

Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-froala-example/package.json
Expand Up @@ -50,7 +50,7 @@
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-webpack-plugin": "~6.7.1",
"babel-loader": "^8.0.2",
"cross-env": "^5.2.0",
"css-loader": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ext-react-froala-example/webpack.config.js
@@ -1,7 +1,7 @@
const webpack = require('webpack');
const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-webpack-plugin')
const ExtWebpackPlugin = require('@sencha/ext-react webpack-plugin')
const portfinder = require('portfinder')
const sourcePath = path.join(__dirname, './src');

Expand Down
8 changes: 4 additions & 4 deletions packages/ext-react-gen/package.json
Expand Up @@ -18,15 +18,15 @@
},
"preferGlobal": true,
"dependencies": {
"@sencha/ext-react-modern-boilerplate": "^6.7.0",
"@sencha/ext-react-modern-typescript-boilerplate": "^6.7.0",
"@sencha/ext-react-classic-boilerplate": "^6.7.0",
"@sencha/ext-react-modern-boilerplate": "^6.7.1",
"@sencha/ext-react-modern-typescript-boilerplate": "^6.7.1",
"@sencha/ext-react-classic-boilerplate": "^6.7.1",
"react": "~16.8.4",
"react-dom": "~16.8.4",
"react-reconciler": "~0.20.2",
"chalk": "^2.4.2",
"glob": "^7.1.3",
"boxen": "^2.1.0",
"boxen": "^3.0.0",
"command-line-args": "^5.0.2",
"comment-json": "^1.1.3",
"cross-spawn": "^6.0.5",
Expand Down
46 changes: 21 additions & 25 deletions packages/ext-react-kitchensink/package.json
Expand Up @@ -5,20 +5,10 @@
"description": "A boilerplate project for Ext React showing all Ext JS modern components.",
"main": "index.js",
"scripts": {
"clean": "rimraf build",
"start": "npm run dev",
"dev": "webpack-dev-server --env.environment=development",
"prod2": "webpack-dev-server --env.environment=production",
"build": "npm run clean && cross-env NODE_ENV=production webpack --env.environment=production --env.treeshake=true",
"prod": "npm run build",
"b1zzz": "npm run clean && cross-env webpack --env.environment=production --env.treeshake=true",
"b2zzz": "cross-env webpack --env.environment=production",
"build2zzz": "npm run clean && cross-env webpack --env.environment=production --env.treeshake=true && cross-env webpack --env.environment=production"
},
"extbuild": {
"defaultprofile": "",
"defaultenvironment": "development",
"defaultverbose": "no"
"clean": "rimraf build",
"dev": "webpack-dev-server --env.browser='yes' --env.verbose='no'",
"build": "npm run clean && cross-env webpack --env.environment='production' --env.treeshake='yes'"
},
"author": "Sencha, Inc.",
"repository": {
Expand All @@ -31,10 +21,12 @@
},
"homepage": "https://github.com/sencha/ext-react#readme",
"dependencies": {
"@sencha/ext-react": "^6.7.1",
"@sencha/ext-react-renderercell": "^6.7.1",
"@sencha/ext-react-transition": "^6.7.1",

"@sencha/ext": "^6.7.0",
"@sencha/ext-modern": "^6.7.0",
"@sencha/ext-modern-theme-material": "~6.7.0",
"@sencha/ext-modern-treegrid": "~6.7.0",

"@sencha/ext-calendar": "~6.7.0",
Expand All @@ -46,26 +38,25 @@
"@sencha/ext-pivot-d3": "~6.7.0",
"@sencha/ext-ux": "^6.7.0",

"@sencha/ext-react": "^6.7.1",
"@sencha/ext-react-renderercell": "^6.7.1",
"@sencha/ext-react-transition": "^6.7.1",
"@sencha/ext-modern-theme-material": "~6.7.0",

"@babel/polyfill": "^7.2.5",
"@babel/runtime": "^7.3.4",

"d3": "4.5.0",
"highlightjs": "~9.12.0",
"history": "~4.7.2",
"prop-types": "~15.7.2",

"react": "~16.8.4",
"react-dom": "~16.8.4",
"@hot-loader/react-dom":"~16.8.4",
"react-redux": "~6.0.1",
"react-router-dom": "~4.3.1",
"redux": "~4.0.1"
},
"devDependencies": {
"@sencha/ext-react-babel-plugin": "^6.7.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-webpack-plugin": "^7.0.0",
"@sencha/ext-react-babel-plugin": "^6.7.1",
"@sencha/ext-react-webpack-plugin": "~6.7.1",

"@babel/core": "^7.3.4",
"@babel/plugin-proposal-class-properties": "^7.3.4",
Expand All @@ -80,18 +71,23 @@
"@babel/plugin-transform-runtime": "^7.3.4",
"@babel/preset-env": "^7.3.4",
"@babel/preset-react": "^7.0.0",
"babel-loader": "^8.0.5",

"cross-env": "^5.2.0",
"rimraf": "^2.6.3",
"portfinder": "^1.0.20",

"html-webpack-plugin": "^3.2.0",
"base-href-webpack-plugin": "~2.0.0",
"copy-webpack-plugin": "^5.0.1",
"webpack-shell-plugin-next": "^0.6.4",
"css-loader": "^2.1.1",
"react-hot-loader": "^4.8.0",

"babel-loader": "^8.0.5",
"html-loader": "^0.5.5",
"style-loader": "^0.23.1",
"css-loader": "^2.1.0",
"sass-loader": "^7.1.0",

"node-sass": "^4.11.0",
"react-hot-loader": "^4.8.0",

"webpack": "^4.29.6",
"webpack-cli": "^3.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/ext-react-kitchensink/src/App.js
@@ -1,6 +1,5 @@
import React from 'react'
import Layout from './Layout';
//import { HashRouter as Router, Route } from 'react-router-dom' mjg
import { Router, Route } from 'react-router-dom'

import createHistory from 'history/createHashHistory'
Expand Down Expand Up @@ -38,4 +37,5 @@ export default function App() {
</Router>
</Provider>
)
}
}
//https://github.com/gaearon/react-hot-loader/tree/7089062eac273832102c074a368d5af27e23e0b0#webpack-plugin
9 changes: 4 additions & 5 deletions packages/ext-react-kitchensink/src/Files.js
Expand Up @@ -39,18 +39,17 @@ export default class Files extends Component {
}

highlightCode() {
//had to add .cmp - is there a way to avoid this??
if (this.refs.tabs) for (let el of this.refs.tabs.cmp.el.query('.code')) {
highlightBlock(el);
}
if (this.tabs) for (let el of this.tabs.cmp.el.query('.code')) {
highlightBlock(el);
}
}

render() {
const { files } = this.props;

return (
<TabPanel
ref="tabs"
ref={(tabs) => {this.tabs = tabs}}
shadow
tabBar={{
layout: {
Expand Down
Expand Up @@ -41,7 +41,6 @@ export default class BasicAreaChartExample extends Component {

render() {
var { theme } = this.state
console.log(theme)

return (
<Container padding={!Ext.os.is.Phone && 10} layout="fit">
Expand All @@ -52,6 +51,7 @@ export default class BasicAreaChartExample extends Component {
/>
<Cartesian
shadow
downloadServerUrl='http://svg.sencha.io'
store={this.store}
theme={theme}
insetPadding="25 35 0 10"
Expand Down
Expand Up @@ -38,7 +38,7 @@ export default class NavigatorExample extends Component {

getChart() {
//Added cmp to access component attributes in ext-react16 [revisit]
return this.refs.navigator.cmp.getChart()
return this.navigator.cmp.getChart()
}

categoryRenderer = (axis, value) => Math.round(value * 180 / Math.PI)
Expand All @@ -56,10 +56,11 @@ export default class NavigatorExample extends Component {
/>
<ChartNavigator
shadow
ref="navigator"
ref={(navigator) => {this.navigator = navigator}}
navigator={{ axis: 'bottom' }}
chart={{
xtype: 'cartesian',
downloadServerUrl: 'http://svg.sencha.io',
reference: 'chart',
insetPadding: '20 10 10 10',
platformConfig: {
Expand Down
1 change: 1 addition & 0 deletions packages/ext-react-kitchensink/src/themer.js
@@ -0,0 +1 @@
//2019-3-21 07:48:44

0 comments on commit 58109fb

Please sign in to comment.