From 36ffa750a046d874b66dc1f160bd0aa7cc14c4f4 Mon Sep 17 00:00:00 2001 From: Sean Luthjohn Date: Mon, 26 Feb 2018 11:29:08 -0600 Subject: [PATCH 1/4] [CHORE] Update Ember Version and remove shims --- .gitignore | 6 +- .idea/workspace.xml | 758 ++ .npmignore | 7 +- addon/components/baremetrics-calendar.js | 15 +- config/ember-try.js | 48 +- ember-cli-build.js | 2 + package-lock.json | 10875 +++++++++++++++++++++ package.json | 81 +- 8 files changed, 11690 insertions(+), 102 deletions(-) create mode 100644 .idea/workspace.xml create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore index 5ad14dd..2e9d111 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ # dependencies /node_modules -/bower_components # misc /.sass-cache @@ -14,4 +13,9 @@ /coverage/* /libpeerconnection.log npm-debug.log* +yarn-error.log testem.log + +# ember-try +.node_modules.ember-try/ +package.json.ember-try diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..1bc537e --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,758 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + calendar.js + bower + baseUrl + + + + + + + + + + + + + true + + false + true + true + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + HTML + + + Handlebars/Mustache + + + Phing + + + XSLT + + + + + CSS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1508422522715 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.npmignore b/.npmignore index 135c7b1..01f3f8e 100644 --- a/.npmignore +++ b/.npmignore @@ -1,21 +1,17 @@ -/bower_components /config/ember-try.js /dist /tests /tmp **/.gitkeep -.bowerrc .editorconfig .ember-cli .eslintrc.js .gitignore .watchmanconfig .travis.yml -bower.json ember-cli-build.js testem.js # ember-try .node_modules.ember-try/ -bower.json.ember-try package.json.ember-try diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c9db7e0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -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 - - "4" - -sudo: false -dist: trusty - -addons: - chrome: stable - -cache: - directories: - - $HOME/.npm - -env: - global: - # See https://git.io/vdao3 for details. - - JOBS=1 - matrix: - # we recommend new addons test the current and previous LTS - # as well as latest stable release (bonus points to beta/canary) - - EMBER_TRY_SCENARIO=ember-lts-2.12 - - EMBER_TRY_SCENARIO=ember-lts-2.16 - - EMBER_TRY_SCENARIO=ember-lts-2.18 - - EMBER_TRY_SCENARIO=ember-release - - EMBER_TRY_SCENARIO=ember-beta - - EMBER_TRY_SCENARIO=ember-canary - - EMBER_TRY_SCENARIO=ember-default - -matrix: - fast_finish: true - allow_failures: - - env: EMBER_TRY_SCENARIO=ember-canary - -before_install: - - npm config set spin false - - npm install -g npm@4 - - npm --version - -script: - - npm run lint:js - # Usually, it's ok to finish the test scenario without reverting - # to the addon's original dependency state, skipping "cleanup". - - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup From 4bd778b1b1b629b33a8ee25e271114c2dfc625cd Mon Sep 17 00:00:00 2001 From: Sean Luthjohn Date: Tue, 27 Feb 2018 11:14:09 -0600 Subject: [PATCH 4/4] [CHORE] change version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8d3f68..fe91fb0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-baremetrics-calendar", - "version": "0.0.6", + "version": "0.0.5", "description": "The default blueprint for ember-cli addons.", "keywords": [ "ember-addon"