Skip to content
Permalink
Browse files

Update deps and return to classic file layout

  • Loading branch information...
kpfefferle committed Mar 12, 2019
1 parent 3e0e21e commit c9b2e20db1838798c640eb089dae4d4f342971d8
Showing with 3,310 additions and 1,835 deletions.
  1. +20 −0 .eslintignore
  2. +5 −1 .eslintrc.js
  3. +13 −11 .gitignore
  4. +5 −0 .template-lintrc.js
  5. +2 −1 .travis.yml
  6. +1 −0 README.md
  7. +2 −3 src/main.js → app/app.js
  8. +1 −1 src/ui/routes/index/-components/conference-day/component.js → app/components/conference-day.js
  9. +1 −1 ...-components/conference-day/conference-session/component.js → app/components/conference-session.js
  10. 0 src/ui/routes/application/-components/footer-prompt/component.js → app/components/footer-prompt.js
  11. +1 −1 src/ui/routes/index/controller.js → app/controllers/index.js
  12. 0 {src/ui → app}/index.html
  13. 0 {src → app}/libs/data.js
  14. 0 {src → app}/libs/moment.js
  15. 0 {src → app}/libs/smoothscroll.js
  16. +3 −0 app/resolver.js
  17. +23 −0 app/router.js
  18. +7 −6 src/ui/routes/index/route.js → app/routes/index.js
  19. 0 {src/ui → app}/styles/app.scss
  20. 0 src/ui/routes/application/template.hbs → app/templates/application.hbs
  21. 0 ...outes/index/-components/conference-day/template.hbs → app/templates/components/conference-day.hbs
  22. 0 .../conference-day/conference-session/template.hbs → app/templates/components/conference-session.hbs
  23. 0 ...s/application/-components/footer-prompt/template.hbs → app/templates/components/footer-prompt.hbs
  24. 0 ...tes/application/-components/icon-addepar/template.hbs → app/templates/components/icon-addepar.hbs
  25. 0 ...application/-components/icon-emberconf/template.hbs → app/templates/components/icon-emberconf.hbs
  26. 0 src/ui/routes/index/-components/icon-github/template.hbs → app/templates/components/icon-github.hbs
  27. 0 src/ui/routes/index/template.hbs → app/templates/index.hbs
  28. +0 −6 config/environment.js
  29. +1 −0 config/optional-features.json
  30. +2 −0 config/targets.js
  31. +0 −3 ember-cli-build.js
  32. +30 −29 package.json
  33. +0 −19 src/resolver.js
  34. +0 −12 src/router.js
  35. +6 −4 testem.js
  36. +1 −1 tests/test-helper.js
  37. +3,186 −1,736 yarn.lock
@@ -0,0 +1,20 @@
# 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
@@ -20,10 +20,14 @@ module.exports = {
// node files
{
files: [
'testem.js',
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js',
'server/**/*.js',
'serve.js'
],
parserOptions: {
@@ -1,23 +1,25 @@
# 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

# 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
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
};
@@ -22,8 +22,9 @@ before_install:
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --non-interactive --pure-lockfile
- yarn install --non-interactive

script:
- yarn lint:hbs
- yarn lint:js
- yarn test
@@ -77,6 +77,7 @@ Make use of the many generators for code, try `ember help generate` for more det

### Linting

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

@@ -1,15 +1,14 @@
import Application from '@ember/application';
import Resolver from "./resolver";
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from "../config/environment";
import config from './config/environment';

const App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
});

loadInitializers(App, config.modulePrefix+'/src/init');
loadInitializers(App, config.modulePrefix);

export default App;
@@ -1,6 +1,6 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import moment from 'emberconf/src/libs/moment';
import moment from 'emberconf/libs/moment';

export default Component.extend({
day: null,
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import ENV from 'emberconf/config/environment';
import moment from 'emberconf/src/libs/moment';
import moment from 'emberconf/libs/moment';

export default Component.extend({
classNames: ['session'],
@@ -3,7 +3,7 @@ import { alias } from '@ember/object/computed';
import { later } from '@ember/runloop';
import { inject as service } from '@ember/service';
import ENV from 'emberconf/config/environment';
import moment from 'emberconf/src/libs/moment';
import moment from 'emberconf/libs/moment';

export default Controller.extend({
fastboot: service(),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,3 @@
import Resolver from 'ember-resolver';

export default Resolver;
@@ -0,0 +1,23 @@
import EmberRouter from '@ember/routing/router';
import config from './config/environment';
import { setupRouter, reset } from 'ember-app-scheduler';

const Router = EmberRouter.extend({
location: config.locationType,
rootURL: config.rootURL,

init() {
this._super(...arguments);
setupRouter(this);
},

destroy() {
reset();
this._super(...arguments);
}
});

Router.map(function() {
});

export default Router;
@@ -1,21 +1,22 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import Schedule from 'emberconf/src/libs/data';
import SmoothScroll from 'emberconf/src/libs/smoothscroll';
import Schedule from 'emberconf/libs/data';
import SmoothScroll from 'emberconf/libs/smoothscroll';
import { whenRoutePainted } from 'ember-app-scheduler';

export default Route.extend({
fastboot: service(),
scheduler: service(),

model() {
return Schedule;
},

afterModel() {
activate() {
this._super(...arguments);
if (this.get('fastboot.isFastBoot')) { return; }

// Scroll to current/upcoming sessions
this.scheduler.scheduleWork('afterContentPaint', () => {
whenRoutePainted().then(() => {
SmoothScroll.polyfill();
let header = document.querySelector('header');
let pastSessions = document.getElementsByClassName('is-past');
@@ -24,6 +25,6 @@ export default Route.extend({
let topScrollSession = (header.offsetHeight > pastSession.offsetHeight) ? pastSessions[pastSessions.length-2] : pastSession;
topScrollSession.scrollIntoView({ block: 'start', behavior: 'smooth' });
}
})
});
}
});
File renamed without changes.
@@ -2,11 +2,6 @@

module.exports = function(environment) {
let ENV = {
'ember-resolver': {
features: {
EMBER_RESOLVER_MODULE_UNIFICATION: true
}
},
modulePrefix: 'emberconf',
environment,
rootURL: '/',
@@ -15,7 +10,6 @@ module.exports = function(environment) {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
'ember-module-unification': true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
@@ -1,4 +1,5 @@
{
"application-template-wrapper": false,
"jquery-integration": false,
"template-only-glimmer-components": true
}
@@ -1,3 +1,5 @@
'use strict';

const browsers = [
'last 1 Chrome versions',
'last 1 Firefox versions',
@@ -26,9 +26,6 @@ module.exports = function(defaults) {
},
'esw-cache-fallback': {
patterns: [ '/' ],
},
vendorFiles: {
'jquery.js': null
}
});

@@ -3,53 +3,54 @@
"version": "0.0.0",
"private": true,
"description": "Mobile-friendly PWA for viewing the 2019 EmberConf schedule",
"repository": "https://github.com/201-created/emberconf-schedule-2018",
"license": "MIT",
"author": "201 Created, Inc.",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/201-created/emberconf-schedule-2018",
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js app config lib server tests",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test"
},
"devDependencies": {
"@ember/optional-features": "^0.5.2",
"broccoli-asset-rev": "^2.4.5",
"ember-app-scheduler": "^0.2.1",
"ember-cli": "ember-cli/ember-cli#master",
"ember-cli-babel": "^6.6.0",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-fastboot": "iezer/ember-cli-fastboot#rehydration+module-unification",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.3.2",
"@ember/optional-features": "^0.6.3",
"broccoli-asset-rev": "^2.7.0",
"ember-app-scheduler": "^1.0.6",
"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": "^4.2.3",
"ember-cli-fastboot": "^2.0.4",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-sass": "^10.0.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.2",
"ember-cli-uglify": "^2.1.0",
"ember-export-application-global": "^2.0.0",
"ember-inline-css": "^0.0.10",
"ember-load-initializers": "^1.0.0",
"ember-load-initializers": "^1.1.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-resolver": "^4.5.4",
"ember-service-worker": "^0.6.9",
"ember-service-worker-asset-cache": "^0.6.2",
"ember-service-worker-cache-fallback": "^0.6.1",
"ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/0b0765f270e23b221fded09bea876a940dfb23b2.tgz",
"ember-qunit": "^3.4.1",
"ember-resolver": "^5.0.1",
"ember-service-worker": "^0.7.2",
"ember-service-worker-asset-cache": "^0.6.4",
"ember-service-worker-cache-fallback": "^0.6.2",
"ember-source": "~3.2.0",
"ember-web-app": "^2.3.0",
"eslint-plugin-ember": "^5.1.0",
"loader.js": "^4.2.3",
"eslint-plugin-ember": "^5.2.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.8.0",
"sass": "^1.17.2"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*",
"npm": "4.6.1"
},
"dependencies": {
"fastboot-app-server": "github:rondale-sc/fastboot-app-server#utilize-rehydration-serialization-from-glimmer"
"node": "6.* || 8.* || >= 10.*"
}
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -9,12 +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)
@@ -1,4 +1,4 @@
import Application from '../src/main';
import Application from '../app';
import config from '../config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';
Oops, something went wrong.

0 comments on commit c9b2e20

Please sign in to comment.
You can’t perform that action at this time.