Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel910 committed Jan 8, 2019
2 parents b404004 + 9572f04 commit 1c1ce7d
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 17 deletions.
25 changes: 25 additions & 0 deletions addons/webiny-integration-typeform/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"presets": [
["@babel/preset-env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 7"]
}
}],
"@babel/preset-react",
"@babel/preset-flow"
],
"plugins": [
["babel-plugin-emotion", { "autoLabel": true }],
["@babel/plugin-proposal-object-rest-spread", {"useBuiltIns": true}],
["@babel/plugin-transform-runtime"],
["@babel/plugin-proposal-class-properties"],
["babel-plugin-named-asset-import", {
"loaderMap": {
"svg": {
"ReactComponent": "@svgr/webpack![path]"
}
}
}]
]
}

1 change: 0 additions & 1 deletion addons/webiny-integration-typeform/.babelrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion addons/webiny-integration-typeform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"react-dom": "^16.4.0"
},
"scripts": {
"build": "babel src types.js -d ${DEST:-build} --source-maps --copy-files --ignore types.js",
"build": "babel src -d ${DEST:-build} --source-maps --copy-files",
"flow-copy-source": "flow-copy-source src ${DEST:-build}",
"postbuild": "yarn flow-copy-source"
}
Expand Down
7 changes: 3 additions & 4 deletions scripts/release/addons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,17 @@ const packages = getPackages("build/node_modules/*").map(pkg => {
});

release({
ci: !!argv.ci,
ci: true,
preview: argv.preview || false,
branch: argv.branch || "master",
registryUrl: "http://localhost:4873",
packages,
plugins: [
verifyEnvironment(),
githubVerify(),
//npmVerify(),
npmVerify(),
analyzeCommits(),
updatePackages(),
//npmPublish(),
npmPublish(),
githubPublish()
]
});
2 changes: 1 addition & 1 deletion scripts/release/addons/plugins/analyzeCommits/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = (pluginConfig = {}) => {
/**
* Analyze commits for all packages and determine next release version
*/
return async (params, next, finish) => {
return async (params, next) => {
const { packages, logger, config, git } = params;

const getLastRelease = getLastReleaseFactory({ logger, git });
Expand Down
8 changes: 4 additions & 4 deletions scripts/release/packages/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
require("dotenv").config();
const hookStd = require("hook-std");
const { argv } = require("yargs");
const buildParams = require("./utils/buildParams");
const stdOut = require("./utils/stdOut");
const compose = require("./utils/compose");
const getPackages = require("./utils/getPackages");
const buildParams = require("../utils/buildParams");
const stdOut = require("../utils/stdOut");
const compose = require("../utils/compose");
const getPackages = require("../utils/getPackages");

const analyzeCommits = require("./plugins/analyzeCommits");
const verifyEnvironment = require("./plugins/verifyEnvironment");
Expand Down
8 changes: 3 additions & 5 deletions scripts/release/packages/plugins/github/publish.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const execa = require("execa");
const parseGithubUrl = require("parse-github-url");
const GithubFactory = require("../../utils/githubClient");
const GithubFactory = require("./utils/githubClient");

module.exports = (pluginConfig = {}) => {
return async ({ lastRelease, nextRelease, config, git, logger, packages }, next, finish) => {
Expand All @@ -11,10 +11,8 @@ module.exports = (pluginConfig = {}) => {
// Need this variable for lerna-changelog
process.env.GITHUB_AUTH = githubToken;

if (!config.preview) {
const githubClientConfig = { ...pluginConfig.githubClient, githubToken };
github = GithubFactory(githubClientConfig);
}
const githubClientConfig = { ...pluginConfig.githubClient, githubToken };
github = GithubFactory(githubClientConfig);

const { name: repo, owner } = parseGithubUrl(config.repositoryUrl);

Expand Down
2 changes: 1 addition & 1 deletion scripts/release/packages/plugins/github/verify.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const parseGithubUrl = require("parse-github-url");
const GithubFactory = require("../../utils/githubClient");
const GithubFactory = require("./utils/githubClient");

module.exports = (pluginConfig = {}) => {
return async ({ logger, config }, next) => {
Expand Down

0 comments on commit 1c1ce7d

Please sign in to comment.