diff --git a/addons/webiny-integration-typeform/.babelrc b/addons/webiny-integration-typeform/.babelrc new file mode 100644 index 00000000000..c9af31ab896 --- /dev/null +++ b/addons/webiny-integration-typeform/.babelrc @@ -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]" + } + } + }] + ] +} + diff --git a/addons/webiny-integration-typeform/.babelrc.js b/addons/webiny-integration-typeform/.babelrc.js deleted file mode 100644 index bff5e207793..00000000000 --- a/addons/webiny-integration-typeform/.babelrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("webiny-rewire/babel/preset"); \ No newline at end of file diff --git a/addons/webiny-integration-typeform/package.json b/addons/webiny-integration-typeform/package.json index 04e85ee0d91..e3e5496f017 100644 --- a/addons/webiny-integration-typeform/package.json +++ b/addons/webiny-integration-typeform/package.json @@ -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" } diff --git a/scripts/release/addons/index.js b/scripts/release/addons/index.js index f4246fa7327..9e6654c6501 100644 --- a/scripts/release/addons/index.js +++ b/scripts/release/addons/index.js @@ -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() ] }); diff --git a/scripts/release/addons/plugins/analyzeCommits/index.js b/scripts/release/addons/plugins/analyzeCommits/index.js index f36abca744e..72173c573e6 100644 --- a/scripts/release/addons/plugins/analyzeCommits/index.js +++ b/scripts/release/addons/plugins/analyzeCommits/index.js @@ -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 }); diff --git a/scripts/release/packages/index.js b/scripts/release/packages/index.js index 7e9beab6009..2ed5df802c7 100644 --- a/scripts/release/packages/index.js +++ b/scripts/release/packages/index.js @@ -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"); diff --git a/scripts/release/packages/plugins/github/publish.js b/scripts/release/packages/plugins/github/publish.js index 6e8835d363e..14d3f9fb7be 100644 --- a/scripts/release/packages/plugins/github/publish.js +++ b/scripts/release/packages/plugins/github/publish.js @@ -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) => { @@ -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); diff --git a/scripts/release/packages/plugins/github/verify.js b/scripts/release/packages/plugins/github/verify.js index 7b39493a9c4..91bdee97d4a 100644 --- a/scripts/release/packages/plugins/github/verify.js +++ b/scripts/release/packages/plugins/github/verify.js @@ -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) => {