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

Updated build tools #319

Merged
merged 3 commits into from
Dec 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ sauce_connect.log
spec/qunit_spec.js

dist
bower_components
npm-debug.log
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
lib
tests
bower_components
tmp
Brocfile.js
VANILLA_HANDLEBARS.md
Expand Down
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
---
language: node_js
node_js:
- "4.0.0"
- "8.11.0"

sudo: false

addons:
chrome: stable

cache:
yarn: true
directories:
- node_modules
- $HOME/.npm
- $HOME/.yarn-cache

before_install:
- "npm config set spin false"
- "npm install -g npm@^2"
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &

install:
- npm install -g bower
- npm install
- bower install
- yarn install

script:
- npm test
Expand Down
179 changes: 0 additions & 179 deletions Brocfile.js

This file was deleted.

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,13 @@ Clone the repo, then run:

```
npm install
bower install
ember build -e production
```

Running tests in the browser requires [broccoli-cli](https://github.com/broccolijs/broccoli-cli) to be installed.

To run tests in the browser, run:

```
broccoli serve
ember test --serve
```

The tests will be available at http://localhost:4200/tests/.
Expand Down
6 changes: 2 additions & 4 deletions bin/emblem
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var optimist = require('optimist')
});

var fs = require('fs');
var emblem = require('../dist/cjs/emblem.js')['default'];
var compile = require('../dist/cjs/emblem.js').compile;

var argv = optimist.argv;
var template = argv._[0];
Expand All @@ -49,7 +49,7 @@ if(argv.version) {
}

function processData(data) {
var output = emblem.compile(data);
var output = compile(data);

if (argv.output) {
fs.writeFileSync(argv.output, output, 'utf8');
Expand Down Expand Up @@ -97,5 +97,3 @@ if(argv.stdin) {
processFile(templatePath);
});
}


3 changes: 1 addition & 2 deletions bin/example-file-walker.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var walk = require('walk');
var fs = require('fs');
var path = require('path');
var emblem = require('emblem');
var compile = emblem.default.compile;
var compile = require('emblem').compile;

var walker = walk.walk("app/templates");
var compiledCount = 0, totalCount = 0, erroredCount = 0;
Expand Down
Loading