Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = {
"body-leading-blank": [1, "always"],
"footer-leading-blank": [1, "always"],
"header-max-length": [2, "always", 80],
lang: [0, "always", "eng"],
"scope-case": [2, "always", "lowerCase"],
"scope-empty": [0, "never"],
"subject-case": [2, "never", ["sentence-case", "start-case", "pascal-case", "upper-case"]],
Expand Down
8 changes: 5 additions & 3 deletions packages/migrate/bannerPlugin/__tests__/bannerPlugin.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

defineTest(join(__dirname, ".."), "bannerPlugin", "bannerPlugin-0");
defineTest(join(__dirname, ".."), "bannerPlugin", "bannerPlugin-1");
defineTest(join(__dirname, ".."), "bannerPlugin", "bannerPlugin-2");
const dirName: string = join(__dirname, "..");

defineTest(dirName, "bannerPlugin", "bannerPlugin-0");
defineTest(dirName, "bannerPlugin", "bannerPlugin-1");
defineTest(dirName, "bannerPlugin", "bannerPlugin-2");
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-0");
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-1");
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-2");
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-3");
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-4");
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-5");
const dirName: string = join(__dirname, "..");

defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-0");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-1");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-2");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-3");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-4");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-5");
defineTest(
join(__dirname, ".."),
dirName,
"commonsChunkPlugin",
"commonsChunkPlugin-6a",
);
defineTest(
join(__dirname, ".."),
dirName,
"commonsChunkPlugin",
"commonsChunkPlugin-6b",
);
defineTest(
join(__dirname, ".."),
dirName,
"commonsChunkPlugin",
"commonsChunkPlugin-6c",
);
defineTest(
join(__dirname, ".."),
dirName,
"commonsChunkPlugin",
"commonsChunkPlugin-6d",
);
defineTest(join(__dirname, ".."), "commonsChunkPlugin", "commonsChunkPlugin-7");
defineTest(dirName, "commonsChunkPlugin", "commonsChunkPlugin-7");
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

defineTest(join(__dirname, ".."), "extractTextPlugin");
const dirName: string = join(__dirname, "..");
defineTest(dirName, "extractTextPlugin");
2 changes: 1 addition & 1 deletion packages/migrate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ declare var process: {
webpackModule: {
validate: Function;
WebpackOptionsValidationError: {
new(errors: string[]): {
new: (errors: string[]) => {
message: string;
};
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

const dirName: string = join(__dirname, "..");

defineTest(
join(__dirname, ".."),
dirName,
"loaderOptionsPlugin",
"loaderOptionsPlugin-0",
);
defineTest(
join(__dirname, ".."),
dirName,
"loaderOptionsPlugin",
"loaderOptionsPlugin-1",
);
defineTest(
join(__dirname, ".."),
dirName,
"loaderOptionsPlugin",
"loaderOptionsPlugin-2",
);
defineTest(
join(__dirname, ".."),
dirName,
"loaderOptionsPlugin",
"loaderOptionsPlugin-3",
);
20 changes: 11 additions & 9 deletions packages/migrate/loaders/__tests__/loaders.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

defineTest(join(__dirname, ".."), "loaders", "loaders-0");
defineTest(join(__dirname, ".."), "loaders", "loaders-1");
defineTest(join(__dirname, ".."), "loaders", "loaders-2");
defineTest(join(__dirname, ".."), "loaders", "loaders-3");
defineTest(join(__dirname, ".."), "loaders", "loaders-4");
defineTest(join(__dirname, ".."), "loaders", "loaders-5");
defineTest(join(__dirname, ".."), "loaders", "loaders-6");
defineTest(join(__dirname, ".."), "loaders", "loaders-7");
defineTest(join(__dirname, ".."), "loaders", "loaders-8");
const dirName: string = join(__dirname, "..");

defineTest(dirName, "loaders", "loaders-0");
defineTest(dirName, "loaders", "loaders-1");
defineTest(dirName, "loaders", "loaders-2");
defineTest(dirName, "loaders", "loaders-3");
defineTest(dirName, "loaders", "loaders-4");
defineTest(dirName, "loaders", "loaders-5");
defineTest(dirName, "loaders", "loaders-6");
defineTest(dirName, "loaders", "loaders-7");
defineTest(dirName, "loaders", "loaders-8");
17 changes: 15 additions & 2 deletions packages/migrate/migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,25 @@ const transformsObject: ITransformsObject = {
removeDeprecatedPluginsTransform,
commonsChunkPluginTransform,
};

interface ILazyTransformObject {
loadersTransform?: (ast: object, source: string) => pLazy<{}>;
resolveTransform?: (ast: object, source: string) => pLazy<{}>;
removeJsonLoaderTransform?: (ast: object, source: string) => pLazy<{}>;
uglifyJsPluginTransform?: (ast: object, source: string) => pLazy<{}>;
loaderOptionsPluginTransform?: (ast: object, source: string) => pLazy<{}>;
bannerPluginTransform?: (ast: object, source: string) => pLazy<{}>;
extractTextPluginTransform?: (ast: object, source: string) => pLazy<{}>;
noEmitOnErrorsPluginTransform?: (ast: object, source: string) => pLazy<{}>;
removeDeprecatedPluginsTransform?: (ast: object, source: string) => pLazy<{}>;
commonsChunkPluginTransform?: (ast: object, source: string) => pLazy<{}>;
}
/* tslint:enable object-literal-sort-keys */

export const transformations: any =
export const transformations: ILazyTransformObject =
Object
.keys(transformsObject)
.reduce((res: object, key: string): object => {
.reduce((res: object, key: string): ILazyTransformObject => {
res[key] = (ast: object, source: string) =>
transformSingleAST(ast, source, transformsObject[key]);
return res;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

const dirName: string = join(__dirname, "..");

defineTest(
join(__dirname, ".."),
dirName,
"moduleConcatenationPlugin",
"moduleConcatenationPlugin-0",
);
defineTest(
join(__dirname, ".."),
dirName,
"moduleConcatenationPlugin",
"moduleConcatenationPlugin-1",
);
defineTest(
join(__dirname, ".."),
dirName,
"moduleConcatenationPlugin",
"moduleConcatenationPlugin-2",
);
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";
defineTest(join(__dirname, ".."), "namedModulesPlugin", "namedModulesPlugin-0");
defineTest(join(__dirname, ".."), "namedModulesPlugin", "namedModulesPlugin-1");
defineTest(join(__dirname, ".."), "namedModulesPlugin", "namedModulesPlugin-2");

const dirName: string = join(__dirname, "..");

defineTest(dirName, "namedModulesPlugin", "namedModulesPlugin-0");
defineTest(dirName, "namedModulesPlugin", "namedModulesPlugin-1");
defineTest(dirName, "namedModulesPlugin", "namedModulesPlugin-2");
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

const dirName: string = join(__dirname, "..");

defineTest(
join(__dirname, ".."),
dirName,
"noEmitOnErrorsPlugin",
"noEmitOnErrorsPlugin-0",
);
defineTest(
join(__dirname, ".."),
dirName,
"noEmitOnErrorsPlugin",
"noEmitOnErrorsPlugin-1",
);
defineTest(
join(__dirname, ".."),
dirName,
"noEmitOnErrorsPlugin",
"noEmitOnErrorsPlugin-2",
);
8 changes: 5 additions & 3 deletions packages/migrate/outputPath/__tests__/outputPath.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

defineTest(join(__dirname, ".."), "outputPath", "outputPath-0");
defineTest(join(__dirname, ".."), "outputPath", "outputPath-1");
defineTest(join(__dirname, ".."), "outputPath", "outputPath-2");
const dirName: string = join(__dirname, "..");

defineTest(dirName, "outputPath", "outputPath-0");
defineTest(dirName, "outputPath", "outputPath-1");
defineTest(dirName, "outputPath", "outputPath-2");
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";

const dirName: string = join(__dirname, "..");

defineTest(
join(__dirname, ".."),
dirName,
"removeDeprecatedPlugins",
"removeDeprecatedPlugins-0",
);
defineTest(
join(__dirname, ".."),
dirName,
"removeDeprecatedPlugins",
"removeDeprecatedPlugins-1",
);
defineTest(
join(__dirname, ".."),
dirName,
"removeDeprecatedPlugins",
"removeDeprecatedPlugins-2",
);
defineTest(
join(__dirname, ".."),
dirName,
"removeDeprecatedPlugins",
"removeDeprecatedPlugins-3",
);
defineTest(
join(__dirname, ".."),
dirName,
"removeDeprecatedPlugins",
"removeDeprecatedPlugins-4",
);
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
import defineTest from "@webpack-cli/utils/defineTest";
import * as path from "path";
import { join } from "path";

const dirName: string = join(__dirname, "..");

defineTest(
path.join(__dirname, ".."),
dirName,
"removeJsonLoader",
"removeJsonLoader-0",
);
defineTest(
path.join(__dirname, ".."),
dirName,
"removeJsonLoader",
"removeJsonLoader-1",
);
defineTest(
path.join(__dirname, ".."),
dirName,
"removeJsonLoader",
"removeJsonLoader-2",
);
defineTest(
path.join(__dirname, ".."),
dirName,
"removeJsonLoader",
"removeJsonLoader-3",
);
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`resolve transforms correctly 1`] = `
"const path = require(\\"patch\\");
"const path = require(\\"path\\");
const rootPath = path.resolve(\\"/src\\");
module.exports = [
{
resolve: {
modules: [path.resolve(\\"/src\\")]
modules: [rootPath]
}
},
{
resolve: {
modules: [path.resolve(\\"/src\\")]
modules: [rootPath]
}
},
{
resolve: {
modules: [path.resolve(\\"/src\\"), \\"node_modules\\"]
modules: [rootPath, \\"node_modules\\"]
}
},
{
resolve: {
modules: [\\"node_modules\\", path.resolve(\\"/src\\")]
modules: [\\"node_modules\\", rootPath]
}
}
];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
const path = require("patch");
const path = require("path");
const rootPath = path.resolve("/src");
module.exports = [
{
resolve: {
root: path.resolve("/src")
root: rootPath
}
},
{
resolve: {
root: [path.resolve("/src")]
root: [rootPath]
}
},
{
resolve: {
root: [path.resolve("/src"), "node_modules"]
root: [rootPath, "node_modules"]
}
},
{
resolve: {
modules: ["node_modules"],
root: path.resolve("/src")
root: rootPath
}
}
];
5 changes: 3 additions & 2 deletions packages/migrate/resolve/__tests__/resolve.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import defineTest from "@webpack-cli/utils/defineTest";
import * as path from "path";
import { join } from "path";

defineTest(path.join(__dirname, ".."), "resolve");
const dirName: string = join(__dirname, "..");
defineTest(dirName, "resolve");
13 changes: 8 additions & 5 deletions packages/migrate/uglifyJsPlugin/__tests__/uglifyJsPlugin.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import defineTest from "@webpack-cli/utils/defineTest";
import { join } from "path";
defineTest(join(__dirname, ".."), "uglifyJsPlugin", "uglifyJsPlugin-0");
defineTest(join(__dirname, ".."), "uglifyJsPlugin", "uglifyJsPlugin-1");
defineTest(join(__dirname, ".."), "uglifyJsPlugin", "uglifyJsPlugin-2");
defineTest(join(__dirname, ".."), "uglifyJsPlugin", "uglifyJsPlugin-3");
defineTest(join(__dirname, ".."), "uglifyJsPlugin", "uglifyJsPlugin-4");

const dirName: string = join(__dirname, "..");

defineTest(dirName, "uglifyJsPlugin", "uglifyJsPlugin-0");
defineTest(dirName, "uglifyJsPlugin", "uglifyJsPlugin-1");
defineTest(dirName, "uglifyJsPlugin", "uglifyJsPlugin-2");
defineTest(dirName, "uglifyJsPlugin", "uglifyJsPlugin-3");
defineTest(dirName, "uglifyJsPlugin", "uglifyJsPlugin-4");
2 changes: 1 addition & 1 deletion packages/utils/__tests__/ast-utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ const a = { plugs: [] }

const root = ast.find(j.ObjectExpression);

utils.findRootNodesByName(j, root, "entry").forEach((p) => {
utils.findRootNodesByName(j, root, "entry").forEach((p: INode) => {
j(p).replaceWith(utils.addProperty(j, p, "entry", propertyValue, "add"));
});

Expand Down