From 73eddfd209eb347a06e2564daa529bf07aa507f4 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Tue, 18 Jan 2022 19:02:19 -0500 Subject: [PATCH 01/14] chore: remove external from config --- rollup.config.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 51ce7f40ace..327146a571d 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -80,24 +80,6 @@ const nodePlugins = [ export default (command: Record): RollupOptions | RollupOptions[] => { const { collectLicenses, writeLicense } = getLicenseHandler(); const commonJSBuild: RollupOptions = { - // fsevents is a dependency of chokidar that cannot be bundled as it contains binary code - external: [ - 'buffer', - '@rollup/plugin-typescript', - 'assert', - 'crypto', - 'events', - 'fs', - 'fsevents', - 'module', - 'os', - 'path', - 'perf_hooks', - 'process', - 'stream', - 'url', - 'util' - ], input: { 'loadConfigFile.js': 'cli/run/loadConfigFile.ts', 'rollup.js': 'src/node-entry.ts' From 6fe43aebee0bb8853f361ea360aa102f491f29c7 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Tue, 18 Jan 2022 19:13:01 -0500 Subject: [PATCH 02/14] simplify named imports --- rollup.config.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 327146a571d..801c49e1ef9 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,9 +1,10 @@ import { readFileSync } from 'fs'; -import path from 'path'; +import { resolve } from 'path'; +import process from 'process'; import alias from '@rollup/plugin-alias'; import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; -import resolve from '@rollup/plugin-node-resolve'; +import { nodeResolve } from '@rollup/plugin-node-resolve'; import typescript from '@rollup/plugin-typescript'; import { RollupOptions, WarningHandlerWithDefault } from 'rollup'; import { string } from 'rollup-plugin-string'; @@ -51,9 +52,9 @@ const onwarn: WarningHandlerWithDefault = warning => { const moduleAliases = { entries: [ - { find: 'help.md', replacement: path.resolve('cli/help.md') }, - { find: 'package.json', replacement: path.resolve('package.json') }, - { find: 'acorn', replacement: path.resolve('node_modules/acorn/dist/acorn.mjs') } + { find: 'help.md', replacement: resolve('cli/help.md') }, + { find: 'package.json', replacement: resolve('package.json') }, + { find: 'acorn', replacement: resolve('node_modules/acorn/dist/acorn.mjs') } ], resolve: ['.js', '.json', '.md'] }; @@ -66,7 +67,7 @@ const treeshake = { const nodePlugins = [ alias(moduleAliases), - resolve(), + nodeResolve(), json(), conditionalFsEventsImport(), string({ include: '**/*.md' }), @@ -142,7 +143,7 @@ export default (command: Record): RollupOptions | RollupOptions plugins: [ replaceBrowserModules(), alias(moduleAliases), - resolve({ browser: true }), + nodeResolve({ browser: true }), json(), commonjs(), typescript(), From fa4c5b76a733c1445e96a571bf69a68de24a8586 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Tue, 18 Jan 2022 19:14:10 -0500 Subject: [PATCH 03/14] nits --- rollup.config.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 801c49e1ef9..dd3a0879b5e 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -6,7 +6,7 @@ import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; import { nodeResolve } from '@rollup/plugin-node-resolve'; import typescript from '@rollup/plugin-typescript'; -import { RollupOptions, WarningHandlerWithDefault } from 'rollup'; +import type { RollupOptions, WarningHandlerWithDefault } from 'rollup'; import { string } from 'rollup-plugin-string'; import { terser } from 'rollup-plugin-terser'; import addCliEntry from './build-plugins/add-cli-entry'; @@ -15,7 +15,7 @@ import emitModulePackageFile from './build-plugins/emit-module-package-file'; import esmDynamicImport from './build-plugins/esm-dynamic-import'; import getLicenseHandler from './build-plugins/generate-license-file'; import replaceBrowserModules from './build-plugins/replace-browser-modules'; -import pkg from './package.json'; +import { version } from './package.json'; const commitHash = (function () { try { @@ -26,14 +26,12 @@ const commitHash = (function () { })(); const now = new Date( - process.env.SOURCE_DATE_EPOCH - ? 1000 * parseInt(process.env.SOURCE_DATE_EPOCH) - : new Date().getTime() + process.env.SOURCE_DATE_EPOCH ? 1000 * +process.env.SOURCE_DATE_EPOCH : Date.now() ).toUTCString(); const banner = `/* @license - Rollup.js v${pkg.version} + Rollup.js v${version} ${now} - commit ${commitHash} https://github.com/rollup/rollup From 4a5fa733d4fb54d18bb5e7b738665638b467181f Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 19 Jan 2022 19:56:19 -0500 Subject: [PATCH 04/14] fix: mark fsevents as external --- rollup.config.ts | 1 + src/watch/fsevents-importer.ts | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index dd3a0879b5e..7237b80b6f7 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -79,6 +79,7 @@ const nodePlugins = [ export default (command: Record): RollupOptions | RollupOptions[] => { const { collectLicenses, writeLicense } = getLicenseHandler(); const commonJSBuild: RollupOptions = { + external: ['fsevents'], input: { 'loadConfigFile.js': 'cli/run/loadConfigFile.ts', 'rollup.js': 'src/node-entry.ts' diff --git a/src/watch/fsevents-importer.ts b/src/watch/fsevents-importer.ts index 34e76ac5a90..7fda46c77b0 100644 --- a/src/watch/fsevents-importer.ts +++ b/src/watch/fsevents-importer.ts @@ -2,10 +2,8 @@ let fsEvents: unknown; let fsEventsImportError: Error | undefined; export async function loadFsEvents(): Promise { - const moduleName = 'fsevents'; - try { - ({ default: fsEvents } = await import(moduleName)); + ({ default: fsEvents } = await import('fsevents')); } catch (err: any) { fsEventsImportError = err; } From f413cb8ac8be3febc00f79c9749ff3c956e969ac Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 19 Jan 2022 19:56:53 -0500 Subject: [PATCH 05/14] fix: set interop to default --- rollup.config.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 7237b80b6f7..16a77fdc992 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -96,12 +96,7 @@ export default (command: Record): RollupOptions | RollupOptions format: 'cjs', freeze: false, generatedCode: 'es2015', - interop: id => { - if (id === 'fsevents') { - return 'defaultOnly'; - } - return 'default'; - }, + interop: 'default', manualChunks: { rollup: ['src/node-entry.ts'] }, sourcemap: true }, From 2ef6c5b3c567c273d9acbc0588f5de961206a69d Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 19 Jan 2022 20:15:25 -0500 Subject: [PATCH 06/14] Revert "fix: mark fsevents as external" This reverts commit 4a5fa733d4fb54d18bb5e7b738665638b467181f. --- rollup.config.ts | 1 - src/watch/fsevents-importer.ts | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 16a77fdc992..694f132663d 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -79,7 +79,6 @@ const nodePlugins = [ export default (command: Record): RollupOptions | RollupOptions[] => { const { collectLicenses, writeLicense } = getLicenseHandler(); const commonJSBuild: RollupOptions = { - external: ['fsevents'], input: { 'loadConfigFile.js': 'cli/run/loadConfigFile.ts', 'rollup.js': 'src/node-entry.ts' diff --git a/src/watch/fsevents-importer.ts b/src/watch/fsevents-importer.ts index 7fda46c77b0..34e76ac5a90 100644 --- a/src/watch/fsevents-importer.ts +++ b/src/watch/fsevents-importer.ts @@ -2,8 +2,10 @@ let fsEvents: unknown; let fsEventsImportError: Error | undefined; export async function loadFsEvents(): Promise { + const moduleName = 'fsevents'; + try { - ({ default: fsEvents } = await import('fsevents')); + ({ default: fsEvents } = await import(moduleName)); } catch (err: any) { fsEventsImportError = err; } From 668ef16fb211d638b79a212e6a94da022119ff15 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 19 Jan 2022 20:56:50 -0500 Subject: [PATCH 07/14] chore: bump chokidar --- package-lock.json | 62 +++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ef6a95cf8b..8b17afcc20c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,20 +20,20 @@ "dev": true }, "@babel/core": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz", - "integrity": "sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.10.tgz", + "integrity": "sha512-pbiIdZbCiMx/MM6toR+OfXarYix3uz0oVsnNtfdAGTcCTu3w/JGF8JhirevXLBJUu0WguSZI12qpKnx7EeMyLA==", "dev": true, "requires": { "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.16.7", + "@babel/generator": "^7.16.8", "@babel/helper-compilation-targets": "^7.16.7", "@babel/helper-module-transforms": "^7.16.7", "@babel/helpers": "^7.16.7", - "@babel/parser": "^7.16.7", + "@babel/parser": "^7.16.10", "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.7", - "@babel/types": "^7.16.7", + "@babel/traverse": "^7.16.10", + "@babel/types": "^7.16.8", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -215,9 +215,9 @@ } }, "@babel/highlight": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz", - "integrity": "sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz", + "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.16.7", @@ -226,9 +226,9 @@ } }, "@babel/parser": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", - "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.10.tgz", + "integrity": "sha512-Sm/S9Or6nN8uiFsQU1yodyDW3MWXQhFeqzMPM+t8MJjM+pLsnFVxFZzkpXKvUXh+Gz9cbMoYYs484+Jw/NTEFQ==", "dev": true }, "@babel/template": { @@ -243,9 +243,9 @@ } }, "@babel/traverse": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.8.tgz", - "integrity": "sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==", + "version": "7.16.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz", + "integrity": "sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==", "dev": true, "requires": { "@babel/code-frame": "^7.16.7", @@ -254,7 +254,7 @@ "@babel/helper-function-name": "^7.16.7", "@babel/helper-hoist-variables": "^7.16.7", "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.16.8", + "@babel/parser": "^7.16.10", "@babel/types": "^7.16.8", "debug": "^4.1.0", "globals": "^11.1.0" @@ -1134,9 +1134,9 @@ } }, "chokidar": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", - "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -1370,9 +1370,9 @@ } }, "electron-to-chromium": { - "version": "1.4.47", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.47.tgz", - "integrity": "sha512-ZHc8i3/cgeCRK/vC7W2htAG6JqUmOUgDNn/f9yY9J8UjfLjwzwOVEt4MWmgJAdvmxyrsR5KIFA/6+kUHGY0eUA==", + "version": "1.4.49", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz", + "integrity": "sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ==", "dev": true }, "emoji-regex": { @@ -3109,6 +3109,22 @@ "yargs-unparser": "2.0.0" }, "dependencies": { + "chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", diff --git a/package.json b/package.json index 886e688487f..8e3d0f92701 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", "buble": "^0.20.0", - "chokidar": "^3.5.2", + "chokidar": "^3.5.3", "colorette": "^2.0.16", "core-js": "^3.20.3", "date-time": "^4.0.0", From 36dc97b182be62fb5270899c1894b283b3b2d72e Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Wed, 19 Jan 2022 21:14:28 -0500 Subject: [PATCH 08/14] simplify alias plugin params --- rollup.config.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 694f132663d..34dc286ec6f 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -49,11 +49,11 @@ const onwarn: WarningHandlerWithDefault = warning => { }; const moduleAliases = { - entries: [ - { find: 'help.md', replacement: resolve('cli/help.md') }, - { find: 'package.json', replacement: resolve('package.json') }, - { find: 'acorn', replacement: resolve('node_modules/acorn/dist/acorn.mjs') } - ], + entries: { + acorn: resolve('node_modules/acorn/dist/acorn.mjs'), + 'help.md': resolve('cli/help.md'), + 'package.json': resolve('package.json') + }, resolve: ['.js', '.json', '.md'] }; From 64c0d06bfa92f90e4b6474be63f79ba1ebcf3d0b Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 12:28:16 -0500 Subject: [PATCH 09/14] Revert "Revert "fix: mark fsevents as external"" This reverts commit 2ef6c5b3c567c273d9acbc0588f5de961206a69d. --- rollup.config.ts | 1 + src/watch/fsevents-importer.ts | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index 34dc286ec6f..04d362f9276 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -79,6 +79,7 @@ const nodePlugins = [ export default (command: Record): RollupOptions | RollupOptions[] => { const { collectLicenses, writeLicense } = getLicenseHandler(); const commonJSBuild: RollupOptions = { + external: ['fsevents'], input: { 'loadConfigFile.js': 'cli/run/loadConfigFile.ts', 'rollup.js': 'src/node-entry.ts' diff --git a/src/watch/fsevents-importer.ts b/src/watch/fsevents-importer.ts index 34e76ac5a90..7fda46c77b0 100644 --- a/src/watch/fsevents-importer.ts +++ b/src/watch/fsevents-importer.ts @@ -2,10 +2,8 @@ let fsEvents: unknown; let fsEventsImportError: Error | undefined; export async function loadFsEvents(): Promise { - const moduleName = 'fsevents'; - try { - ({ default: fsEvents } = await import(moduleName)); + ({ default: fsEvents } = await import('fsevents')); } catch (err: any) { fsEventsImportError = err; } From 1a156d5174ee38dd5f92285ce42640beb4528a3f Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 13:39:46 -0500 Subject: [PATCH 10/14] add bogus types for fsevents --- build-plugins/conditional-fsevents-import.ts | 2 +- src/watch/fsevents-importer.ts | 6 ++++-- typings/fsevents.d.ts | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 typings/fsevents.d.ts diff --git a/build-plugins/conditional-fsevents-import.ts b/build-plugins/conditional-fsevents-import.ts index 5378269cf20..ba3f22ce639 100644 --- a/build-plugins/conditional-fsevents-import.ts +++ b/build-plugins/conditional-fsevents-import.ts @@ -1,5 +1,5 @@ import MagicString from 'magic-string'; -import { Plugin } from 'rollup'; +import type { Plugin } from 'rollup'; const FSEVENTS_REQUIRE = "require('fsevents')"; const REPLACEMENT = "require('../../../src/watch/fsevents-importer').getFsEvents()"; diff --git a/src/watch/fsevents-importer.ts b/src/watch/fsevents-importer.ts index 7fda46c77b0..fde4c2815e7 100644 --- a/src/watch/fsevents-importer.ts +++ b/src/watch/fsevents-importer.ts @@ -1,4 +1,6 @@ -let fsEvents: unknown; +import type FsEvents from 'fsevents'; + +let fsEvents: typeof FsEvents; let fsEventsImportError: Error | undefined; export async function loadFsEvents(): Promise { @@ -10,7 +12,7 @@ export async function loadFsEvents(): Promise { } // A call to this function will be injected into the chokidar code -export function getFsEvents(): unknown { +export function getFsEvents(): typeof FsEvents { if (fsEventsImportError) throw fsEventsImportError; return fsEvents; } diff --git a/typings/fsevents.d.ts b/typings/fsevents.d.ts new file mode 100644 index 00000000000..fe400f2c7cd --- /dev/null +++ b/typings/fsevents.d.ts @@ -0,0 +1,6 @@ +// 'fsevents' (which also has typings included) is an optional dependency installed on macOS, +// and not installed on linux/windows. this will provide (bogus) type information for +// linux/windows, and overwrite (replace) the types coming with the 'fsevents' module on macOS +declare module 'fsevents' { + export default {}; +} From 46fc2e8f509582d49e95efbfc7ca133b8f14f220 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 13:40:15 -0500 Subject: [PATCH 11/14] exclude fsevents from import linting --- .eslintrc.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 30e12eaa53a..4a501ad0045 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -73,7 +73,10 @@ module.exports = { 'dot-notation': 'error', 'import/no-unresolved': [ 'error', - { ignore: ['package.json', 'is-reference', 'help.md', 'types'] } + { + // 'fsevents' is ony available on macOS, and not installed on linux/windows + ignore: ['fsevents', 'help.md', 'is-reference', 'package.json', 'types'] + } ], 'import/order': ['error', { alphabetize: { order: 'asc' } }], 'no-constant-condition': ['error', { checkLoops: false }], From b1e7f71b786236958b3104a30f5dbedfe87b08fd Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 19:15:17 -0500 Subject: [PATCH 12/14] add back comment --- rollup.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/rollup.config.ts b/rollup.config.ts index 04d362f9276..d1f9371a3a0 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -79,6 +79,7 @@ const nodePlugins = [ export default (command: Record): RollupOptions | RollupOptions[] => { const { collectLicenses, writeLicense } = getLicenseHandler(); const commonJSBuild: RollupOptions = { + // 'fsevents' is a dependency of 'chokidar' that cannot be bundled as it contains binary code external: ['fsevents'], input: { 'loadConfigFile.js': 'cli/run/loadConfigFile.ts', From 7bf3aab3466260f3720bac145afdea90162bd36a Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 19:21:19 -0500 Subject: [PATCH 13/14] bump typescript --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b17afcc20c..3651b4a138c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4578,9 +4578,9 @@ } }, "typescript": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz", - "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", + "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index 8e3d0f92701..3337193c7fd 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "systemjs": "^6.11.0", "terser": "^5.10.0", "tslib": "^2.3.1", - "typescript": "^4.5.4", + "typescript": "^4.5.5", "weak-napi": "^2.0.2", "yargs-parser": "^20.2.9" }, From f58a3f7ea51697285ec9664710023a0caca15456 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Thu, 20 Jan 2022 19:21:55 -0500 Subject: [PATCH 14/14] re-use env var --- rollup.config.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rollup.config.ts b/rollup.config.ts index d1f9371a3a0..6be0690ae8f 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -25,9 +25,8 @@ const commitHash = (function () { } })(); -const now = new Date( - process.env.SOURCE_DATE_EPOCH ? 1000 * +process.env.SOURCE_DATE_EPOCH : Date.now() -).toUTCString(); +const { SOURCE_DATE_EPOCH } = process.env; +const now = new Date(SOURCE_DATE_EPOCH ? 1000 * +SOURCE_DATE_EPOCH : Date.now()).toUTCString(); const banner = `/* @license