Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate rollup deprecated plugins to the new ones #3930

Merged
merged 5 commits into from Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages-exp/app-compat/package.json
Expand Up @@ -38,7 +38,7 @@
},
"devDependencies": {
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-typescript2": "0.27.3",
"typescript": "4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/app-compat/rollup.config.js
Expand Up @@ -16,7 +16,7 @@
*/

import typescriptPlugin from 'rollup-plugin-typescript2';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescript from 'typescript';
import pkg from './package.json';

Expand Down
2 changes: 1 addition & 1 deletion packages-exp/app-compat/rollup.config.release.js
Expand Up @@ -16,7 +16,7 @@
*/

import typescriptPlugin from 'rollup-plugin-typescript2';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescript from 'typescript';
import pkg from './package.json';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/app-exp/package.json
Expand Up @@ -39,7 +39,7 @@
"license": "Apache-2.0",
"devDependencies": {
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-typescript2": "0.27.3",
"typescript": "4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/app-exp/rollup.config.js
Expand Up @@ -17,7 +17,7 @@

import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import pkg from './package.json';
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';

Expand Down
2 changes: 1 addition & 1 deletion packages-exp/app-exp/rollup.config.release.js
Expand Up @@ -17,7 +17,7 @@

import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';

Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-compat-exp/demo/package.json
Expand Up @@ -27,11 +27,11 @@
"license": "Apache-2.0",
"devDependencies": {
"rollup": "1.32.1",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-commonjs": "10.1.0",
"@rollup/plugin-commonjs": "15.1.0",
"rollup-plugin-license": "0.14.0",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-node-resolve": "9.0.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-typescript2": "0.27.3",
"rollup-plugin-uglify": "6.0.4",
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/auth-compat-exp/demo/rollup.config.js
Expand Up @@ -15,9 +15,9 @@
* limitations under the License.
*/

import commonjs from 'rollup-plugin-commonjs';
import json from 'rollup-plugin-json';
import resolveModule from 'rollup-plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import resolveModule from '@rollup/plugin-node-resolve';
import sourcemaps from 'rollup-plugin-sourcemaps';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/auth-compat-exp/package.json
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"@firebase/app-compat": "0.x",
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-typescript2": "0.27.3",
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions packages-exp/auth-compat-exp/rollup.config.js
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import resolve from 'rollup-plugin-node-resolve';
import json from '@rollup/plugin-json';
import resolve from '@rollup/plugin-node-resolve';
import { uglify } from 'rollup-plugin-uglify';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
Expand Down
4 changes: 2 additions & 2 deletions packages-exp/auth-exp/demo/package.json
Expand Up @@ -28,12 +28,12 @@
"devDependencies": {
"@rollup/plugin-strip": "2.0.0",
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-terser": "6.1.0",
"rollup-plugin-typescript2": "0.27.3",
"rollup-plugin-uglify": "6.0.4",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-node-resolve": "9.0.0",
"lerna": "3.22.1"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/auth-exp/package.json
Expand Up @@ -51,7 +51,7 @@
"devDependencies": {
"@firebase/app-exp": "0.0.800",
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-typescript2": "0.27.3",
"@rollup/plugin-strip": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/auth-exp/rollup.config.shared.js
Expand Up @@ -17,7 +17,7 @@

import strip from '@rollup/plugin-strip';
import typescriptPlugin from 'rollup-plugin-typescript2';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescript from 'typescript';
import pkg from './package.json';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/firebase-exp/compat/rollup.config.js
Expand Up @@ -16,14 +16,14 @@
*/

import { resolve } from 'path';
import resolveModule from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import resolveModule from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import sourcemaps from 'rollup-plugin-sourcemaps';
import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { uglify } from 'rollup-plugin-uglify';
import { terser } from 'rollup-plugin-terser';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import pkg from '../package.json';
import compatPkg from './package.json';
import appPkg from './app/package.json';
Expand Down
Expand Up @@ -19,7 +19,7 @@ import { resolve } from 'path';
import sourcemaps from 'rollup-plugin-sourcemaps';
import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import pkg from '../package.json';
import compatPkg from './package.json';
import appPkg from './app/package.json';
Expand Down
4 changes: 2 additions & 2 deletions packages-exp/firebase-exp/package.json
Expand Up @@ -45,9 +45,9 @@
},
"devDependencies": {
"rollup": "2.29.0",
"rollup-plugin-commonjs": "10.1.0",
"@rollup/plugin-commonjs": "15.1.0",
"rollup-plugin-license": "2.2.0",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-node-resolve": "9.0.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"rollup-plugin-typescript2": "0.27.3",
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/firebase-exp/rollup.config.js
Expand Up @@ -16,13 +16,13 @@
*/

import { resolve } from 'path';
import resolveModule from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import resolveModule from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import sourcemaps from 'rollup-plugin-sourcemaps';
import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { uglify } from 'rollup-plugin-uglify';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import pkg from './package.json';
import appPkg from './app/package.json';

Expand Down
6 changes: 3 additions & 3 deletions packages-exp/firebase-exp/rollup.config.release.js
Expand Up @@ -16,14 +16,14 @@
*/

import { resolve } from 'path';
import resolveModule from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import resolveModule from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import sourcemaps from 'rollup-plugin-sourcemaps';
import rollupTypescriptPlugin from 'rollup-plugin-typescript2';
import alias from '@rollup/plugin-alias';
import typescript from 'typescript';
import { uglify } from 'rollup-plugin-uglify';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
import pkg from './package.json';
import appPkg from './app/package.json';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/functions-exp/rollup.config.js
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/functions-exp/rollup.config.release.js
Expand Up @@ -17,7 +17,7 @@

import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';

Expand Down
6 changes: 3 additions & 3 deletions packages-exp/installations-exp/package.json
Expand Up @@ -42,9 +42,9 @@
"devDependencies": {
"@firebase/app-exp": "0.0.800",
"rollup": "2.29.0",
"rollup-plugin-commonjs": "10.1.0",
"rollup-plugin-json": "4.0.0",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-commonjs": "15.1.0",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "9.0.0",
"rollup-plugin-typescript2": "0.27.3",
"rollup-plugin-uglify": "6.0.4",
"typescript": "4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/installations-exp/rollup.config.js
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { es2017BuildsNoPlugin, es5BuildsNoPlugin } from './rollup.shared';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/installations-exp/rollup.config.release.js
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
Expand Down
6 changes: 3 additions & 3 deletions packages-exp/installations-exp/test-app/rollup.config.js
Expand Up @@ -16,9 +16,9 @@
*/

import typescriptPlugin from 'rollup-plugin-typescript2';
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import json from 'rollup-plugin-json';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import { uglify } from 'rollup-plugin-uglify';
import typescript from 'typescript';

Expand Down
2 changes: 1 addition & 1 deletion packages-exp/performance-exp/package.json
Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@firebase/app-exp": "0.0.800",
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-typescript2": "0.27.3",
"typescript": "4.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/performance-exp/rollup.config.js
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import pkg from './package.json';
Expand Down
2 changes: 1 addition & 1 deletion packages-exp/performance-exp/rollup.config.release.js
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import { importPathTransformer } from '../../scripts/exp/ts-transform-import-path';
Expand Down
7 changes: 3 additions & 4 deletions packages/analytics/package.json
Expand Up @@ -36,11 +36,10 @@
"devDependencies": {
"@firebase/app": "0.6.11",
"rollup": "2.29.0",
"rollup-plugin-commonjs": "10.1.0",
"rollup-plugin-json": "4.0.0",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-commonjs": "15.1.0",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "9.0.0",
"rollup-plugin-typescript2": "0.27.3",
"rollup-plugin-uglify": "6.0.4",
"typescript": "4.0.2"
},
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/rollup.config.js
@@ -1,6 +1,6 @@
/**
* @license
* Copyright 2019 Google Inc.
* Copyright 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import pkg from './package.json';
Expand Down
4 changes: 2 additions & 2 deletions packages/app/index.ts
Expand Up @@ -58,9 +58,9 @@ firebaseNamespace.initializeApp = function (...args: any) {
"resolve.mainFields":
https://webpack.js.org/configuration/resolve/#resolvemainfields

If using Rollup, use the rollup-plugin-node-resolve plugin and specify "main"
If using Rollup, use the @rollup/plugin-node-resolve plugin and specify "main"
as the first item in "mainFields", e.g. ['main', 'module'].
https://github.com/rollup/rollup-plugin-node-resolve
https://github.com/rollup/@rollup/plugin-node-resolve
`);
}
return initializeApp.apply(undefined, args);
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Expand Up @@ -37,7 +37,7 @@
},
"devDependencies": {
"rollup": "2.29.0",
"rollup-plugin-json": "4.0.0",
"@rollup/plugin-json": "4.1.0",
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-typescript2": "0.27.3",
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/app/rollup.config.js
@@ -1,6 +1,6 @@
/**
* @license
* Copyright 2018 Google Inc.
* Copyright 2018 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,7 @@
*/

import typescriptPlugin from 'rollup-plugin-typescript2';
import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescript from 'typescript';
import pkg from './package.json';

Expand Down
4 changes: 2 additions & 2 deletions packages/database/rollup.config.js
@@ -1,6 +1,6 @@
/**
* @license
* Copyright 2018 Google Inc.
* Copyright 2018 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
* limitations under the License.
*/

import json from 'rollup-plugin-json';
import json from '@rollup/plugin-json';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import pkg from './package.json';
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase/package.json
Expand Up @@ -62,9 +62,9 @@
},
"devDependencies": {
"rollup": "2.29.0",
"rollup-plugin-commonjs": "10.1.0",
"@rollup/plugin-commonjs": "15.1.0",
"rollup-plugin-license": "2.2.0",
"rollup-plugin-node-resolve": "5.2.0",
"@rollup/plugin-node-resolve": "9.0.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"rollup-plugin-typescript2": "0.27.3",
Expand Down