From e111c5d8dc5d826fed1341870bbff6b22b9a8459 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 28 Oct 2015 12:12:40 -0400 Subject: [PATCH] add js extensions --- src/Bundle.js | 24 ++++++++++++------------ src/ExternalModule.js | 4 ++-- src/Module.js | 16 ++++++++-------- src/Statement.js | 6 +++--- src/ast/attachScopes.js | 2 +- src/finalisers/amd.js | 4 ++-- src/finalisers/cjs.js | 2 +- src/finalisers/iife.js | 4 ++-- src/finalisers/index.js | 10 +++++----- src/finalisers/umd.js | 4 ++-- src/rollup.js | 10 +++++----- src/utils/defaults.js | 4 ++-- src/utils/fs.js | 2 +- src/utils/getExportMode.js | 2 +- src/utils/makeLegalIdentifier.js | 2 +- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/Bundle.js b/src/Bundle.js index 50aa5b6..e81c190 100644 --- a/src/Bundle.js +++ b/src/Bundle.js @@ -1,17 +1,17 @@ import Promise from 'es6-promise/lib/es6-promise/promise'; import MagicString from 'magic-string'; -import first from './utils/first'; -import { blank, keys } from './utils/object'; -import Module from './Module'; -import ExternalModule from './ExternalModule'; -import finalisers from './finalisers/index'; -import ensureArray from './utils/ensureArray'; -import { load, onwarn, resolveId } from './utils/defaults'; -import getExportMode from './utils/getExportMode'; -import getIndentString from './utils/getIndentString'; -import { unixizePath } from './utils/normalizePlatform'; -import transform from './utils/transform'; -import collapseSourcemaps from './utils/collapseSourcemaps'; +import first from './utils/first.js'; +import { blank, keys } from './utils/object.js'; +import Module from './Module.js'; +import ExternalModule from './ExternalModule.js'; +import finalisers from './finalisers/index.js'; +import ensureArray from './utils/ensureArray.js'; +import { load, onwarn, resolveId } from './utils/defaults.js'; +import getExportMode from './utils/getExportMode.js'; +import getIndentString from './utils/getIndentString.js'; +import { unixizePath } from './utils/normalizePlatform.js'; +import transform from './utils/transform.js'; +import collapseSourcemaps from './utils/collapseSourcemaps.js'; export default class Bundle { constructor ( options ) { diff --git a/src/ExternalModule.js b/src/ExternalModule.js index effdd5b..0e6a3ac 100644 --- a/src/ExternalModule.js +++ b/src/ExternalModule.js @@ -1,5 +1,5 @@ -import { blank } from './utils/object'; -import makeLegalIdentifier from './utils/makeLegalIdentifier'; +import { blank } from './utils/object.js'; +import makeLegalIdentifier from './utils/makeLegalIdentifier.js'; class ExternalDeclaration { constructor ( module, name ) { diff --git a/src/Module.js b/src/Module.js index 9db3dd8..cca6854 100644 --- a/src/Module.js +++ b/src/Module.js @@ -1,12 +1,12 @@ import { parse } from 'acorn/src/index'; import MagicString from 'magic-string'; import { walk } from 'estree-walker'; -import Statement from './Statement'; -import { blank, keys } from './utils/object'; -import { basename, extname } from './utils/path'; -import getLocation from './utils/getLocation'; -import makeLegalIdentifier from './utils/makeLegalIdentifier'; -import SOURCEMAPPING_URL from './utils/sourceMappingURL'; +import Statement from './Statement.js'; +import { blank, keys } from './utils/object.js'; +import { basename, extname } from './utils/path.js'; +import getLocation from './utils/getLocation.js'; +import makeLegalIdentifier from './utils/makeLegalIdentifier.js'; +import SOURCEMAPPING_URL from './utils/sourceMappingURL.js'; class SyntheticDefaultDeclaration { constructor ( node, statement, name ) { @@ -176,7 +176,7 @@ export default class Module { const node = statement.node; const source = node.source && node.source.value; - // export { name } from './other' + // export { name } from './other.js' if ( source ) { if ( !~this.dependencies.indexOf( source ) ) this.dependencies.push( source ); @@ -697,7 +697,7 @@ export default class Module { } traceExport ( name, importer ) { - // export { foo } from './other' + // export { foo } from './other.js' const reexportDeclaration = this.reexports[ name ]; if ( reexportDeclaration ) { return reexportDeclaration.module.traceExport( reexportDeclaration.localName, this ); diff --git a/src/Statement.js b/src/Statement.js index 18f9460..c6c72f2 100644 --- a/src/Statement.js +++ b/src/Statement.js @@ -1,7 +1,7 @@ import { walk } from 'estree-walker'; -import Scope from './ast/Scope'; -import attachScopes from './ast/attachScopes'; -import getLocation from './utils/getLocation'; +import Scope from './ast/Scope.js'; +import attachScopes from './ast/attachScopes.js'; +import getLocation from './utils/getLocation.js'; const modifierNodes = { AssignmentExpression: 'left', diff --git a/src/ast/attachScopes.js b/src/ast/attachScopes.js index 888324a..77b8af4 100644 --- a/src/ast/attachScopes.js +++ b/src/ast/attachScopes.js @@ -1,5 +1,5 @@ import { walk } from 'estree-walker'; -import Scope from './Scope'; +import Scope from './Scope.js'; const blockDeclarations = { 'const': true, diff --git a/src/finalisers/amd.js b/src/finalisers/amd.js index 757c7f4..4067aab 100644 --- a/src/finalisers/amd.js +++ b/src/finalisers/amd.js @@ -1,6 +1,6 @@ import { getName, quoteId } from '../utils/map-helpers'; -import getInteropBlock from './shared/getInteropBlock'; -import getExportBlock from './shared/getExportBlock'; +import getInteropBlock from './shared/getInteropBlock.js'; +import getExportBlock from './shared/getExportBlock.js'; export default function amd ( bundle, magicString, { exportMode, indentString }, options ) { let deps = bundle.externalModules.map( quoteId ); diff --git a/src/finalisers/cjs.js b/src/finalisers/cjs.js index ecb30e0..3a56ac9 100644 --- a/src/finalisers/cjs.js +++ b/src/finalisers/cjs.js @@ -1,4 +1,4 @@ -import getExportBlock from './shared/getExportBlock'; +import getExportBlock from './shared/getExportBlock.js'; export default function cjs ( bundle, magicString, { exportMode }, options ) { let intro = options.useStrict === false ? `` : `'use strict';\n\n`; diff --git a/src/finalisers/iife.js b/src/finalisers/iife.js index 997f2e7..e8645a1 100644 --- a/src/finalisers/iife.js +++ b/src/finalisers/iife.js @@ -1,7 +1,7 @@ import { blank } from '../utils/object'; import { getName } from '../utils/map-helpers'; -import getInteropBlock from './shared/getInteropBlock'; -import getExportBlock from './shared/getExportBlock'; +import getInteropBlock from './shared/getInteropBlock.js'; +import getExportBlock from './shared/getExportBlock.js'; export default function iife ( bundle, magicString, { exportMode, indentString }, options ) { const globalNames = options.globals || blank(); diff --git a/src/finalisers/index.js b/src/finalisers/index.js index 49791f4..3ada90a 100644 --- a/src/finalisers/index.js +++ b/src/finalisers/index.js @@ -1,7 +1,7 @@ -import amd from './amd'; -import cjs from './cjs'; -import es6 from './es6'; -import iife from './iife'; -import umd from './umd'; +import amd from './amd.js'; +import cjs from './cjs.js'; +import es6 from './es6.js'; +import iife from './iife.js'; +import umd from './umd.js'; export default { amd, cjs, es6, iife, umd }; diff --git a/src/finalisers/umd.js b/src/finalisers/umd.js index 2b6ce84..00d4cdb 100644 --- a/src/finalisers/umd.js +++ b/src/finalisers/umd.js @@ -1,7 +1,7 @@ import { blank } from '../utils/object'; import { getName, quoteId, req } from '../utils/map-helpers'; -import getInteropBlock from './shared/getInteropBlock'; -import getExportBlock from './shared/getExportBlock'; +import getInteropBlock from './shared/getInteropBlock.js'; +import getExportBlock from './shared/getExportBlock.js'; export default function umd ( bundle, magicString, { exportMode, indentString }, options ) { if ( exportMode !== 'none' && !options.moduleName ) { diff --git a/src/rollup.js b/src/rollup.js index 9049174..4829d23 100644 --- a/src/rollup.js +++ b/src/rollup.js @@ -1,8 +1,8 @@ -import { basename } from './utils/path'; -import { writeFile } from './utils/fs'; -import { keys } from './utils/object'; -import SOURCEMAPPING_URL from './utils/sourceMappingURL'; -import Bundle from './Bundle'; +import { basename } from './utils/path.js'; +import { writeFile } from './utils/fs.js'; +import { keys } from './utils/object.js'; +import SOURCEMAPPING_URL from './utils/sourceMappingURL.js'; +import Bundle from './Bundle.js'; export const VERSION = '<@VERSION@>'; diff --git a/src/utils/defaults.js b/src/utils/defaults.js index 690ebfb..2cb6cd2 100644 --- a/src/utils/defaults.js +++ b/src/utils/defaults.js @@ -1,5 +1,5 @@ -import { readFileSync } from './fs'; -import { dirname, extname, isAbsolute, resolve } from './path'; +import { readFileSync } from './fs.js'; +import { dirname, extname, isAbsolute, resolve } from './path.js'; export function load ( id ) { return readFileSync( id, 'utf-8' ); diff --git a/src/utils/fs.js b/src/utils/fs.js index fc3ee77..d0f8715 100644 --- a/src/utils/fs.js +++ b/src/utils/fs.js @@ -1,6 +1,6 @@ import Promise from 'es6-promise/lib/es6-promise/promise'; import * as fs from 'fs'; -import { dirname } from './path'; +import { dirname } from './path.js'; function mkdirpath ( path ) { const dir = dirname( path ); diff --git a/src/utils/getExportMode.js b/src/utils/getExportMode.js index b5c9fc4..ed52c6a 100644 --- a/src/utils/getExportMode.js +++ b/src/utils/getExportMode.js @@ -1,4 +1,4 @@ -import { keys } from './object'; +import { keys } from './object.js'; function badExports ( option, keys ) { throw new Error( `'${option}' was specified for options.exports, but entry module has following exports: ${keys.join(', ')}` ); diff --git a/src/utils/makeLegalIdentifier.js b/src/utils/makeLegalIdentifier.js index 1dd4454..fd75ee8 100644 --- a/src/utils/makeLegalIdentifier.js +++ b/src/utils/makeLegalIdentifier.js @@ -1,4 +1,4 @@ -import { blank } from './object'; +import { blank } from './object.js'; const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public'.split( ' ' ); const builtins = 'Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl'.split( ' ' );