Skip to content

Commit

Permalink
move to circleci2 and use occ for publishing to npm
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeChampion authored Mar 27, 2019
2 parents b316b46 + b953388 commit 648b2e7
Show file tree
Hide file tree
Showing 18 changed files with 829 additions and 974 deletions.
36 changes: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: 2
jobs:
test:
docker:
- image: circleci/node:10-browsers
steps:
- checkout
- run: npm config set prefix "$HOME/.local"
- run: npm i -g origami-build-tools@^8
- run: $HOME/.local/bin/obt install
- run: $HOME/.local/bin/obt demo --demo-filter pa11y --suppress-errors
- run: $HOME/.local/bin/obt verify
- run: $HOME/.local/bin/obt test
- run: git clean -fxd
- run: npx occ 0.0.0
- run: $HOME/.local/bin/obt install --ignore-bower
- run: $HOME/.local/bin/obt test --ignore-bower
publish_to_npm:
docker:
- image: circleci/node:10
steps:
- checkout
- run: npx occ ${CIRCLE_TAG##v}
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > $HOME/.npmrc
- run: npm publish --access public
workflows:
version: 2
test:
jobs:
- test
- publish_to_npm:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
33 changes: 0 additions & 33 deletions .eslintrc.json

This file was deleted.

14 changes: 7 additions & 7 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "o-crossword",
"dependencies": {
"o-colors": "^4.1.5",
"o-grid": "^4.0.6",
"o-typography": "^5.4.1",
"o-viewport": "^3.1.6",
"o-tracking": "^1.3.5",
"o-buttons": "^5.8.5"
"o-colors": "^4.8.5",
"o-grid": "^4.5.1",
"o-typography": "^5.10.1",
"o-viewport": "^3.3.2",
"o-tracking": "^1.6.0",
"o-buttons": "^5.16.2"
},
"main": [
"main.scss",
Expand All @@ -20,6 +20,6 @@
"package.json"
],
"resolutions": {
"o-colors": "^4.1.5"
"o-colors": "^4.8.5"
}
}
14 changes: 0 additions & 14 deletions circle.yml

This file was deleted.

2 changes: 1 addition & 1 deletion demos/src/demo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require('../../main.js');

document.addEventListener("DOMContentLoaded", function() {
document.dispatchEvent(new CustomEvent('o.DOMContentLoaded'));
document.dispatchEvent(new CustomEvent('o.DOMContentLoaded'));
});
97 changes: 0 additions & 97 deletions karma.conf.js

This file was deleted.

4 changes: 3 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
const OCrossword = module.exports = require('./src/js/oCrossword');

const constructAll = function() {
if (OCrossword.disableAutoInit) return;
if (OCrossword.disableAutoInit) {
return;
}
[].slice.call(document.querySelectorAll('[data-o-component~="o-crossword"]')).forEach(function (el) {
new OCrossword(el);
});
Expand Down
4 changes: 1 addition & 3 deletions main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
$o-crossword-is-silent: true !default;
$o-buttons-is-silent: false;

@import "o-colors/main";
@import "o-grid/main";
@import "o-typography/main";
Expand All @@ -12,6 +10,7 @@ $o-buttons-is-silent: false;
@import "src/scss/base";
@import "src/scss/orientation";
@import "src/scss/print";
@import "src/scss/mobile";

@if ($o-crossword-is-silent == false) {
@include oCrosswordAll;
Expand All @@ -20,4 +19,3 @@ $o-buttons-is-silent: false;
$o-crossword-is-silent: true !global;
}

@import "src/scss/mobile";
8 changes: 5 additions & 3 deletions origami.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"requestAnimationFrame",
"Node.prototype.contains",
"Array.prototype.find",
"Array.prototype.filter"
"Array.prototype.filter",
"Promise"
]
},
"demosDefaults": {
Expand All @@ -29,14 +30,15 @@
"demos": [
{
"name": "basic",
"title": "basic",
"hidden": true,
"template": "demos/src/basic.mustache",
"expanded": true,
"description": ""
},
{
"name": "answered",
"title": "answered",
"template": "demos/src/answered.mustache",
"expanded": false,
"description": ""
}
]
Expand Down
24 changes: 0 additions & 24 deletions package.json

This file was deleted.

Loading

0 comments on commit 648b2e7

Please sign in to comment.