Skip to content

Commit

Permalink
Merge fs-watcher-child into Parcel's monorepo (#2197)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeMoorJasper authored and devongovett committed Oct 26, 2018
1 parent 2c14995 commit 060db2e
Show file tree
Hide file tree
Showing 93 changed files with 872 additions and 105 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Expand Up @@ -14,3 +14,4 @@ dist

coverage
node_modules
tmp
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -15,3 +15,4 @@ logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
tmp
1 change: 1 addition & 0 deletions .prettierignore
Expand Up @@ -2,3 +2,4 @@ packages/core/parcel-bundler/src/builtins
packages/core/parcel-bundler/test/integration
packages/core/parcel-bundler/test/input
packages/core/parcel-bundler/test/dist
tmp
1 change: 1 addition & 0 deletions packages/core/fs/.gitignore
@@ -0,0 +1 @@
lib
5 changes: 5 additions & 0 deletions packages/core/fs/index.js
@@ -0,0 +1,5 @@
// Node 8 supports native async functions - no need to use compiled code!
module.exports =
parseInt(process.versions.node, 10) < 8
? require('./lib/fs')
: require('./src/fs');
26 changes: 26 additions & 0 deletions packages/core/fs/package.json
@@ -0,0 +1,26 @@
{
"name": "@parcel/fs",
"version": "1.10.3",
"description": "Blazing fast, zero configuration web application bundler",
"main": "index.js",
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/parcel-bundler/parcel.git"
},
"engines": {
"node": ">= 6.0.0"
},
"scripts": {
"test": "echo this package has no tests yet",
"test-ci": "yarn build && yarn test",
"format": "prettier --write \"./{src,bin,test}/**/*.{js,json,md}\"",
"lint": "eslint . && prettier \"./{src,bin,test}/**/*.{js,json,md}\" --list-different",
"build": "babel src -d lib",
"prepublish": "yarn build"
},
"dependencies": {
"mkdirp": "^0.5.1",
"@parcel/utils": "^1.10.3"
}
}
8 changes: 8 additions & 0 deletions packages/core/fs/src/.babelrc
@@ -0,0 +1,8 @@
{
"presets": [["@babel/preset-env", {
"targets": {
"node": "6"
}
}]],
"plugins": ["@babel/plugin-transform-runtime"]
}
3 changes: 3 additions & 0 deletions packages/core/fs/src/.eslintrc.json
@@ -0,0 +1,3 @@
{
"extends": "../../../../.eslintrc.json"
}
@@ -1,4 +1,4 @@
const promisify = require('./promisify');
const {promisify} = require('@parcel/utils');
const fs = require('fs');
const mkdirp = require('mkdirp');

Expand Down
3 changes: 2 additions & 1 deletion packages/core/logger/package.json
Expand Up @@ -21,7 +21,8 @@
},
"devDependencies": {
"mocha": "^5.2.0",
"sinon": "^5.0.1"
"sinon": "^5.0.1",
"@parcel/babel-register": "^1.10.3"
},
"dependencies": {
"chalk": "^2.1.0",
Expand Down
1 change: 1 addition & 0 deletions packages/core/parcel-bundler/.gitignore
Expand Up @@ -8,3 +8,4 @@ test/integration/**/Cargo.lock
test/**/node_modules
test/**/yarn.lock
test/**/package-lock.json
test/integration/babel-plugin-autoinstall/package.json
7 changes: 5 additions & 2 deletions packages/core/parcel-bundler/package.json
Expand Up @@ -70,7 +70,9 @@
"ws": "^5.1.1",
"@parcel/watcher": "1.10.3",
"@parcel/workers": "^1.10.3",
"@parcel/logger": "^1.10.3"
"@parcel/logger": "^1.10.3",
"@parcel/utils": "^1.10.3",
"@parcel/fs": "^1.10.3"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
Expand Down Expand Up @@ -114,7 +116,8 @@
"typescript": "^3.0.0",
"vue": "^2.5.16",
"vue-template-compiler": "^2.5.16",
"@parcel/babel-register": "^1.10.3"
"@parcel/babel-register": "^1.10.3",
"@parcel/test-utils": "^1.10.3"
},
"scripts": {
"test": "cross-env NODE_ENV=test mocha",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/Asset.js
@@ -1,7 +1,7 @@
const URL = require('url');
const path = require('path');
const clone = require('clone');
const fs = require('./utils/fs');
const fs = require('@parcel/fs');
const md5 = require('./utils/md5');
const isURL = require('./utils/is-url');
const config = require('./utils/config');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/Bundler.js
@@ -1,4 +1,4 @@
const fs = require('./utils/fs');
const fs = require('@parcel/fs');
const Resolver = require('./Resolver');
const Parser = require('./Parser');
const WorkerFarm = require('@parcel/workers');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/FSCache.js
@@ -1,4 +1,4 @@
const fs = require('./utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const md5 = require('./utils/md5');
const objectHash = require('./utils/objectHash');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/Resolver.js
Expand Up @@ -2,7 +2,7 @@ const builtins = require('./builtins');
const nodeBuiltins = require('node-libs-browser');
const path = require('path');
const {isGlob} = require('./utils/glob');
const fs = require('./utils/fs');
const fs = require('@parcel/fs');
const micromatch = require('micromatch');

const EMPTY_SHIM = require.resolve('./builtins/_empty');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/GLSLAsset.js
@@ -1,7 +1,7 @@
const Asset = require('../Asset');
const localRequire = require('../utils/localRequire');
const path = require('path');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const Resolver = require('../Resolver');

class GLSLAsset extends Asset {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/GraphqlAsset.js
@@ -1,7 +1,7 @@
const Asset = require('../Asset');
const localRequire = require('../utils/localRequire');
const Resolver = require('../Resolver');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const os = require('os');

const IMPORT_RE = /^# *import +['"](.*)['"] *;? *$/;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/JSAsset.js
Expand Up @@ -14,7 +14,7 @@ const terser = require('../transforms/terser');
const SourceMap = require('../SourceMap');
const hoist = require('../scope-hoisting/hoist');
const path = require('path');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const logger = require('@parcel/logger');

const IMPORT_RE = /\b(?:import\b|export\b|require\s*\()/;
Expand Down
4 changes: 2 additions & 2 deletions packages/core/parcel-bundler/src/assets/LESSAsset.js
@@ -1,8 +1,8 @@
const Asset = require('../Asset');
const localRequire = require('../utils/localRequire');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const Resolver = require('../Resolver');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const parseCSSImport = require('../utils/parseCSSImport');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/ReasonAsset.js
@@ -1,5 +1,5 @@
const Asset = require('../Asset');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const localRequire = require('../utils/localRequire');

class ReasonAsset extends Asset {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/parcel-bundler/src/assets/RustAsset.js
@@ -1,10 +1,10 @@
const path = require('path');
const commandExists = require('command-exists');
const childProcess = require('child_process');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const exec = promisify(childProcess.execFile);
const tomlify = require('tomlify-j0.4');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const Asset = require('../Asset');
const config = require('../utils/config');
const pipeSpawn = require('../utils/pipeSpawn');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/SASSAsset.js
@@ -1,6 +1,6 @@
const Asset = require('../Asset');
const localRequire = require('../utils/localRequire');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const path = require('path');
const os = require('os');
const Resolver = require('../Resolver');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/assets/StylusAsset.js
Expand Up @@ -2,7 +2,7 @@
const Asset = require('../Asset');
const localRequire = require('../utils/localRequire');
const Resolver = require('../Resolver');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');
const {dirname, resolve, relative} = require('path');
const {isGlob, glob} = require('../utils/glob');

Expand Down
4 changes: 2 additions & 2 deletions packages/core/parcel-bundler/src/packagers/Packager.js
@@ -1,7 +1,7 @@
const fs = require('fs');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const path = require('path');
const {mkdirp} = require('../utils/fs');
const {mkdirp} = require('@parcel/fs');

class Packager {
constructor(bundle, bundler) {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/packagers/RawPackager.js
@@ -1,6 +1,6 @@
const Packager = require('./Packager');
const path = require('path');
const fs = require('../utils/fs');
const fs = require('@parcel/fs');

class RawPackager extends Packager {
static shouldAddAsset() {
Expand Down
Expand Up @@ -3,7 +3,7 @@ const logger = require('@parcel/logger');
const path = require('path');
const localRequire = require('../../utils/localRequire');
const installPackage = require('../../utils/installPackage');
const fs = require('../../utils/fs');
const fs = require('@parcel/fs');
const micromatch = require('micromatch');

async function getBabelConfig(asset, isSource) {
Expand Down
Expand Up @@ -3,7 +3,7 @@ const getEnvConfig = require('./env');
const getJSXConfig = require('./jsx');
const getFlowConfig = require('./flow');
const path = require('path');
const fs = require('../../utils/fs');
const fs = require('@parcel/fs');

const NODE_MODULES = `${path.sep}node_modules${path.sep}`;
const ENV_PLUGINS = require('@babel/preset-env/data/plugins');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/utils/config.js
@@ -1,4 +1,4 @@
const fs = require('./fs');
const fs = require('@parcel/fs');
const path = require('path');
const clone = require('clone');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/utils/getCertificate.js
@@ -1,4 +1,4 @@
const fs = require('./fs');
const fs = require('@parcel/fs');

async function getCertificate(options) {
try {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/parcel-bundler/src/utils/installPackage.js
@@ -1,12 +1,12 @@
const config = require('./config');
const promisify = require('./promisify');
const {promisify} = require('@parcel/utils');
const resolve = promisify(require('resolve'));
const commandExists = require('command-exists');
const logger = require('@parcel/logger');
const pipeSpawn = require('./pipeSpawn');
const PromiseQueue = require('./PromiseQueue');
const path = require('path');
const fs = require('./fs');
const fs = require('@parcel/fs');
const WorkerFarm = require('@parcel/workers');

const YARN_LOCK = 'yarn.lock';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/src/utils/localRequire.js
@@ -1,5 +1,5 @@
const {dirname} = require('path');
const promisify = require('../utils/promisify');
const {promisify} = require('@parcel/utils');
const resolve = promisify(require('resolve'));
const installPackage = require('./installPackage');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/asset.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const Asset = require('../src/Asset');
const {bundle} = require('./utils');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/autoinstall.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const install = require('../src/utils/installPackage');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {ncp, rimraf} = require('./utils');
const path = require('path');
const inputDirPath = path.join(__dirname, '/input');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/babel.js
@@ -1,5 +1,5 @@
const babelCore = require('@babel/core');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {
babel6toBabel7,
babel7toBabel6
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/contentHashing.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {bundle, rimraf, ncp} = require('./utils');

describe('content hashing', function() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/css.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {bundle, run, assertBundleTree, rimraf, ncp} = require('./utils');

describe('css', function() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/elm.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {bundle, assertBundleTree, run} = require('./utils');

describe('elm', function() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/encodedURI.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {bundle, assertBundleTree} = require('./utils');

describe('encodedURI', function() {
Expand Down
5 changes: 3 additions & 2 deletions packages/core/parcel-bundler/test/fs-cache.js
@@ -1,7 +1,8 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const {sleep, rimraf, ncp} = require('./utils');
const fs = require('@parcel/fs');
const {rimraf, ncp} = require('./utils');
const {sleep} = require('@parcel/test-utils');
const FSCache = require('../src/FSCache');

const cachePath = path.join(__dirname, '.cache');
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/fs.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const {bundle, run, assertBundleTree} = require('./utils');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/generateCertificate.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const generateCertificate = require('../src/utils/generateCertificate');
const {rimraf, ncp} = require('./utils');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/getCertificate.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const getCertificate = require('../src/utils/getCertificate');

const https = {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/glob.js
@@ -1,5 +1,5 @@
const assert = require('assert');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const {bundle, run, assertBundleTree} = require('./utils');

Expand Down
2 changes: 1 addition & 1 deletion packages/core/parcel-bundler/test/glsl.js
@@ -1,6 +1,6 @@
const assert = require('assert');
const path = require('path');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const {bundle, run, assertBundleTree, normaliseNewlines} = require('./utils');

describe('glsl', function() {
Expand Down
5 changes: 3 additions & 2 deletions packages/core/parcel-bundler/test/hmr.js
@@ -1,7 +1,8 @@
const assert = require('assert');
const fs = require('../src/utils/fs');
const fs = require('@parcel/fs');
const path = require('path');
const {bundler, run, sleep, rimraf, ncp} = require('./utils');
const {bundler, run, rimraf, ncp} = require('./utils');
const {sleep} = require('@parcel/test-utils');
const WebSocket = require('ws');
const json5 = require('json5');
const sinon = require('sinon');
Expand Down

0 comments on commit 060db2e

Please sign in to comment.