Lintastic update

CONTRIBUTORS.md

@@ -31,5 +31,3 @@ Wails is what it is because of the time and effort given by these great people.
   * [Christopher Murphy](https://github.com/Splode)
   * [Zámbó, Levente](https://github.com/Lyimmi)
   * [artem](https://github.com/Unix4ever)
-  * [Tim Kipp](https://github.com/timkippdev)
-  * [Dmitry Gomzyakov](https://github.com/kyoto44)

README.md

@@ -57,7 +57,7 @@ _Ubuntu: 16.04, 18.04, 19.04_
 
 _Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS
 
-#### Arch Linux / ArchLabs / Ctlos Linux
+#### Arch Linux / ArchLabs
 
 `sudo pacman -S webkit2gtk gtk3`
 

cmd/linux.go

@@ -63,8 +63,6 @@ const (
 	PopOS
 	// Solus distribution
 	Solus
-	// Ctlos Linux distribution
-	Ctlos
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -131,8 +129,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Arch
 	case "archlabs":
 		result.Distribution = ArchLabs
-	case "ctlos":
-		result.Distribution = Ctlos	
 	case "debian":
 		result.Distribution = Debian
 	case "ubuntu":

cmd/linuxdb.yaml

@@ -193,16 +193,7 @@ distributions:
         name: ArchLabs
         gccversioncommand: *gccdumpversion
         programs: *archdefaultprograms
-        libraries: *archdefaultlibraries
-  ctlos:
-    id: ctlos
-    releases:
-      default:
-        version: default
-        name: Ctlos Linux
-        gccversioncommand: *gccdumpversion
-        programs: *archdefaultprograms
-        libraries: *archdefaultlibraries                
+        libraries: *archdefaultlibraries        
   manjaro:
     id: manjaro
     releases:

cmd/package.go

@@ -212,8 +212,6 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	packageID := strings.Join([]string{"wails", name, version}, ".")
 	plistData := newPlistData(name, exe, packageID, version, author)
 	appname := po.Name + ".app"
-	plistFilename := path.Join(build, appname, "Contents", "Info.plist")
-	customPlist := path.Join(b.fs.Cwd(), "info.plist")
 
 	// Check binary exists
 	source := path.Join(build, exe)
@@ -232,48 +230,28 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	// Remove the existing package
 	os.RemoveAll(appname)
 
-	// Create directories
 	exeDir := path.Join(build, appname, "/Contents/MacOS")
 	b.fs.MkDirs(exeDir, 0755)
 	resourceDir := path.Join(build, appname, "/Contents/Resources")
 	b.fs.MkDirs(resourceDir, 0755)
+	tmpl := template.New("infoPlist")
+	plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
+	infoPlist, err := ioutil.ReadFile(plistFile)
+	if err != nil {
+		return err
+	}
+	tmpl.Parse(string(infoPlist))
 
-	// Do we have a custom plist in the project directory?
-	if !fs.FileExists(customPlist) {
-
-		// No - create a new plist from our defaults
-		tmpl := template.New("infoPlist")
-		plistFile := filepath.Join(b.getPackageFileBaseDir(), "info.plist")
-		infoPlist, err := ioutil.ReadFile(plistFile)
-		if err != nil {
-			return err
-		}
-		tmpl.Parse(string(infoPlist))
-
-		// Write the template to a buffer
-		var tpl bytes.Buffer
-		err = tmpl.Execute(&tpl, plistData)
-		if err != nil {
-			return err
-		}
-
-		// Save to the package
-		err = ioutil.WriteFile(plistFilename, tpl.Bytes(), 0644)
-		if err != nil {
-			return err
-		}
-
-		// Also write to project directory for customisation
-		err = ioutil.WriteFile(customPlist, tpl.Bytes(), 0644)
-		if err != nil {
-			return err
-		}
-	} else {
-		// Yes - we have a plist. Copy it to the package verbatim
-		err = fs.CopyFile(customPlist, plistFilename)
-		if err != nil {
-			return err
-		}
+	// Write the template to a buffer
+	var tpl bytes.Buffer
+	err = tmpl.Execute(&tpl, plistData)
+	if err != nil {
+		return err
+	}
+	filename := path.Join(build, appname, "Contents", "Info.plist")
+	err = ioutil.WriteFile(filename, tpl.Bytes(), 0644)
+	if err != nil {
+		return err
 	}
 
 	// Copy executable

cmd/system.go

@@ -37,13 +37,13 @@ func NewSystemHelper() *SystemHelper {
 // setSystemDirs calculates the system directories it is interested in
 func (s *SystemHelper) setSystemDirs() {
 	var err error
-	s.homeDir, err = os.UserHomeDir()
+	s.homeDir, err = os.UserConfigDir()
 	if err != nil {
 		log.Fatal("Cannot find home directory! Please file a bug report!")
 	}
 
 	// TODO: A better config system
-	s.wailsSystemDir = filepath.Join(s.homeDir, ".wails")
+	s.wailsSystemDir = filepath.Join(s.homeDir, "wails")
 	s.wailsSystemConfig = filepath.Join(s.wailsSystemDir, s.configFilename)
 }
 
@@ -276,7 +276,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		switch distroInfo.Distribution {
 		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
 			libraryChecker = DpkgInstalled
-		case Arch, ArcoLinux, ArchLabs, Ctlos, Manjaro, ManjaroARM:
+		case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
 		case CentOS, Fedora, Tumbleweed, Leap:
 			libraryChecker = RpmInstalled

cmd/templates/create-react-app/frontend/package.json.template

@@ -5,8 +5,8 @@
   "private": true,
   "dependencies": {
     "core-js": "^3.6.4",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "react": "^16.13.0",
+    "react-dom": "^16.13.0",
     "wails-react-scripts": "3.0.1-2",
     "react-modal": "3.11.2",
     "@wailsapp/runtime": "^1.0.10"

cmd/templates/create-react-app/frontend/public/index.html

@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
+  <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -23,9 +20,8 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>
-</head>
-
-<body>
+  </head>
+  <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="app"></div>
     <!--
@@ -38,6 +34,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-</body>
-
-</html>
+  </body>
+</html>

cmd/templates/create-react-app/frontend/public/manifest.json

@@ -6,16 +6,6 @@
       "src": "favicon.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
     }
   ],
   "start_url": ".",

cmd/templates/create-react-app/frontend/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

cmd/templates/create-react-app/frontend/src/App.css

@@ -3,16 +3,11 @@
 }
 
 .App-logo {
+  animation: App-logo-spin infinite 20s linear;
   height: 40vmin;
   pointer-events: none;
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
 .App-header {
   background-color: #282c34;
   min-height: 100vh;

cmd/templates/create-react-app/frontend/src/components/HelloWorld.js

@@ -1,35 +1,48 @@
-import React, { useState } from 'react';
+import React from 'react';
 import Modal from 'react-modal';
 
-function HelloWorld() {
-	const [showModal, setShowModal] = useState(false);
-	const [result, setResult] = useState(null);
+class HelloWorld extends React.Component {
+  constructor(props, context) {
+    super();
+    this.state = {
+      showModal: false
+    };
 
-	const handleOpenModal = () => {
-		setShowModal(true);
+    this.handleOpenModal = this.handleOpenModal.bind(this);
+    this.handleCloseModal = this.handleCloseModal.bind(this);
+  }
 
-		window.backend.basic().then((result) => setResult(result));
-	};
+  handleOpenModal () {
+    this.setState({ showModal: true });
 
-	const handleCloseModal = () => {
-		setShowModal(false);
-	};
+    window.backend.basic().then(result =>
+      this.setState({
+        result
+      })
+    );
+  }
 
-	return (
-		<div className="App">
-			<button onClick={() => handleOpenModal()} type="button">
-				Hello
-      </button>
-			<Modal
-				appElement={document.getElementById("app")}
-				isOpen={showModal}
-				contentLabel="Minimal Modal Example"
-			>
-				<p>{result}</p>
-				<button onClick={() => handleCloseModal()}>Close Modal</button>
-			</Modal>
-		</div>
-	);
+  handleCloseModal () {
+    this.setState({ showModal: false });
+  }
+
+  render() {
+    const { result } = this.state;
+    return (
+      <div className="App">
+        <button onClick={this.handleOpenModal} type="button">
+          Hello
+        </button>
+        <Modal
+          isOpen={this.state.showModal}
+          contentLabel="Minimal Modal Example"
+        >
+        <p>{result}</p>
+        <button onClick={this.handleCloseModal}>Close Modal</button>
+        </Modal>
+      </div>
+    );
+  }
 }
 
 export default HelloWorld;

cmd/templates/create-react-app/frontend/src/index.js

@@ -3,20 +3,9 @@ import ReactDOM from 'react-dom';
 import 'core-js/stable';
 import './index.css';
 import App from './App';
-import * as serviceWorker from './serviceWorker';
 
 import * as Wails from '@wailsapp/runtime';
 
 Wails.Init(() => {
-  ReactDOM.render(
-    <React.StrictMode>
-      <App />
-    </React.StrictMode>,
-    document.getElementById("app")
-  );
+  ReactDOM.render(<App />, document.getElementById('app'));
 });
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();

cmd/templates/create-react-app/template.json

@@ -1,8 +1,8 @@
 {
   "name": "React JS",
   "version": "1.0.0",
-  "shortdescription": "Create React App v4 template",
-  "description": "Create React App v4 standard tooling",
+  "shortdescription": "Create React App v3 template",
+  "description": "Create React App v3 standar tooling",
   "install": "npm install",
   "build": "npm run build",
   "author": "bh90210 <ktc@pm.me>",

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.7.2-pre4"
+const Version = "v1.7.2-pre2"

lib/renderer/bridge/renderer-mewn.go

@@ -1,9 +0,0 @@
-package renderer
-
-// Autogenerated by Mewn - Do not alter
-
-import "github.com/leaanthony/mewn"
-
-func init() {
-  mewn.AddAsset(".", "../../runtime/assets/wails.js", "1f8b08000000000000ff94586d8f1bb711fe2b2ba255481f8f91dc14a977c318cee582a838df053ebbfda00a01b53b92e85b915b2e758a20f1bf17b3efba97a2050c7bc519728633cf3c33f468b533a9d7d650c38e8fca45208f216917234f1d3bea1585b95b30077ee74c84df02fe28acf365825bacc42579d4b1e3793c9af246181f43489a4d0637a52acfa96df772cbfb6fcfb815b91c4dfab5e0c5561aee452a817b91c9de550edcb1a317163fd9e974b7fc0aa91719acb481df9c2dc0f943a57604b3db8253cb1ce2d184afc1c72eb0c0bd70727875b233f5ee8c8ca43f146057d1fd61bbb4f9785cff2bbcbdf74e9bf567b51e8f5fb3f85c971f1f55be83987cb4d92e0712187f6d33f9fd77281bb576db6852bbebcfae5f25653a86f1981ae9a9618cff6d0c6d864ca257f43b94125b9922b2bd93198ff18fe82df59b30974e36cea50e94076a7679cef0382f1c75afb9ee38c960a576b9274f235edfc204c6df560e95555cfa201bb6b28e56308ab4890cf322a38e5bde5d17d8b103112c82586a93557e71cb588b2f873132f2399a9fdcf67da7d19f2a1adf43fc82b04330fa059c28c281714073f6494a1ac5264485b3dee225c54695777bd306abae02dc8067149210eea917a59cb040e76718f788cb12228c59ea49823900c61b4f66467bc2e9739f6781b12699c7903489abc34a7e86e56efde2ae5d609dd6ccacec8b4af940e99fca194ce54b7aab81deb573d6bda8950db47e515ee52f6a95ed756c7b1d5befb29cdc1560be7cba7971dfa13dbdd1fb456359bda0b86c0d68395ff4dca7da1c34a1c45cc68663fa962a7d98fd1c7b5ea8436e55164348ce9854afe85e9bcceec55ee9bc5c3a9dade1fdf325b1876569d307f0a20484358b1b25f8c383332a17da3cda07a086712d72306bbff971d2d50cc849023fb482042e2e989ec3821a16e8dfefef6e455d6e7a75a08eb1d0dd2dad11ab28c9ed9af0630e8f90c7866fa12cd51a620803e51dde28a524abb16306a2bc11e90a3043c9aa91ec5b940c855923841a1a4351d98856351e0c0b78cf3d2fcefad2639b9bb64c77793e927e3c6e3e4e27eae5847103fbe83767b7ba04da67de715b675527993d6a692ec825b9d85316f61b9d032de67a5193de8f13867aa92cc17fd65bb03b4f8708b2b4423725572acf236f2372612e48e4f516b2c8eebc883ec1bf7750fa68f6731c910bcd5860dcb3044dc8a3af8ffc55992c8738e50e903a62cb1d94367f84d885c4bb03e6096147f811c94f9bf5adda221633e555fc24cfc82b9a8554f97453c5d29ad2e620aa582330c21008eb33ea7aa4a446a720171543757a073caad15a53f293b3fb129ce8ea6f98c2e5ebba750d1a16f6b2c179ea0e85b7435ac6801b8999fba28dffcbdb0fcea9039d76547fb651acc17f5226b3db7f60a341f4cc278b9798fcdd64f2fdf4ddbbb77ffdeefbef26efde4ddf7c547e235cb597b25011c0b663f4c8d00a5fa3675d77444da44de99549b17f01637ee3ec3e42873f1f0ae800618cf511a62d52519aabb28c5419a9a83d90b040fd4697dc30ee11b197538ebfc555433067cdac9dbd842a8afc50b73fc3f8e5742411f6132925f59772ca42e09bb352b96b4b6533370b897f9d4ef345d31fd0e96d75d30425a2d8951bea06b9bcee3be9139ccd17a2cc75da7aa4dc7ab705e34b562fd329b2af3c9a015221248a127804e309f77565df9f39fb80e610f16d5dc33efaa50d03417d7261181f4d7a7cd79aa369e89dbeeab24eafda794695a55e9bd36918d49e45a709fcd0dd60c8a6d5ddbdec64735824ed3687038b67ff53bff7dc311cd67050f6384c876ec0604d042b30f4610c0dce110a6032790c7cd83fe4f0c7e9d44b7bfd2ac75fe5f116f63fd5b4113f9f8fe60b915a932a4f8d288b5c7b4a0461d56797c4f3939118a16d45d3ae15393949dc0fade0729ab80b39adadd40f04dc377aa096b141729b6a21ad139693489711968e8a1e55aeb3e8ab7a5465ea74e1239d81f17aa5c109c258e2e776814c3fb70b790c5519cded22d4ad1c44610bca1aabfabf5ad5ff9f55bd904ff80afbf0e0d1d4c2a6ab910a037d6e938e6f0df7c8b3dd8cd9f799b3f20769705a5cbf20edb921701f280bbc2590e7d94e8ccc20b5197cf934bbb2dbc21a3098780745ae52a0dffeabbcf876cd0961fdd27c72f94e5dae16c7b701457ffed3b80a823b1c1b4a28942b713e694a12dacb9399a943895a51a1ca12326c91ed0015475dfc413483072722fad8cc2011611d34595293ec8efabaa9d7196c38c4c93ac278aaceb895450bb7b6cf4bd20625faa6b3ea38f9a6cab983b52e3d64a3d188b496cedba61e5ac5ee9a8372ed4060c5591f673c831c3c44e8056f4e786f45dddc69b3c0625ca9ba3c0581f4c802bfb55eaf0ef1b39e83dcdcd395af58bca159c6ebc2ab961ae21a561eaea31fd56c8b95cb30757a983a18a42ea3e76943c7a2128cc7cc99ca3d115d238347c8ec91ac0839d8ae6b51cdc663dff287e35316aac6e343e01fb2ecbe2aa92737ac2f95d9b42a8fe6e9799d03fea2a4ae424c8cf0f0879786779a4b9b1d903dc164571b9d67880e188fafab21686630de57f7f72fb0deabb6fc2107c212c042fce0bdd3cb9d074a90d7092768ffdbb42c09e3202addfb0d807f3ffc21d2b2fc5cf919c3996f4f6ca2ceadcda07abcf7c20da8ec74ea7eaec137ce953f1d3eab6af0a30495080e3aeccc427d6bede319867af6dbd50dc2da803b8b80aebb3c4e82fc561e6fec3a76bc19d262cbabe496f1f1ce3cc9d25df368bd331f77b9d7450ef11dbfde6a1f5ff35f4139bf04759ed9fef184f34a728f3818f056554433e3c13daabc7aa3227b399cb5bbd5e1b08db34860950f1fd20763f739646b889fbcbb466866309365dd2ca6fa4dd1cee0b78936ade3035e309c7c831c8707518cd2eff1d7c18c32434386b27075f6c6e3b7ac6dc1d654257efe1f569e57cf8ee1167163d7a2e9456fdebc79135da9dd7ae3a32f6653314956134e8432c2f86b5b7bc2c4d9e835ad2f9f6e50035ed7b8d106a25b8b5afe75ad2b9befb6a6d173afeb5521401dcb02bfc687a0cecb185fcb901116162cf94f000000ffff04075a367c140000")
-}

runtime/js/package.json

@@ -29,15 +29,15 @@
   },
   "homepage": "https://github.com/wailsapp/runtime#readme",
   "devDependencies": {
-    "@babel/cli": "^7.11.5",
-    "@babel/core": "^7.11.5",
-    "@babel/plugin-transform-object-assign": "^7.10.4",
-    "@babel/preset-env": "^7.11.5",
-    "babel-loader": "^8.1.0",
-    "babel-preset-minify": "^0.5.1",
-    "core-js": "^3.6.5",
-    "eslint": "^7.8.1",
-    "webpack": "^4.44.1",
-    "webpack-cli": "^3.3.12"
+    "@babel/cli": "^7.5.0",
+    "@babel/core": "^7.5.4",
+    "@babel/plugin-transform-object-assign": "^7.2.0",
+    "@babel/preset-env": "^7.5.4",
+    "babel-loader": "^8.0.6",
+    "babel-preset-minify": "^0.5.0",
+    "core-js": "^3.1.4",
+    "eslint": "^6.5.1",
+    "webpack": "^4.35.3",
+    "webpack-cli": "^3.3.5"
   }
 }