From c2fb584f7e1e12d9844d483456c1d48ede837b55 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 31 Jul 2020 16:57:48 +0200 Subject: [PATCH] chore(commonjs): adapt to updated dependencies --- codecov.yml | 6 +- package.json | 2 +- packages/alias/package.json | 2 +- packages/auto-install/package.json | 6 +- packages/auto-install/test/npm-bare.js | 2 +- packages/auto-install/test/npm.js | 4 +- packages/auto-install/test/yarn-bare.js | 2 +- packages/auto-install/test/yarn.js | 2 +- packages/babel/package.json | 2 +- packages/beep/package.json | 2 +- packages/buble/package.json | 2 +- packages/commonjs/README.md | 60 ++++++++++-------- packages/commonjs/package.json | 2 +- .../main.js | 1 + .../dep.js | 4 +- .../function/transpiled-esm-default/main.js | 1 + .../function/transpiled-esm-mixed/main.js | 1 + .../function/transpiled-esm-named/main.js | 1 + .../transpiled-esm-namespace-default/main.js | 1 + .../transpiled-esm-namespace-mixed/main.js | 1 + .../transpiled-esm-namespace-named/main.js | 1 + .../commonjs/test/snapshots/function.js.md | 6 +- .../commonjs/test/snapshots/function.js.snap | Bin 11435 -> 11473 bytes packages/data-uri/package.json | 2 +- packages/dsv/package.json | 2 +- packages/dynamic-import-vars/package.json | 2 +- packages/html/package.json | 2 +- packages/image/package.json | 2 +- packages/inject/package.json | 2 +- packages/json/package.json | 2 +- packages/legacy/package.json | 2 +- packages/multi-entry/package.json | 2 +- packages/node-resolve/package.json | 2 +- packages/pluginutils/package.json | 2 +- packages/replace/package.json | 2 +- packages/run/package.json | 2 +- packages/run/src/index.ts | 2 +- packages/strip/package.json | 2 +- packages/sucrase/package.json | 2 +- packages/typescript/package.json | 2 +- packages/url/package.json | 2 +- packages/virtual/package.json | 2 +- packages/wasm/package.json | 2 +- packages/yaml/package.json | 2 +- pnpm-lock.yaml | 2 - pnpm-workspace.yaml | 2 +- 46 files changed, 84 insertions(+), 73 deletions(-) diff --git a/codecov.yml b/codecov.yml index f1b170aee..c26c3bd80 100644 --- a/codecov.yml +++ b/codecov.yml @@ -5,6 +5,6 @@ coverage: round: down range: 70...100 status: - project: 'no' - patch: 'yes' -comment: 'off' + project: "no" + patch: "yes" +comment: "off" diff --git a/package.json b/package.json index c4c53c253..3b818222b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "ci:lint": "node scripts/run-changed.js ci:lint", "ci:test": "node scripts/run-changed.js ci:test", "lint": "pnpm run lint:docs && npm run lint:json && pnpm run lint:package && node scripts/run-changed.js lint", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint scripts util", "lint:json": "prettier --write tsconfig.*.json codecov.yml pnpm-workspace.yaml", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", diff --git a/packages/alias/package.json b/packages/alias/package.json index e3fdc0b52..2224eaafd 100755 --- a/packages/alias/package.json +++ b/packages/alias/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/auto-install/package.json b/packages/auto-install/package.json index 287004fb1..94c4c018d 100755 --- a/packages/auto-install/package.json +++ b/packages/auto-install/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", @@ -54,9 +54,7 @@ }, "types": "types/index.d.ts", "ava": { - "babel": { - "compileEnhancements": false - }, + "babel": true, "extensions": [ "ts" ], diff --git a/packages/auto-install/test/npm-bare.js b/packages/auto-install/test/npm-bare.js index 101ddbd62..593082e90 100644 --- a/packages/auto-install/test/npm-bare.js +++ b/packages/auto-install/test/npm-bare.js @@ -15,7 +15,7 @@ const input = join(cwd, '../input.js'); process.chdir(cwd); test('npm, bare', async (t) => { - t.timeout(30000); + t.timeout(50000); await rollup({ input, output: { diff --git a/packages/auto-install/test/npm.js b/packages/auto-install/test/npm.js index b1e00c838..4b102c326 100644 --- a/packages/auto-install/test/npm.js +++ b/packages/auto-install/test/npm.js @@ -17,7 +17,7 @@ const pkgFile = join(cwd, 'package.json'); process.chdir(cwd); test('invalid manager', (t) => { - t.timeout(30000); + t.timeout(50000); const error = t.throws( () => rollup({ @@ -36,7 +36,7 @@ test('invalid manager', (t) => { }); test('npm', async (t) => { - t.timeout(30000); + t.timeout(50000); await rollup({ input, output: { diff --git a/packages/auto-install/test/yarn-bare.js b/packages/auto-install/test/yarn-bare.js index cfa913c02..6b991594e 100644 --- a/packages/auto-install/test/yarn-bare.js +++ b/packages/auto-install/test/yarn-bare.js @@ -15,7 +15,7 @@ const input = join(cwd, '../input.js'); process.chdir(cwd); test('yarn, bare', async (t) => { - t.timeout(30000); + t.timeout(50000); await rollup({ input, output: { diff --git a/packages/auto-install/test/yarn.js b/packages/auto-install/test/yarn.js index cbef6e1c4..70f86e23a 100644 --- a/packages/auto-install/test/yarn.js +++ b/packages/auto-install/test/yarn.js @@ -15,7 +15,7 @@ const input = join(cwd, '../input.js'); process.chdir(cwd); test('yarn', async (t) => { - t.timeout(30000); + t.timeout(50000); await rollup({ input, output: { diff --git a/packages/babel/package.json b/packages/babel/package.json index 36af9524b..f6796b2e3 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/beep/package.json b/packages/beep/package.json index a47c77006..4567045a7 100644 --- a/packages/beep/package.json +++ b/packages/beep/package.json @@ -20,7 +20,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "ava --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache lib test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "test": "ava" diff --git a/packages/buble/package.json b/packages/buble/package.json index bbdb4a5d9..ffc1b1a0b 100644 --- a/packages/buble/package.json +++ b/packages/buble/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/commonjs/README.md b/packages/commonjs/README.md index 4bcd9a9f0..1dd6f0723 100644 --- a/packages/commonjs/README.md +++ b/packages/commonjs/README.md @@ -34,9 +34,9 @@ export default { input: 'src/index.js', output: { dir: 'output', - format: 'cjs' + format: 'cjs', }, - plugins: [commonjs()] + plugins: [commonjs()], }; ``` @@ -66,8 +66,8 @@ commonjs({ '!node_modules/logform/index.js', '!node_modules/logform/format.js', '!node_modules/logform/levels.js', - '!node_modules/logform/browser.js' - ] + '!node_modules/logform/browser.js', + ], }); ``` @@ -157,7 +157,7 @@ import * as foo from 'foo'; ``` This is in line with how other bundlers handle this situation and is also the most likely behaviour in case Node should ever support this. However there are some situations where this may not be desired: - + - There is code in an external dependency that cannot be changed where a `require` statement expects the default export to be returned from an ES module. - If the imported module is in the same bundle, Rollup will generate a namespace object for the imported module which can increase bundle size unnecessarily: @@ -168,15 +168,15 @@ This is in line with how other bundlers handle this situation and is also the mo // input: dep.js export default 'foo'; - + // output var dep = 'foo'; - - var dep$1 = /*#__PURE__*/Object.freeze({ - __proto__: null, - 'default': dep + + var dep$1 = /*#__PURE__*/ Object.freeze({ + __proto__: null, + default: dep, }); - + console.log(dep$1.default); ``` @@ -191,22 +191,26 @@ For these situations, you can change Rollup's behaviour either globally or per m // output import * as dep from 'dep'; - + console.log(dep); ``` - + - `"auto"`: This is complementary to how [`output.exports`](https://rollupjs.org/guide/en/#outputexports): `"auto"` works in Rollup: If a module has a default export and no named exports, requiring that module returns the default export. In all other cases, the namespace is returned. For external dependencies when using `esmExternals: true`, a corresponding interop helper is added: ```js // output import * as dep$1 from 'dep'; - - function getDefaultExportFromNamespaceIfNotNamed (n) { - return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n; + + function getDefaultExportFromNamespaceIfNotNamed(n) { + return n && + Object.prototype.hasOwnProperty.call(n, 'default') && + Object.keys(n).length === 1 + ? n['default'] + : n; } - + var dep = getDefaultExportFromNamespaceIfNotNamed(dep$1); - + console.log(dep); ``` @@ -215,13 +219,15 @@ For these situations, you can change Rollup's behaviour either globally or per m ```js // output import * as dep$1 from 'dep'; - - function getDefaultExportFromNamespaceIfPresent (n) { - return n && Object.prototype.hasOwnProperty.call(n, 'default') ? n['default'] : n; + + function getDefaultExportFromNamespaceIfPresent(n) { + return n && Object.prototype.hasOwnProperty.call(n, 'default') + ? n['default'] + : n; } - + var dep = getDefaultExportFromNamespaceIfPresent(dep$1); - + console.log(dep); ``` @@ -230,7 +236,7 @@ For these situations, you can change Rollup's behaviour either globally or per m ```js // output import dep from 'dep'; - + console.log(dep); ``` @@ -250,9 +256,9 @@ export default { output: { file: 'bundle.js', format: 'iife', - name: 'MyModule' + name: 'MyModule', }, - plugins: [resolve(), commonjs()] + plugins: [resolve(), commonjs()], }; ``` @@ -262,7 +268,7 @@ Symlinks are common in monorepos and are also created by the `npm link` command. ```js commonjs({ - include: /node_modules/ + include: /node_modules/, }); ``` diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 64d3bc6dc..732e59496 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-true/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-true/main.js index ea9b75548..f1c7ad0b2 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-true/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-true/main.js @@ -1,6 +1,7 @@ const externalNamed = require('external-esm-named'); const externalMixed = require('external-esm-mixed'); const externalDefault = require('external-esm-default'); + const mixedExports = require('./mixed.js'); const defaultExport = require('./default.js'); diff --git a/packages/commonjs/test/fixtures/function/require-esm-with-namespace-named-default/dep.js b/packages/commonjs/test/fixtures/function/require-esm-with-namespace-named-default/dep.js index 67030509f..7f7fdd80d 100644 --- a/packages/commonjs/test/fixtures/function/require-esm-with-namespace-named-default/dep.js +++ b/packages/commonjs/test/fixtures/function/require-esm-with-namespace-named-default/dep.js @@ -1 +1,3 @@ -export * as default from './other.js'; +import * as other from './other.js'; + +export default other; diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-default/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-default/main.js index a6f175baf..69f88336d 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-default/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-default/main.js @@ -1,4 +1,5 @@ import external from 'external-esm-default'; + import dep from './dep'; t.is(dep, 'default'); diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-mixed/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-mixed/main.js index b944f13d2..7b84eb8b3 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-mixed/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-mixed/main.js @@ -1,4 +1,5 @@ import external, { foo } from 'external-esm-mixed'; + import dep, { named } from './dep'; t.is(dep, 'default'); diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-named/main.js index 8042383f7..f0586f566 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-named/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-named/main.js @@ -1,4 +1,5 @@ import { foo } from 'external-esm-named'; + import { named } from './dep'; t.is(named, 'named'); diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-default/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-default/main.js index e71369cbe..8263cb00a 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-default/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-default/main.js @@ -1,4 +1,5 @@ import * as external from 'external-esm-default'; + import * as dep from './dep'; t.deepEqual(dep, { diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-mixed/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-mixed/main.js index 0e871a653..75c7f8d8c 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-mixed/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-mixed/main.js @@ -1,4 +1,5 @@ import * as external from 'external-esm-mixed'; + import * as dep from './dep'; t.deepEqual(dep, { diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js index b14d3ded4..a275e5964 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js @@ -1,4 +1,5 @@ import * as external from 'external-esm-named'; + import * as dep from './dep'; t.deepEqual(dep, { diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index e70adf186..913a5d27c 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -2,7 +2,7 @@ The actual snapshot is saved in `function.js.snap`. -Generated by [AVA](https://ava.li). +Generated by [AVA](https://avajs.dev). ## assign-properties-to-default-export @@ -3917,13 +3917,13 @@ Generated by [AVA](https://ava.li). const foo = 'foo';␊ var other = 'bar';␊ ␊ - var dep = /*#__PURE__*/Object.freeze({␊ + var other$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ 'default': other␊ });␊ ␊ - t.deepEqual(dep, { default: 'bar', foo: 'foo' });␊ + t.deepEqual(other$1, { default: 'bar', foo: 'foo' });␊ ␊ var main = {␊ ␊ diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 82728dc87d48663b96bc9ea7c99eae41eff08981..244c8fc65e7054859ffb6c3c2c5fa2cf67c76c3c 100644 GIT binary patch literal 11473 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 z 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 literal 11435 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 J4fTP7{4Y|82M_=N diff --git a/packages/data-uri/package.json b/packages/data-uri/package.json index 0329bbc7c..1b7616180 100644 --- a/packages/data-uri/package.json +++ b/packages/data-uri/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/dsv/package.json b/packages/dsv/package.json index ba03ba82c..978627eeb 100755 --- a/packages/dsv/package.json +++ b/packages/dsv/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/dynamic-import-vars/package.json b/packages/dynamic-import-vars/package.json index d64a9eff0..8d59428a0 100644 --- a/packages/dynamic-import-vars/package.json +++ b/packages/dynamic-import-vars/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/html/package.json b/packages/html/package.json index 2695a87d7..54eaa5a9d 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -20,7 +20,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write *.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write *.md", "lint:js": "eslint --fix --cache lib test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prepublishOnly": "pnpm run lint", diff --git a/packages/image/package.json b/packages/image/package.json index 4dcd4e9eb..de33ad529 100644 --- a/packages/image/package.json +++ b/packages/image/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write *.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write *.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/inject/package.json b/packages/inject/package.json index 96b70c714..f951c9de1 100644 --- a/packages/inject/package.json +++ b/packages/inject/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/json/package.json b/packages/json/package.json index 6fb2c3c86..cc2032f2e 100755 --- a/packages/json/package.json +++ b/packages/json/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:json && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:json": "prettier --write \"test/fixtures/!(garbage)/*.json\"", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", diff --git a/packages/legacy/package.json b/packages/legacy/package.json index 33debfefe..504576b26 100644 --- a/packages/legacy/package.json +++ b/packages/legacy/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/multi-entry/package.json b/packages/multi-entry/package.json index 7d551ef00..5716dbce7 100755 --- a/packages/multi-entry/package.json +++ b/packages/multi-entry/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/node-resolve/package.json b/packages/node-resolve/package.json index 5bd97a8fe..b51e556b7 100644 --- a/packages/node-resolve/package.json +++ b/packages/node-resolve/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/pluginutils/package.json b/packages/pluginutils/package.json index 0093e27a6..ea06453cb 100644 --- a/packages/pluginutils/package.json +++ b/packages/pluginutils/package.json @@ -24,7 +24,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/replace/package.json b/packages/replace/package.json index b07a42fed..202cd946e 100644 --- a/packages/replace/package.json +++ b/packages/replace/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose && pnpm run test:ts", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/run/package.json b/packages/run/package.json index 61f9e861b..3df23985d 100644 --- a/packages/run/package.json +++ b/packages/run/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:json && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test types --ext .js,.ts", "lint:json": "prettier --write tsconfig.json", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", diff --git a/packages/run/src/index.ts b/packages/run/src/index.ts index 39f6806a0..20d9d018b 100644 --- a/packages/run/src/index.ts +++ b/packages/run/src/index.ts @@ -17,7 +17,7 @@ export default function run(opts: RollupRunOptions = {}): Plugin { name: 'run', buildStart(options) { - let inputs = options.input!; + let inputs = options.input; if (typeof inputs === 'string') { inputs = [inputs]; diff --git a/packages/strip/package.json b/packages/strip/package.json index 04f9f7e7e..04c8860c3 100644 --- a/packages/strip/package.json +++ b/packages/strip/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "pretest": "pnpm run build", diff --git a/packages/sucrase/package.json b/packages/sucrase/package.json index f41e198e2..424299f03 100644 --- a/packages/sucrase/package.json +++ b/packages/sucrase/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/typescript/package.json b/packages/typescript/package.json index 3b3e64d52..f255e8316 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose --serial", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:json && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:json": "prettier --write **/tsconfig.json", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", diff --git a/packages/url/package.json b/packages/url/package.json index 4e23ae948..5487714b0 100644 --- a/packages/url/package.json +++ b/packages/url/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/virtual/package.json b/packages/virtual/package.json index a1319a6bd..da8cabf62 100755 --- a/packages/virtual/package.json +++ b/packages/virtual/package.json @@ -19,7 +19,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/wasm/package.json b/packages/wasm/package.json index e8ee19f94..0ff060a36 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/packages/yaml/package.json b/packages/yaml/package.json index a9d6dba65..a53f06e75 100755 --- a/packages/yaml/package.json +++ b/packages/yaml/package.json @@ -22,7 +22,7 @@ "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}", "ci:test": "pnpm run test -- --verbose", "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package", - "lint:docs": "prettier --single-quote --arrow-parens avoid --write README.md", + "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md", "lint:js": "eslint --fix --cache src test --ext .js,.ts", "lint:package": "prettier --write package.json --plugin=prettier-plugin-package", "prebuild": "del-cli dist", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7baba2c32..07567329f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,7 +145,6 @@ importers: devDependencies: '@rollup/plugin-json': 4.1.0_rollup@2.23.0 '@rollup/plugin-node-resolve': 8.4.0_rollup@2.23.0 - acorn: 7.3.1 locate-character: 2.0.5 require-relative: 0.8.7 rollup: 2.23.0 @@ -157,7 +156,6 @@ importers: '@rollup/plugin-json': ^4.1.0 '@rollup/plugin-node-resolve': ^8.4.0 '@rollup/pluginutils': ^3.1.0 - acorn: ^7.3.1 commondir: ^1.0.1 estree-walker: ^2.0.1 glob: ^7.1.6 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 18ec407ef..dee51e928 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,2 @@ packages: - - 'packages/*' + - "packages/*"