Skip to content

Commit

Permalink
Merge branch 'release/1.0.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Apr 6, 2020
2 parents ab326ab + e3898f1 commit 94a9553
Show file tree
Hide file tree
Showing 4 changed files with 203 additions and 1,978 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [1.0.11] - 2020-04-06
### Changed
* Update dependencies

## [1.0.10] - 2020-04-03
### Changed
* Update dependencies
Expand Down Expand Up @@ -70,7 +74,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
* Deploy to Netlify
* Comment on GitHub PR

[Unreleased]: https://github.com/nwtgck/actions-netlify/compare/v1.0.10...HEAD
[Unreleased]: https://github.com/nwtgck/actions-netlify/compare/v1.0.11...HEAD
[1.0.11]: https://github.com/nwtgck/actions-netlify/compare/v1.0.10...v1.0.11
[1.0.10]: https://github.com/nwtgck/actions-netlify/compare/v1.0.9...v1.0.10
[1.0.9]: https://github.com/nwtgck/actions-netlify/compare/v1.0.8...v1.0.9
[1.0.8]: https://github.com/nwtgck/actions-netlify/compare/v1.0.7...v1.0.8
Expand Down
102 changes: 82 additions & 20 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2482,6 +2482,11 @@ const pLimit = concurrency => {
},
pendingCount: {
get: () => queue.length
},
clearQueue: {
value: () => {
queue.length = 0;
}
}
});

Expand Down Expand Up @@ -5372,13 +5377,21 @@ const windowsRelease = release => {

const ver = (version || [])[0];

// Server 2008, 2012 and 2016 versions are ambiguous with desktop versions and must be detected at runtime.
// Server 2008, 2012, 2016, and 2019 versions are ambiguous with desktop versions and must be detected at runtime.
// If `release` is omitted or we're on a Windows system, and the version number is an ambiguous version
// then use `wmic` to get the OS caption: https://msdn.microsoft.com/en-us/library/aa394531(v=vs.85).aspx
// If the resulting caption contains the year 2008, 2012 or 2016, it is a server version, so return a server OS name.
// If `wmic` is obsoloete (later versions of Windows 10), use PowerShell instead.
// If the resulting caption contains the year 2008, 2012, 2016 or 2019, it is a server version, so return a server OS name.
if ((!release || release === os.release()) && ['6.1', '6.2', '6.3', '10.0'].includes(ver)) {
const stdout = execa.sync('wmic', ['os', 'get', 'Caption']).stdout || '';
const year = (stdout.match(/2008|2012|2016/) || [])[0];
let stdout;
try {
stdout = execa.sync('powershell', ['(Get-CimInstance -ClassName Win32_OperatingSystem).caption']).stdout || '';
} catch (_) {
stdout = execa.sync('wmic', ['os', 'get', 'Caption']).stdout || '';
}

const year = (stdout.match(/2008|2012|2016|2019/) || [])[0];

if (year) {
return `Server ${year}`;
}
Expand Down Expand Up @@ -75678,7 +75691,7 @@ module.exports = setup;
/* 487 */
/***/ (function(module) {

module.exports = {"name":"@typescript-eslint/typescript-estree","version":"2.25.0","description":"A parser that converts TypeScript source code into an ESTree compatible form","main":"dist/parser.js","types":"dist/parser.d.ts","files":["dist","README.md","LICENSE"],"engines":{"node":"^8.10.0 || ^10.13.0 || >=11.10.1"},"repository":{"type":"git","url":"https://github.com/typescript-eslint/typescript-eslint.git","directory":"packages/typescript-estree"},"bugs":{"url":"https://github.com/typescript-eslint/typescript-eslint/issues"},"license":"BSD-2-Clause","keywords":["ast","estree","ecmascript","javascript","typescript","parser","syntax"],"scripts":{"build":"tsc -b tsconfig.build.json","clean":"tsc -b tsconfig.build.json --clean","format":"prettier --write \"./**/*.{ts,js,json,md}\" --ignore-path ../../.prettierignore","lint":"eslint . --ext .js,.ts --ignore-path='../../.eslintignore'","test":"jest --coverage","typecheck":"tsc -p tsconfig.json --noEmit"},"dependencies":{"debug":"^4.1.1","eslint-visitor-keys":"^1.1.0","glob":"^7.1.6","is-glob":"^4.0.1","lodash":"^4.17.15","semver":"^6.3.0","tsutils":"^3.17.1"},"devDependencies":{"@babel/code-frame":"^7.8.3","@babel/parser":"^7.8.3","@babel/types":"^7.8.3","@types/babel__code-frame":"^7.0.1","@types/debug":"^4.1.5","@types/glob":"^7.1.1","@types/is-glob":"^4.0.1","@types/lodash":"^4.14.149","@types/semver":"^6.2.0","@types/tmp":"^0.1.0","@typescript-eslint/shared-fixtures":"2.25.0","tmp":"^0.1.0","typescript":"*"},"peerDependenciesMeta":{"typescript":{"optional":true}},"funding":{"type":"opencollective","url":"https://opencollective.com/typescript-eslint"},"gitHead":"9cd3e4fe53c0224c75767a3f127f19b86060e277","_resolved":"https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz","_integrity":"sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==","_from":"@typescript-eslint/[email protected]"};
module.exports = {"_from":"@typescript-eslint/[email protected]","_id":"@typescript-eslint/[email protected]","_inBundle":false,"_integrity":"sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==","_location":"/@typescript-eslint/typescript-estree","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"@typescript-eslint/[email protected]","name":"@typescript-eslint/typescript-estree","escapedName":"@typescript-eslint%2ftypescript-estree","scope":"@typescript-eslint","rawSpec":"2.27.0","saveSpec":null,"fetchSpec":"2.27.0"},"_requiredBy":["/@typescript-eslint/experimental-utils","/@typescript-eslint/parser","/detective-typescript"],"_resolved":"https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz","_shasum":"a288e54605412da8b81f1660b56c8b2e42966ce8","_spec":"@typescript-eslint/[email protected]","_where":"/Users/ryo/dev/actions/actions-netlify/node_modules/@typescript-eslint/parser","bugs":{"url":"https://github.com/typescript-eslint/typescript-eslint/issues"},"bundleDependencies":false,"dependencies":{"debug":"^4.1.1","eslint-visitor-keys":"^1.1.0","glob":"^7.1.6","is-glob":"^4.0.1","lodash":"^4.17.15","semver":"^6.3.0","tsutils":"^3.17.1"},"deprecated":false,"description":"A parser that converts TypeScript source code into an ESTree compatible form","devDependencies":{"@babel/code-frame":"^7.8.3","@babel/parser":"^7.8.3","@babel/types":"^7.8.3","@types/babel__code-frame":"^7.0.1","@types/debug":"^4.1.5","@types/glob":"^7.1.1","@types/is-glob":"^4.0.1","@types/lodash":"^4.14.149","@types/semver":"^6.2.0","@types/tmp":"^0.1.0","@typescript-eslint/shared-fixtures":"2.27.0","tmp":"^0.1.0","typescript":"*"},"engines":{"node":"^8.10.0 || ^10.13.0 || >=11.10.1"},"files":["dist","README.md","LICENSE"],"funding":{"type":"opencollective","url":"https://opencollective.com/typescript-eslint"},"gitHead":"bed774320f4f9196c98351754f74fbdbbe9309d8","homepage":"https://github.com/typescript-eslint/typescript-eslint#readme","keywords":["ast","estree","ecmascript","javascript","typescript","parser","syntax"],"license":"BSD-2-Clause","main":"dist/parser.js","name":"@typescript-eslint/typescript-estree","peerDependenciesMeta":{"typescript":{"optional":true}},"repository":{"type":"git","url":"git+https://github.com/typescript-eslint/typescript-eslint.git","directory":"packages/typescript-estree"},"scripts":{"build":"tsc -b tsconfig.build.json","clean":"tsc -b tsconfig.build.json --clean","format":"prettier --write \"./**/*.{ts,js,json,md}\" --ignore-path ../../.prettierignore","lint":"eslint . --ext .js,.ts --ignore-path='../../.eslintignore'","test":"jest --coverage","typecheck":"tsc -p tsconfig.json --noEmit"},"types":"dist/parser.d.ts","version":"2.27.0"};

/***/ }),
/* 488 */
Expand Down Expand Up @@ -77993,6 +78006,7 @@ var HttpCodes;
HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
Expand Down Expand Up @@ -79216,6 +79230,12 @@ function createWatchProgram(tsconfigPath, extra) {
host.readDirectory = (path, extensions, exclude, include, depth) => oldReadDirectory(path, !extensions ? undefined : extensions.concat(extra.extraFileExtensions), exclude, include, depth);
oldOnDirectoryStructureHostCreate(host);
};
// This works only on 3.9
watchCompilerHost.extraFileExtensions = extra.extraFileExtensions.map(extension => ({
extension,
isMixedContent: true,
scriptKind: ts.ScriptKind.Deferred,
}));
watchCompilerHost.trace = log;
// Since we don't want to asynchronously update program we want to disable timeout methods
// So any changes in the program will be delayed and updated when getProgram is called on watch
Expand Down Expand Up @@ -84863,6 +84883,7 @@ const createProjectProgram_1 = __webpack_require__(500);
const createSourceFile_1 = __webpack_require__(269);
const semantic_or_syntactic_errors_1 = __webpack_require__(62);
const shared_1 = __webpack_require__(164);
const log = debug_1.default('typescript-eslint:typescript-estree:parser');
/**
* This needs to be kept in sync with the top-level README.md in the
* typescript-eslint monorepo
Expand Down Expand Up @@ -84939,6 +84960,59 @@ function resetExtra() {
useJSXTextNode: false,
};
}
/**
* Normalizes, sanitizes, resolves and filters the provided
*/
function prepareAndTransformProjects(projectsInput, ignoreListInput) {
let projects = [];
// Normalize and sanitize the project paths
if (typeof projectsInput === 'string') {
projects.push(projectsInput);
}
else if (Array.isArray(projectsInput)) {
for (const project of projectsInput) {
if (typeof project === 'string') {
projects.push(project);
}
}
}
if (projects.length === 0) {
return projects;
}
// Transform glob patterns into paths
projects = projects.reduce((projects, project) => projects.concat(is_glob_1.default(project)
? glob_1.sync(project, {
cwd: extra.tsconfigRootDir,
})
: project), []);
// Normalize and sanitize the ignore regex list
const ignoreRegexes = [];
if (Array.isArray(ignoreListInput)) {
for (const ignore of ignoreListInput) {
if (ignore instanceof RegExp) {
ignoreRegexes.push(ignore);
}
else if (typeof ignore === 'string') {
ignoreRegexes.push(new RegExp(ignore));
}
}
}
else {
ignoreRegexes.push(/\/node_modules\//);
}
// Remove any paths that match the ignore list
const filtered = projects.filter(project => {
for (const ignore of ignoreRegexes) {
if (ignore.test(project)) {
return false;
}
}
return true;
});
log('parserOptions.project matched projects: %s', projects);
log('ignore list applied to parserOptions.project: %s', filtered);
return filtered;
}
function applyParserOptionsToExtra(options) {
/**
* Configure Debug logging
Expand Down Expand Up @@ -85023,25 +85097,13 @@ function applyParserOptionsToExtra(options) {
else if (options.loggerFn === false) {
extra.log = Function.prototype;
}
if (typeof options.project === 'string') {
extra.projects = [options.project];
}
else if (Array.isArray(options.project) &&
options.project.every(projectPath => typeof projectPath === 'string')) {
extra.projects = options.project;
}
if (typeof options.tsconfigRootDir === 'string') {
extra.tsconfigRootDir = options.tsconfigRootDir;
}
// NOTE - ensureAbsolutePath relies upon having the correct tsconfigRootDir in extra
extra.filePath = shared_1.ensureAbsolutePath(extra.filePath, extra);
// Transform glob patterns into paths
if (extra.projects) {
extra.projects = extra.projects.reduce((projects, project) => projects.concat(is_glob_1.default(project)
? glob_1.sync(project, {
cwd: extra.tsconfigRootDir || process.cwd(),
})
: project), []);
}
// NOTE - prepareAndTransformProjects relies upon having the correct tsconfigRootDir in extra
extra.projects = prepareAndTransformProjects(options.project, options.projectFolderIgnoreList);
if (Array.isArray(options.extraFileExtensions) &&
options.extraFileExtensions.every(ext => typeof ext === 'string')) {
extra.extraFileExtensions = options.extraFileExtensions;
Expand Down
Loading

4 comments on commit 94a9553

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.