Skip to content

Commit

Permalink
Merge commit 'cecf8a487759a8a9690f5575290556695956f062' into feature/…
Browse files Browse the repository at this point in the history
…strip-type-module-attr

* commit 'cecf8a487759a8a9690f5575290556695956f062':
  Try bumping elm packages version hoping this will fix failed tests
  Fix failed test on fs-destructure
  Fix failed test caused by Babel
  Fix code format by running `yarn format`
  Fix error from duplicated type (T is already declared)
  • Loading branch information
twome committed Apr 2, 2019
2 parents f35c32b + cecf8a4 commit 51cf63e
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 252 deletions.
Expand Up @@ -6,19 +6,19 @@
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/browser": "1.0.1",
"elm/core": "1.0.2",
"elm/html": "1.0.0"
},
"indirect": {
"elm/json": "1.0.0",
"elm/json": "1.1.3",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.0"
"elm/virtual-dom": "1.0.2"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
}
10 changes: 5 additions & 5 deletions packages/core/integration-tests/test/integration/elm/elm.json
Expand Up @@ -6,19 +6,19 @@
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/browser": "1.0.1",
"elm/core": "1.0.2",
"elm/html": "1.0.0"
},
"indirect": {
"elm/json": "1.0.0",
"elm/json": "1.1.3",
"elm/time": "1.0.0",
"elm/url": "1.0.0",
"elm/virtual-dom": "1.0.0"
"elm/virtual-dom": "1.0.2"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
}
2 changes: 1 addition & 1 deletion packages/core/integration-tests/test/scope-hoisting.js
Expand Up @@ -299,7 +299,7 @@ describe('scope hoisting', function() {
);
} catch (err) {
threw = true;
assert.equal(err.message, "export 'Test' is not defined");
assert.equal(err.message, "Export 'Test' is not defined (1:8)");
}

assert(threw);
Expand Down
22 changes: 11 additions & 11 deletions packages/core/parcel-bundler/package.json
Expand Up @@ -16,17 +16,17 @@
],
"dependencies": {
"@babel/code-frame": "^7.0.0 <7.4.0",
"@babel/core": "^7.0.0 <7.4.0",
"@babel/generator": "^7.0.0 <7.4.0",
"@babel/parser": "^7.0.0 <7.4.0",
"@babel/plugin-transform-flow-strip-types": "^7.0.0 <7.4.0",
"@babel/plugin-transform-modules-commonjs": "^7.0.0 <7.4.0",
"@babel/core": "^7.4.0",
"@babel/generator": "^7.4.0",
"@babel/parser": "^7.4.2",
"@babel/plugin-transform-flow-strip-types": "^7.4.0",
"@babel/plugin-transform-modules-commonjs": "^7.4.0",
"@babel/plugin-transform-react-jsx": "^7.0.0 <7.4.0",
"@babel/preset-env": "^7.0.0 <7.4.0",
"@babel/runtime": "^7.0.0 <7.4.0",
"@babel/template": "^7.0.0 <7.4.0",
"@babel/traverse": "^7.0.0 <7.4.0",
"@babel/types": "^7.0.0 <7.4.0",
"@babel/preset-env": "^7.4.2",
"@babel/runtime": "^7.4.2",
"@babel/template": "^7.4.0",
"@babel/traverse": "^7.4.0",
"@babel/types": "^7.4.0",
"@iarna/toml": "^2.2.0",
"@parcel/fs": "^1.11.0",
"@parcel/logger": "^1.11.0",
Expand Down Expand Up @@ -77,7 +77,7 @@
"@babel/cli": "^7.0.0 <7.4.0",
"@babel/plugin-syntax-export-default-from": "^7.0.0 <7.4.0",
"@babel/plugin-syntax-export-namespace-from": "^7.0.0 <7.4.0",
"@babel/plugin-transform-runtime": "^7.0.0 <7.4.0",
"@babel/plugin-transform-runtime": "^7.4.0",
"@babel/preset-flow": "^7.0.0 <7.4.0",
"@parcel/babel-register": "^1.11.0 <7.4.0",
"@parcel/test-utils": "^1.12.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/parcel-bundler/src/Bundler.js
Expand Up @@ -105,8 +105,8 @@ class Bundler extends EventEmitter {
target === 'node'
? false
: typeof options.hmr === 'boolean'
? options.hmr
: watch;
? options.hmr
: watch;
const scopeHoist =
options.scopeHoist !== undefined ? options.scopeHoist : false;
return {
Expand Down Expand Up @@ -145,8 +145,8 @@ class Bundler extends EventEmitter {
typeof options.autoInstall === 'boolean'
? options.autoInstall
: process.env.PARCEL_AUTOINSTALL === 'false'
? false
: !isProduction,
? false
: !isProduction,
scopeHoist: scopeHoist,
contentHash:
typeof options.contentHash === 'boolean'
Expand Down
40 changes: 21 additions & 19 deletions packages/core/parcel-bundler/src/assets/VueAsset.js
Expand Up @@ -214,28 +214,30 @@ class VueAsset extends Asset {
}

compileStyle(generated, scopeId) {
return generated.filter(r => r.type === 'css').reduce((p, r, i) => {
let css = r.value;
let scoped = this.ast.styles[i].scoped;

// Process scoped styles if needed.
if (scoped) {
let {code, errors} = this.vue.compileStyle({
source: css,
filename: this.relativeName,
id: scopeId,
scoped
});
return generated
.filter(r => r.type === 'css')
.reduce((p, r, i) => {
let css = r.value;
let scoped = this.ast.styles[i].scoped;

// Process scoped styles if needed.
if (scoped) {
let {code, errors} = this.vue.compileStyle({
source: css,
filename: this.relativeName,
id: scopeId,
scoped
});

if (errors.length) {
throw errors[0];
}

if (errors.length) {
throw errors[0];
css = code;
}

css = code;
}

return p + css;
}, '');
return p + css;
}, '');
}

compileHMR(generated, optsVar) {
Expand Down
Expand Up @@ -26,4 +26,4 @@ var a: { [a: number]: string; };

class C<+T,-U> {}
function f<+T,-U>() {}
type T<+T,-U> = {}
type D<+T,-U> = {}

0 comments on commit 51cf63e

Please sign in to comment.