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.

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

Update to electron-forge 6 & simplify build pipeline/project structure #418

Merged
merged 24 commits into from
Nov 24, 2019
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3d7eb02
chore: update yarn.lock
bendemboski Nov 17, 2019
44ecbcf
chore: Remove unneeded dependencies
bendemboski Nov 17, 2019
9fd0475
chore: Put ember-cli in peerDependencies
bendemboski Nov 17, 2019
452b154
feat: Update to electron-forge 6
bendemboski Nov 17, 2019
3da0858
feat: simplify build pipeline
bendemboski Nov 18, 2019
0c13c7c
test: Get tests working
bendemboski Nov 19, 2019
d40a30a
feat: Enable live reload server
bendemboski Nov 19, 2019
a58c680
chore: Improve blueprint messaging
bendemboski Nov 20, 2019
70e3dda
chore: Update .travis.yml from blueprint
bendemboski Nov 20, 2019
2c4f18e
fix: Fix linting
bendemboski Nov 20, 2019
69e7511
feat: Build for production by default when making/packaging
bendemboski Nov 21, 2019
ec8983d
docs: Documentation!
bendemboski Nov 21, 2019
47fe0bf
chore: Remove semantic release
bendemboski Nov 21, 2019
f87227a
Update appveyor config
bendemboski Nov 21, 2019
e10f43b
fix: better solution for hidepassed
bendemboski Nov 21, 2019
2e0735f
chore: Remove windows query string workaround
bendemboski Nov 21, 2019
8e2bc67
chore: Prevent redundant appveyor build
bendemboski Nov 21, 2019
992fcda
Remove denodeify
bendemboski Nov 22, 2019
f97f80e
Run CI on Node 8
bendemboski Nov 22, 2019
1445f59
Build available options based on base command for inherited commands
bendemboski Nov 22, 2019
5bcea88
Update documentation language
bendemboski Nov 22, 2019
ca81655
Linting, dependencies, and output dirs/files
bendemboski Nov 24, 2019
e83276d
fix: don't assume POSIX path separator
jacobq Nov 24, 2019
09b5fc5
fixup! fix: don't assume POSIX path separator
jacobq Nov 24, 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
7 changes: 5 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ environment:
- nodejs_version: "8"

cache:
- '%APPDATA%\npm-cache -> package.json' # Only load this from cache if package.json is unchanged
- '%APPDATA%\npm-cache -> yarn.lock' # Only load this from cache if yarn.lock is unchanged
- '%LOCALAPPDATA%\Yarn'
- '%USERPROFILE%\.electron'

install:
- ps: Install-Product node $env:nodejs_version $env:platform
Expand All @@ -18,3 +17,7 @@ test_script:
- yarn test

build: off

# we don't do anything different between branch and PR builds, so let's not
# redundantly run both when a PR is open
skip_branch_with_pr: true
34 changes: 30 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ module.exports = {
'processNode': true
},
rules: {
'ember/no-jquery': 'error',
'no-console': 'off'
'ember/no-jquery': 'error'
},
overrides: [
// node files
Expand Down Expand Up @@ -60,10 +59,37 @@ module.exports = {
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
'ember/avoid-leaking-state-in-ember-objects': 'off',
'node/no-unpublished-require': ['error', {
'allowModules': ['ember-cli']
})
},
// forge template files
{
files: [
'forge/files/**/*.js'
],
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
'node/no-missing-require': ['error', {
'allowModules': [
'electron',
'ember-electron'
],
}]
})
},
// mocha files
{
files: [
'node-tests/**/*.js'
],
env: {
browser: false,
node: true,
mocha: true
}
}
]
};
3 changes: 3 additions & 0 deletions .mocharc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
file: [ 'node-tests/helpers/test-setup' ]
};
14 changes: 2 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "10"
- "8"

sudo: false
dist: trusty
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
- env: EMBER_TRY_SCENARIO=ember-canary

include:
# runs linting and fast integration/unit tests
# runs linting and fast tests
- stage: "Basic Tests"
script:
- yarn lint:hbs
Expand All @@ -51,16 +51,6 @@ jobs:
env: END_TO_END_TESTS=yarn
- env: END_TO_END_TESTS=npm

# Define the release stage that runs semantic-release
- stage: "Release"
node_js: lts/*
script: skip
deploy:
provider: script
skip_cleanup: true
script:
- npx semantic-release

before_install:
- yarn config set no-progress

Expand Down
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ Documentation

Ember-Electron is a small open source project. Use [GitHub Issues](https://github.com/adopted-ember-addons/ember-electron/issues) to report bugs and errors within the addon.

If you need help *using* the addon with your application, may we recommend the excellent Ember community? You can the [various places to get help here](https://www.emberjs.com/community/). If you have questions regarding Electron, their [Slack and forum](https://electron.atom.io/contact/) will be helpful as well.


## Development

`ember-electron` uses [Semantic Release](https://github.com/semantic-release/semantic-release) to
automate the whole release process. In order to have a PR merged, please ensure that your PR
follows the commit guidelines so that our robots can understand your change. This repository uses
the [`conventional-changelog` rules from the `eslint` repository](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-eslint).
If you need help *using* the addon with your application, may we recommend the excellent Ember community? You can check out the [various places to get help here](https://www.emberjs.com/community/). In particular, the [Ember community Discord](https://discordapp.com/invite/emberjs) has a `#topic-desktop` channel which is a great place to ask questions about `ember-electron`. If you have questions regarding Electron, their [Slack and forum](https://electron.atom.io/contact/) will be helpful as well.


## Authors
Expand Down
31 changes: 0 additions & 31 deletions blueprints/ember-electron/files/.travis.yml

This file was deleted.

5 changes: 0 additions & 5 deletions blueprints/ember-electron/files/ember-electron/.compilerc

This file was deleted.

2 changes: 0 additions & 2 deletions blueprints/ember-electron/files/ember-electron/test-main.js

This file was deleted.

3 changes: 1 addition & 2 deletions blueprints/ember-electron/files/testem-electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ module.exports = {
// Note: Some these Chrome options may not be supported in Electron
// See https://electronjs.org/docs/api/chrome-command-line-switches
ci: [
// --no-sandbox may be needed when running inside a container
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down

This file was deleted.

Loading