Skip to content

Commit

Permalink
upgrade to ember-3.8.1, vendor photon
Browse files Browse the repository at this point in the history
  • Loading branch information
mnutt committed Mar 8, 2019
1 parent 467f393 commit 447e3f5
Show file tree
Hide file tree
Showing 16 changed files with 4,181 additions and 737 deletions.
21 changes: 20 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
/blueprints/*/files/**/*.js
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 4 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
'lib/*/index.js',
'server/**/*.js'
],
parserOptions: {
sourceType: 'script',
Expand Down
26 changes: 14 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log
.DS_Store

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try

electron-out/
/electron-out/
5 changes: 5 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
};
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "6"
- "10"

sudo: false
dist: trusty
Expand All @@ -25,5 +25,6 @@ install:
- yarn install --non-interactive

script:
- yarn lint:js
- yarn run lint:hbs
- yarn run lint:js
- yarn test
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ You will need the following things properly installed on your computer.
* `git clone git://github.com/mnutt/khepri.git`
* `cd khepri`
* `yarn`
* `bower install`
* `yarn start`

## Running / Development
Expand All @@ -30,6 +29,12 @@ You will need the following things properly installed on your computer.
* `ember test`
* `ember test --server`

### Linting

* `yarn run lint:hbs`
* `yarn run lint:js`
* `yarn run lint:js -- --fix`

### Building

* `ember build` (development)
Expand Down
3 changes: 3 additions & 0 deletions config/optional-features.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"jquery-integration": false
}
8 changes: 8 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,13 @@ module.exports = function(defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

app.import('vendor/photon/photon.css');

const path = { destDir: "fonts" };
app.import('vendor/photon/fonts/photon-entypo.eot', path);
app.import('vendor/photon/fonts/photon-entypo.svg', path);
app.import('vendor/photon/fonts/photon-entypo.ttf', path);
app.import('vendor/photon/fonts/photon-entypo.woff', path);

return app.toTree();
};
50 changes: 26 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
"productName": "khepri",
"version": "0.5.1",
"description": "Process manager gui",
"private": false,
"repository": "https://github.com/mnutt/khepri",
"license": "MIT",
"author": "Michael Nutt <[email protected]>",
"directories": {
"doc": "doc",
"test": "tests"
},
"private": false,
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js app blueprints config lib server tests",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember electron",
"test": "ember test"
},
"repository": "",
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
"node": "8.* || >= 10.*"
},
"author": "Michael Nutt <[email protected]>",
"license": "MIT",
"dependencies": {
"ansi_up": "^3.0.0",
"daemon": "^1.1.0",
Expand All @@ -37,33 +38,34 @@
"user-env": "^2.0.0"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"@ember/optional-features": "^0.6.3",
"broccoli-asset-rev": "^2.7.0",
"devtron": "^1.4.0",
"electron-forge": "5.2.4",
"electron-prebuilt-compile": "4.0.0",
"electron-rebuild": "1.8.4",
"ember-ajax": "^3.0.0",
"ember-cli": "~3.1.4",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.6.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-ajax": "^4.0.1",
"ember-cli": "~3.8.1",
"ember-cli-app-version": "^3.2.0",
"ember-cli-babel": "^7.1.2",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-photon": "0.2.4",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.1",
"ember-cli-uglify": "^2.1.0",
"ember-electron": "^2.10.0",
"ember-export-application-global": "^2.0.0",
"ember-inspector": "3.1.0",
"ember-load-initializers": "^1.0.0",
"ember-load-initializers": "^1.1.0",
"ember-qunit": "^4.4.1",
"ember-resolver": "^4.0.0",
"ember-source": "^3.1.0",
"eslint-plugin-ember": "^5.0.0",
"loader.js": "^4.2.3"
"ember-resolver": "^5.0.1",
"ember-source": "~3.8.0",
"eslint-plugin-ember": "^5.2.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.8.0"
},
"main": "ember-electron/lib/index.js",
"ember-electron": {
Expand Down
11 changes: 6 additions & 5 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ module.exports = {
],
browser_args: {
Chrome: {
mode: 'ci',
args: [
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.TRAVIS ? '--no-sandbox' : null,

'--disable-gpu',
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
Expand Down
Binary file added vendor/photon/fonts/photon-entypo.eot
Binary file not shown.
Loading

0 comments on commit 447e3f5

Please sign in to comment.