Change to import statements

src/extract.js

@@ -1,8 +1,8 @@
-const Promise = require('bluebird');
-const sass = require('node-sass');
-const { loadCompiledFiles, loadCompiledFilesSync } = require('./load');
-const { processFiles } = require('./process');
-const { makeImporter, makeSyncImporter } = require('./importer');
+import Promise from 'bluebird';
+import sass from 'node-sass';
+import { loadCompiledFiles, loadCompiledFilesSync } from './load';
+import { processFiles } from './process';
+import { makeImporter, makeSyncImporter } from './importer';
 
 Promise.promisifyAll(sass);
 
@@ -68,7 +68,7 @@ function compileExtractionResult(extractions) {
  * Extract the variables from already rendered sass file(s)
  * Returns the extracted variables
  */
-function extract(rendered, { compileOptions = {} } = {}) {
+export function extract(rendered, { compileOptions = {} } = {}) {
   const { entryFilename, includedFiles } = getRenderedStats(rendered);
 
   return loadCompiledFiles(includedFiles, entryFilename, compileOptions.data)
@@ -88,7 +88,7 @@ function extract(rendered, { compileOptions = {} } = {}) {
  * Synchronously extract the variables from already rendered sass file(s)
  * Returns the extracted variables
  */
-function extractSync(rendered, { compileOptions = {} } = {}) {
+export function extractSync(rendered, { compileOptions = {} } = {}) {
   const { entryFilename, includedFiles } = getRenderedStats(rendered);
 
   const compiledFiles = loadCompiledFilesSync(includedFiles, entryFilename, compileOptions.data);
@@ -100,6 +100,3 @@ function extractSync(rendered, { compileOptions = {} } = {}) {
 
   return compileExtractionResult(extractions);  
 }
-
-exports.extract = extract;
-exports.extractSync = extractSync;

src/importer.js

@@ -1,4 +1,4 @@
-const path = require('path');
+import path from 'path';
 
 /**
  * Search for the likely absolute path from a relative path using known paths from compilation
@@ -49,7 +49,7 @@ function getImportResult(extractions, url, prev) {
  * Create an importer that will resolve @import directives with the injected
  * data found in provided extractions object
  */
-function makeImporter(extractions) {
+export function makeImporter(extractions) {
   return function(url, prev, done) {
     try {
       const result = getImportResult(extractions, url, prev);
@@ -64,7 +64,7 @@ function makeImporter(extractions) {
  * Create a synchronous importer that will resolve @import directives with the injected
  * data found in provided extractions object
  */
-function makeSyncImporter(extractions) {
+export function makeSyncImporter(extractions) {
   return function(url, prev) {
     try {
       const result = getImportResult(extractions, url, prev);
@@ -75,6 +75,3 @@ function makeSyncImporter(extractions) {
     }
   }
 }
-
-exports.makeImporter = makeImporter;
-exports.makeSyncImporter = makeSyncImporter;

src/index.js

@@ -1,7 +1,2 @@
-const { render, renderSync } = require('./render');
-const { extract, extractSync } = require('./extract');
-
-exports.render = render;
-exports.renderSync = renderSync;
-exports.extract = extract;
-exports.extractSync = extractSync;
+export { render, renderSync } from './render';
+export { extract, extractSync } from'./extract';

src/inject.js

@@ -1,4 +1,4 @@
-const { createStructuredValue } = require('./struct');
+import { createStructuredValue } from './struct';
 
 const FN_PREFIX = '___SV_INJECT';
 const FN_PREFIX_IMPLICIT_GLOBAL = 'IG';
@@ -28,7 +28,7 @@ function createInjection(fileId, categoryPrefix, declaration, declarationResultH
  * Declaration result handlers will be called with the extracted value of each declaration
  * Provided file id will be used to ensure unique function names per file
  */
-function injectExtractionFunctions(fileId, declarations, { globalDeclarationResultHandler }) {
+export function injectExtractionFunctions(fileId, declarations, { globalDeclarationResultHandler }) {
   let injectedData = ``;
   const injectedFunctions = {};
 
@@ -48,5 +48,3 @@ function injectExtractionFunctions(fileId, declarations, { globalDeclarationResu
 
   return { injectedData, injectedFunctions };
 }
-
-exports.injectExtractionFunctions = injectExtractionFunctions;

src/load.js

@@ -1,5 +1,6 @@
-const Promise = require('bluebird');
-const fs = require('fs');
+import Promise from 'bluebird';
+import fs from 'fs';
+
 Promise.promisifyAll(fs);
 
 const RAW_DATA_FILE = 'data';
@@ -32,7 +33,7 @@ function loadSync(filename, encoding = 'utf8') {
 /**
  * Load all files included in a sass compilations including potential raw data input
  */
-function loadCompiledFiles(includedFiles, entryFilename, data) {
+export function loadCompiledFiles(includedFiles, entryFilename, data) {
   const files = {};
 
   return Promise.all(includedFiles.map(filename => {
@@ -49,7 +50,7 @@ function loadCompiledFiles(includedFiles, entryFilename, data) {
 /**
  * Synchronously load all files included in a sass compilations including potential raw data input
  */
-function loadCompiledFilesSync(includedFiles, entryFilename, data) {
+export function loadCompiledFilesSync(includedFiles, entryFilename, data) {
   const files = {};
 
   includedFiles.forEach(filename => {
@@ -58,6 +59,3 @@ function loadCompiledFilesSync(includedFiles, entryFilename, data) {
 
   return includeRawDataFile(files, entryFilename, data);
 }
-
-module.exports.loadCompiledFiles = loadCompiledFiles;
-module.exports.loadCompiledFilesSync = loadCompiledFilesSync;

src/parse.js

@@ -1,4 +1,4 @@
-const sass = require('node-sass');
+import sass from 'node-sass';
 
 const REGEX_VARIABLE_GLOBAL_IMPLICIT = /(\$[\w-_]+)\s*:\s*((.*?\n?)+?);/g;
 const REGEX_VARIABLE_GLOBAL_EXPLICIT = /(\$[\w-_]+)\s*:\s*(.*?)\s+!global\s*;/g;
@@ -40,7 +40,7 @@ function extractVariables(data, regex) {
 /**
  * Parse variables declarations from a chunk of sass source
  */
-function parseDeclarations(data) {
+export function parseDeclarations(data) {
   const decommentedData = stripByRegex(data, REGEX_COMMENTS);
   const decontextifiedData = stripByRegex(decommentedData, REGEX_DEEP_CONTEXT);
 
@@ -49,5 +49,3 @@ function parseDeclarations(data) {
 
   return { explicitGlobals, implicitGlobals };
 }
-
-exports.parseDeclarations = parseDeclarations;

src/process.js

@@ -1,5 +1,5 @@
-const { injectExtractionFunctions } = require('./inject');
-const { parseDeclarations } = require('./parse');
+import { injectExtractionFunctions } from './inject';
+import { parseDeclarations } from './parse';
 
 /**
  * Get a string id for a filename
@@ -37,7 +37,7 @@ function processFile(filename, data) {
  * Process a set of sass files to get declarations, injected source and functions
  * Files are provided in a map of filename -> key entries
  */
-function processFiles(files) {
+export function processFiles(files) {
   const extractions = {};
 
   Object.keys(files).map(filename => {
@@ -46,5 +46,3 @@ function processFiles(files) {
 
   return extractions;
 }
-
-exports.processFiles = processFiles;

src/render.js

@@ -1,13 +1,13 @@
-const Promise = require('bluebird');
-const sass = require('node-sass');
-const { extract, extractSync } = require('./extract');
+import Promise from 'bluebird';
+import sass from 'node-sass';
+import { extract, extractSync } from './extract';
 
 Promise.promisifyAll(sass);
 
 /**
  * Render with node-sass using provided compile options and augment variable extraction
  */
-function render(compileOptions = {}) {
+export function render(compileOptions = {}) {
   return sass.renderAsync(compileOptions)
   .then(rendered => {
     return extract(rendered, { compileOptions })
@@ -21,11 +21,8 @@ function render(compileOptions = {}) {
 /**
  * Render synchronously with node-sass using provided compile options and augment variable extraction
  */
-function renderSync(compileOptions = {}) {
+export function renderSync(compileOptions = {}) {
   const rendered = sass.renderSync(compileOptions);
   rendered.vars = extractSync(rendered, { compileOptions })
   return rendered;
 }
-
-exports.render = render;
-exports.renderSync = renderSync;

src/struct.js

@@ -1,4 +1,4 @@
-const sass = require('node-sass');
+import sass from 'node-sass';
 
 /**
  * Convert a color value 0-255 to hex 00-FF
@@ -63,12 +63,10 @@ function makeValue(sassValue) {
 /**
  * Create a structured value definition from a sassValue object
  */
-function createStructuredValue(sassValue) {
+export function createStructuredValue(sassValue) {
   const value = Object.assign({ 
     type: sassValue.constructor.name,
   }, makeValue(sassValue));
 
   return value;
 };
-
-exports.createStructuredValue = createStructuredValue;