Skip to content

Add supported node versions to CI. #30

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.

Sign up for GitHub

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

Merged
chadhietala merged 4 commits into from
Mar 25, 2017
Merged

Add supported node versions to CI. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d014c3
Add supported node versions to CI.
rwjblue Mar 25, 2017
c5103c9
Update to use babel-preset-env and transpile for node@4 support.
Mar 25, 2017
6e40505
Add node_modules to .gitignore.
Mar 25, 2017
c2e6f69
Avoid requiring polyfill for String.prototype.includes.
Mar 25, 2017
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
8 changes: 7 additions & 1 deletion .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{
"presets": ["node7"]
"presets": [
["env", {
"targets": {
"node": 4
}
}]
]
}
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
dist
dist
node_modules
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
language: node_js

node_js:
- '4'
- '6'
- '7'

cache: yarn

script:
- yarn test
- yarn test
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"devDependencies": {
"babel-cli": "^6.22.2",
"babel-core": "^6.22.1",
"babel-preset-latest": "^6.22.0",
"babel-preset-node7": "^1.4.0",
"babel-preset-env": "^1.2.2",
"babel-preset-latest": "^6.24.0",
"babel-register": "^6.22.0",
"chai": "^3.5.0",
"chai-files": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function macros(babel) {
envFlags: { envFlagsImport, flags }
} = options;

let isFeaturesImport = featureSources.includes(importPath);
let isFeaturesImport = featureSources.indexOf(importPath) > -1;
Copy link
Member Author

@rwjblue rwjblue Mar 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😢 but it seems easier to use indexOf than add a dep on core-js for the polyfill...


if (debugToolsImport && debugToolsImport === importPath) {
this.macroBuilder.collectDebugToolsSpecifiers(item.get('specifiers'));
Expand Down
4 changes: 2 additions & 2 deletions src/lib/utils/macros.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default class Macros {

_collectImportBindings(specifiers, buffer) {
specifiers.forEach((specifier) => {
if (specifier.node.imported && SUPPORTED_MACROS.includes(specifier.node.imported.name)) {
if (specifier.node.imported && SUPPORTED_MACROS.indexOf(specifier.node.imported.name) > -1) {
buffer.push(specifier.get('local'));
}
});
Expand Down Expand Up @@ -160,7 +160,7 @@ export default class Macros {

if (builder.t.isImportDeclaration(decl)) {
let source = decl.node.source.value;
if (featureSources.includes(source)) {
if (featureSources.indexOf(source) > -1) {
if (decl.node.specifiers.length > 0) {
this._detectForeignFeatureFlag(decl.node.specifiers, source);
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/tests/debug-tools-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,4 +364,4 @@ function test(caseName, cases, assertionName, ep) {
let fn = () => compile(sample, options);
expect(fn).to.throw(new RegExp(cases[caseName].errors[ep++]));
}
}
}
297 changes: 180 additions & 117 deletions yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.