Skip to content

Commit

Permalink
chore: use the new scope for Rollup 'official packages'
Browse files Browse the repository at this point in the history
  • Loading branch information
homer0 committed Dec 29, 2019
1 parent 6b50da6 commit d99a496
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 93 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"magic-string": "0.25.4",

"rollup": "^1.27.14",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"@rollup/plugin-commonjs": "^11.0.0",
"@rollup/plugin-node-resolve": "^6.0.0",
"rollup-plugin-terser": "^5.1.3",
"rollup-plugin-html": "0.2.1",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-replace": "^2.2.0",
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-replace": "^2.3.0",
"rollup-plugin-sass": "^1.2.2",
"rollup-pluginutils": "^2.8.2",
"rollup-plugin-visualizer": "^3.3.1",
Expand Down
16 changes: 8 additions & 8 deletions src/plugins/runtimeReplace/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const replace = require('rollup-plugin-replace');
const replace = require('@rollup/plugin-replace');
/**
* This is a Rollup plugin that works as a wrapper for `rollup-plugin-replace` in order to reload
* This is a Rollup plugin that works as a wrapper for `@rollup/plugin-replace` in order to reload
* all definitions when the bundle changes.
*/
class ProjextRollupRuntimeReplacePlugin {
Expand Down Expand Up @@ -36,7 +36,7 @@ class ProjextRollupRuntimeReplacePlugin {
*/
this._values = {};
/**
* The instance of the real `rollup-plugin-replace` this plugin will call on `transform`.
* The instance of the real `@rollup/plugin-replace` this plugin will call on `transform`.
* @type {Object}
* @access protected
* @ignore
Expand All @@ -45,7 +45,7 @@ class ProjextRollupRuntimeReplacePlugin {
/**
* This is a flag the plugin uses to avoid reload the definitions on the first build, since at
* that point, the definitions were already loaded in order to create the
* `rollup-plugin-replace` instance.
* `@rollup/plugin-replace` instance.
* @type {boolean}
* @access protected
* @ignore
Expand All @@ -64,7 +64,7 @@ class ProjextRollupRuntimeReplacePlugin {
* This is called when Rollup starts the building process; if it's not the first build, it will
* reload the definitions. The reason it doesn't load them on the first build it's because
* when the plugin is instantiated, the definitions are already loaded for the
* `rollup-plugin-replace` instance creation.
* `@rollup/plugin-replace` instance creation.
*/
buildStart() {
if (this._firstReload) {
Expand All @@ -75,10 +75,10 @@ class ProjextRollupRuntimeReplacePlugin {
}
/**
* This is called by Rollup when is parsing a file, and it just "forwards the call" to
* `rollup-plugin-replace`.
* `@rollup/plugin-replace`.
* @param {string} code The file contents.
* @param {string} filepath The file path.
* @return {*} Whatever `rollup-plugin-replace` returns.
* @return {*} Whatever `@rollup/plugin-replace` returns.
*/
transform(code, filepath) {
return this._replace.transform(code, filepath);
Expand All @@ -93,7 +93,7 @@ class ProjextRollupRuntimeReplacePlugin {
return this._values;
}
/**
* Creates an instance of `rollup-plugin-replace` using the definitions as options.
* Creates an instance of `@rollup/plugin-replace` using the definitions as options.
* @return {Object}
* @access protected
* @ignore
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

const { provider } = require('jimple');
Expand Down
6 changes: 3 additions & 3 deletions src/services/configurations/browserProductionConfiguration.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const { terser } = require('rollup-plugin-terser');
const visualizer = require('rollup-plugin-visualizer');

Expand Down
6 changes: 3 additions & 3 deletions src/services/configurations/nodeDevelopmentConfiguration.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

const { provider } = require('jimple');
Expand Down
6 changes: 3 additions & 3 deletions src/services/configurations/nodeProductionConfiguration.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

const { provider } = require('jimple');
Expand Down
4 changes: 2 additions & 2 deletions tests/plugins/runtimeReplace/index.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
jest.mock('rollup-plugin-replace');
jest.mock('@rollup/plugin-replace');
jest.unmock('/src/plugins/runtimeReplace');

require('jasmine-expect');
const replace = require('rollup-plugin-replace');
const replace = require('@rollup/plugin-replace');
const {
ProjextRollupRuntimeReplacePlugin,
runtimeReplace,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const ConfigurationFileMock = require('/tests/mocks/configurationFile.mock');

jest.mock('jimple', () => JimpleMock);
jest.mock('fs-extra');
jest.mock('rollup-plugin-node-resolve');
jest.mock('@rollup/plugin-node-resolve');
jest.mock('rollup-plugin-babel');
jest.mock('rollup-plugin-commonjs');
jest.mock('@rollup/plugin-commonjs');
jest.mock('rollup-plugin-sass');
jest.mock('rollup-plugin-html');
jest.mock('rollup-plugin-json');
jest.mock('@rollup/plugin-json');
jest.mock('rollup-plugin-visualizer');
jest.mock('/src/abstracts/configurationFile', () => ConfigurationFileMock);
jest.unmock('/src/services/configurations/browserDevelopmentConfiguration');
Expand All @@ -32,12 +32,12 @@ const {
urls,
windowAsGlobal,
} = require('/src/plugins');
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

describe('services/configurations:browserDevelopmentConfiguration', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const ConfigurationFileMock = require('/tests/mocks/configurationFile.mock');

jest.mock('jimple', () => JimpleMock);
jest.mock('fs-extra');
jest.mock('rollup-plugin-node-resolve');
jest.mock('@rollup/plugin-node-resolve');
jest.mock('rollup-plugin-babel');
jest.mock('rollup-plugin-commonjs');
jest.mock('@rollup/plugin-commonjs');
jest.mock('rollup-plugin-sass');
jest.mock('rollup-plugin-html');
jest.mock('rollup-plugin-json');
jest.mock('@rollup/plugin-json');
jest.mock('rollup-plugin-visualizer');
jest.mock('rollup-plugin-terser');
jest.mock('/src/abstracts/configurationFile', () => ConfigurationFileMock);
Expand All @@ -33,12 +33,12 @@ const {
urls,
windowAsGlobal,
} = require('/src/plugins');
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');
const { terser } = require('rollup-plugin-terser');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const ConfigurationFileMock = require('/tests/mocks/configurationFile.mock');

jest.mock('jimple', () => JimpleMock);
jest.mock('fs-extra');
jest.mock('rollup-plugin-node-resolve');
jest.mock('@rollup/plugin-node-resolve');
jest.mock('rollup-plugin-babel');
jest.mock('rollup-plugin-commonjs');
jest.mock('@rollup/plugin-commonjs');
jest.mock('rollup-plugin-sass');
jest.mock('rollup-plugin-html');
jest.mock('rollup-plugin-json');
jest.mock('@rollup/plugin-json');
jest.mock('rollup-plugin-visualizer');
jest.mock('/src/abstracts/configurationFile', () => ConfigurationFileMock);
jest.unmock('/src/services/configurations/nodeDevelopmentConfiguration');
Expand All @@ -28,12 +28,12 @@ const {
stylesheetAssets,
urls,
} = require('/src/plugins');
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

describe('services/configurations:nodeDevelopmentConfiguration', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const ConfigurationFileMock = require('/tests/mocks/configurationFile.mock');

jest.mock('jimple', () => JimpleMock);
jest.mock('fs-extra');
jest.mock('rollup-plugin-node-resolve');
jest.mock('@rollup/plugin-node-resolve');
jest.mock('rollup-plugin-babel');
jest.mock('rollup-plugin-commonjs');
jest.mock('@rollup/plugin-commonjs');
jest.mock('rollup-plugin-sass');
jest.mock('rollup-plugin-html');
jest.mock('rollup-plugin-json');
jest.mock('@rollup/plugin-json');
jest.mock('rollup-plugin-visualizer');
jest.mock('/src/abstracts/configurationFile', () => ConfigurationFileMock);
jest.unmock('/src/services/configurations/nodeProductionConfiguration');
Expand All @@ -27,12 +27,12 @@ const {
stats,
urls,
} = require('/src/plugins');
const resolve = require('rollup-plugin-node-resolve');
const resolve = require('@rollup/plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const sass = require('rollup-plugin-sass');
const html = require('rollup-plugin-html');
const json = require('rollup-plugin-json');
const json = require('@rollup/plugin-json');
const visualizer = require('rollup-plugin-visualizer');

describe('services/configurations:nodeProductionConfiguration', () => {
Expand Down

0 comments on commit d99a496

Please sign in to comment.