Update master with 6.7.1

CONTRIBUTOR.md

@@ -0,0 +1,19 @@
+# Contributor Instructions
+
+## Sign the CLA
+
+Before any contributions can be done, we need you to [sign the Sencha CLA](https://goo.gl/forms/XGj5PlhNUc9suiQE3). If you have already signed it for another Sencha open source repository, you're good to go. 
+
+## Patches & Enhancements
+Have you found something that you would like to fix. 
+
+1. Fork the repo
+2. Make your modification
+3. Submit your patch by pulling against the master. 
+4. Wait for a repo admin to review. 
+5. Possibly make modifications
+6. Repeat #4 after modifications
+7. Repo admin may merge your request. 
+
+## Communication
+Please ask us questions, we want to help. 

LICENSE.md

@@ -0,0 +1,13 @@
+Copyright (c) 2011-2019 Sencha, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.10.7"
+  "version": "3.13.1"
 }

misc

@@ -10,6 +10,8 @@ npm --registry https://npm.sencha.com/ whoami
 
 https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally
 
+ps -ej | grep sencha.jar
+sudo kill -9 22952
 
 git remote add upstream https://github.com/sencha/ext-react.git
 git remote -v
@@ -29,6 +31,7 @@ git checkout v6.6.0
 git fetch upstream
 git merge upstream/master
 git merge upstream/ext-gen-6.7.x
+git merge upstream/ext-gen-7.0.x
 
 /usr/local/lib/node_modules/node/lib/node_modules/@sencha/ext-gen
 

other/u/upgrade.js

@@ -249,7 +249,7 @@ class Upgrade {
   handleWorkspaceJsonUpgrade() {
     var workspaceJsonObject = this.getJson('workspace.json')
     workspaceJsonObject.frameworks.ext.path = 'node_modules/@sencha/ext'
-    //workspaceJsonObject.frameworks.ext.version = '6.7.0.0'  //needs to be looked up
+    //workspaceJsonObject.frameworks.ext.version = '7.0.0.0'  //needs to be looked up
 
     //workspaceJsonObject.packages.dir.push("node_modules/@sencha")
 

package.json

@@ -1,12 +1,26 @@
 {
-  "private": true,
+  "name": "ext-gen",
+  "version": "7.0.0",
+  "description": "ext-gen root",
+  "main": "index.js",
   "scripts": {
-    "postinstall": "lerna bootstrap",
-    "increment": "lerna publish --skip-git --skip-npm --force-publish",
-    "clean": "lerna clean",
-    "install:clean": "npm cache clear --force && lerna clean && npm install"
+    "postinstall": "npx lerna bootstrap --loglevel warn",
+    "increment": "npx lerna publish --skip-git --skip-npm --force-publish",
+    "clean": "npx lerna clean",
+    "install:clean": "npm cache clear --force && npx lerna clean && npm install"
   },
+  "keywords": [
+    "Ext",
+    "JS",
+    "Sencha"
+  ],
+  "author": "Sencha, Inc.",
+  "license": "MIT",
   "devDependencies": {
-    "lerna": "3.10.7"
+    "lerna": "^3.13.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sencha/ext-allshared"
   }
 }

packages/ext-build-generate-app/ext-templates/application/classicdesktop/app/desktop/src/view/home/HomeView.scss.tpl.default

@@ -1,7 +1,7 @@
 // sass for {appName}.view.home.HomeView
 .homeview { 
 	color: $color;
-  background-color: $base-light-color;
+  background-color: white;
   padding: 15px;
   border: 1px solid lightgray;
   box-shadow: 2px 2px 8px 0 rgba(0, 0, 0, 0.4);

packages/ext-build-generate-app/ext-templates/application/classicdesktop/app/desktop/src/view/main/detail/DetailView.scss.tpl.default

@@ -1,6 +1,6 @@
 .detailview { 
 	color: $color;
-  background-color: $base-light-color;
+  background-color: white;
   padding: 15px;
   box-shadow: 2px 2px 8px 0 rgba(0, 0, 0, 0.4);
 }

packages/ext-build-generate-app/ext-templates/application/classicdesktop/index.js.tpl.default

@@ -0,0 +1 @@
+//this file exists so the webpack build process will succeed

packages/ext-build-generate-app/ext-templates/application/classicdesktop/workspace.json.tpl.default

@@ -7,7 +7,7 @@
     "dir": "$\u007Bworkspace.dir}/build"
   },
   "packages": {
-    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux",
+    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux,$\u007Bworkspace.dir}/node_modules/@sencha/ext-font-ios",
     "extract": "$\u007Bworkspace.dir}/packages/remote"
   }
-}
+}

packages/ext-build-generate-app/ext-templates/application/classicdesktoplogin/index.js.tpl.default

@@ -0,0 +1 @@
+//this file exists so the webpack build process will succeed

packages/ext-build-generate-app/ext-templates/application/classicdesktoplogin/workspace.json.tpl.default

@@ -7,7 +7,7 @@
     "dir": "$\u007Bworkspace.dir}/build"
   },
   "packages": {
-    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux",
+    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux,$\u007Bworkspace.dir}/node_modules/@sencha/ext-font-ios",
     "extract": "$\u007Bworkspace.dir}/packages/remote"
   }
 }

packages/ext-build-generate-app/ext-templates/application/moderndesktop/app/desktop/src/view/main/header/HeaderView.js.tpl.default

@@ -1,20 +1,21 @@
 Ext.define('{appName}.view.main.header.HeaderView', {
-	extend: 'Ext.Toolbar',
-	xtype: 'headerview',
-	cls: 'headerview',
-	items: [
-		{ 
-			xtype: 'container',
-			cls: 'headerviewtext',
-			bind: { html: '\u007Bheading}' }
-		},
-		'->',
-		{
-			xtype: 'button',
-			ui: 'headerbutton',
-			reference: 'detailtoggle',
-			handler: 'onHeaderViewDetailToggle',
-			iconCls: 'x-fa fa-arrow-left'
-		}
-	]
+    extend: 'Ext.Toolbar',
+    xtype: 'headerview',
+    cls: 'headerview',
+    viewModel: {},
+    items: [
+        { 
+            xtype: 'container',
+            cls: 'headerviewtext',
+            bind: { html: '\u007Bheading}' }
+        },
+        '->',
+        {
+            xtype: 'button',
+            ui: 'headerbutton',
+            reference: 'detailtoggle',
+            handler: 'onHeaderViewDetailToggle',
+            iconCls: 'x-fa fa-arrow-left'
+        }
+    ]
 });

packages/ext-build-generate-app/ext-templates/application/moderndesktop/app/desktop/src/view/personnel/PersonnelViewController.js.tpl.default

@@ -1,14 +1,23 @@
 Ext.define('{appName}.view.personnel.PersonnelViewController', {
-	extend: 'Ext.app.ViewController',
-	alias: 'controller.personnelviewcontroller',
+  extend: 'Ext.app.ViewController',
+  alias: 'controller.personnelviewcontroller',
 
 	onItemSelected: function (sender, record) {
-		Ext.Msg.confirm('Confirm', 'Are you sure?', 'onConfirm', this);
+    var users = [
+      { firstName: "John", lastName: "Doe", age: 28, gender: "male" },
+      { firstName: "Jane", lastName: "Doe", age: 5, gender: "female" },
+      { firstName: "Jim", lastName: "Carrey", age: 54, gender: "male" },
+      { firstName: "Kate", lastName: "Winslet", age: 40, gender: "female" }
+    ];
+    var user = Ext._.find(users, { lastName: "Doe", gender: "male" });
+
+    Ext.Msg.confirm('Confirm', 'Are you sure? ' + user.age + ' years old', 'onConfirm', this);
+//    Ext.Msg.confirm('Confirm', 'Are you sure?', 'onConfirm', this);
 	},
 
-	onConfirm: function (choice) {
-		if (choice === 'yes') {
-			//
-		}
-	}
+  onConfirm: function (choice) {
+    if (choice === 'yes') {
+      //
+    }
+  }
 });

packages/ext-build-generate-app/ext-templates/application/moderndesktop/index.js.tpl.default

@@ -0,0 +1,4 @@
+//this file exists so the webpack build process will succeed
+  Ext.onReady(function() {
+    Ext._ = require('lodash');
+  });

packages/ext-build-generate-app/ext-templates/application/moderndesktop/workspace.json.tpl.default

@@ -7,7 +7,7 @@
     "dir": "$\u007Bworkspace.dir}/build"
   },
   "packages": {
-    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux",
+    "dir": "$\u007Bworkspace.dir}/packages/local,{packages},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name},$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-treegrid,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-base,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-ios,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-material,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-aria,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neutral,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-classic,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-gray,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-crisp-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-neptune-touch,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-triton,$\u007Bworkspace.dir}/node_modules/@sencha/ext-$\u007Btoolkit.name}-theme-graphite,$\u007Bworkspace.dir}/node_modules/@sencha/ext-calendar,$\u007Bworkspace.dir}/node_modules/@sencha/ext-charts,$\u007Bworkspace.dir}/node_modules/@sencha/ext-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-exporter,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot,$\u007Bworkspace.dir}/node_modules/@sencha/ext-pivot-d3,$\u007Bworkspace.dir}/node_modules/@sencha/ext-ux,$\u007Bworkspace.dir}/node_modules/@sencha/ext-font-ios",
     "extract": "$\u007Bworkspace.dir}/packages/remote"
   }
 }

packages/ext-build-generate-app/ext-templates/application/moderndesktopminimal/app/desktop/src/view/main/MainView.js.tpl.default

@@ -8,7 +8,7 @@ Ext.define('{appName}.view.main.MainView', {
   items: [
     {
       xtype: 'component',
-      html: '<a style="font-size:24px" target="_blank" href="https://docs-devel.sencha.com/extjs/6.7.0-CE/guides/quick_start/What_You_Will_Be_Coding.html">Quick Start Tutorial Here</a><p>'
+      html: '<a style="font-size:24px" target="_blank" href="https://docs-devel.sencha.com/extjs/7.0.0-CE/guides/quick_start/What_You_Will_Be_Coding.html">Quick Start Tutorial Here</a><p>'
     },
     {
       xtype: 'displayfield',

packages/ext-build-generate-app/ext-templates/application/moderndesktopminimal/index.js.tpl.default

@@ -0,0 +1 @@
+//this file exists so the webpack build process will succeed