Merge branch 'develop'

.github/workflows/build.yml

@@ -10,17 +10,22 @@ on:
 
 jobs:
   build:
-    name: Verify build and tests
-    runs-on: ubuntu-latest
+    name: Build and test using node ${{ matrix.node }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        node: [10, 12]
+        os: [ubuntu-latest, macos-latest]
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
-      - name: Setup Node.js v10.x
+      - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: ${{ matrix.node }}
           registry-url: https://npm.pkg.github.com/
           scope: '@aem-design'
         env:

README.md

@@ -6,7 +6,6 @@
 <br>
 
 [![build][build]][build-url]
-[![travis ci][travis]][travis-url]
 [![npm][npm]][npm-url]
 [![node][node]][node-url]
 [![deps][deps]][deps-url]
@@ -53,9 +52,6 @@ Contributions are welcome! Read the [Contributing Guide](CONTRIBUTING.md) for mo
 [build]: https://github.com/aem-design/npm-compose-webpack/workflows/Build/badge.svg
 [build-url]: https://github.com/aem-design/npm-compose-webpack/actions?workflow=Build
 
-[travis]: https://travis-ci.com/aem-design/npm-compose-webpack.svg?branch=develop
-[travis-url]: https://travis-ci.com/aem-design/npm-compose-webpack
-
 [npm]: https://img.shields.io/npm/v/@aem-design/compose-webpack.svg
 [npm-url]: https://npmjs.com/package/@aem-design/compose-webpack
 

package.json

@@ -2,7 +2,7 @@
   "author": "Chris Shaw <[email protected]>",
   "description": "Webpack configuration and helpers for the AEM.Design compose module",
   "engines": {
-    "node": ">= 10.13.x",
+    "node": ">= 10.13.x < 13.x",
     "yarn": ">= 1.10.x < 2.x"
   },
   "bin": {
@@ -72,86 +72,86 @@
   "dependencies": {
     "@aem-design/compose-support": "1.2.1",
     "@babel/code-frame": "^7.10.4",
-    "@babel/core": "^7.11.1",
+    "@babel/core": "^7.11.6",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.10.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-regenerator": "^7.10.4",
-    "@babel/plugin-transform-runtime": "^7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/register": "^7.10.5",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/register": "^7.11.5",
     "@babel/runtime": "^7.11.2",
     "@babel/runtime-corejs3": "^7.11.2",
     "@types/babel__code-frame": "^7.0.1",
     "@types/copy-webpack-plugin": "^6.0.0",
     "@types/figlet": "^1.2.0",
-    "@types/jest": "^26.0.9",
-    "@types/lodash": "^4.14.159",
+    "@types/jest": "^26.0.14",
+    "@types/lodash": "^4.14.161",
     "@types/mini-css-extract-plugin": "^0.9.1",
-    "@types/node": "^14.0.27",
+    "@types/node": "^14.11.2",
     "@types/optimize-css-assets-webpack-plugin": "^5.0.1",
     "@types/rimraf": "^3.0.0",
     "@types/sass": "^1.16.0",
     "@types/stylelint-webpack-plugin": "^2.1.0",
-    "@types/terser-webpack-plugin": "^4.0.0",
-    "@types/webpack": "^4.41.21",
+    "@types/terser-webpack-plugin": "^4.2.0",
+    "@types/webpack": "^4.41.22",
     "@types/webpack-bundle-analyzer": "^3.8.0",
     "@types/webpack-config-utils": "^2.3.1",
     "@types/webpack-dev-server": "^3.11.0",
-    "@types/webpack-env": "^1.15.2",
+    "@types/webpack-env": "^1.15.3",
     "@types/webpack-merge": "^4.1.5",
     "@types/xml2js": "^0.4.5",
     "babel-loader": "^8.1.0",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-module-resolver": "^4.0.0",
     "chalk": "^4.1.0",
     "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "^4.2.1",
+    "copy-webpack-plugin": "^6.1.1",
+    "css-loader": "^4.3.0",
     "cssnano": "^4.1.10",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-jest": "^23.20.0",
     "eslint-webpack-plugin": "^2.1.0",
     "exports-loader": "^1.1.0",
     "extract-loader": "^5.1.0",
     "figlet": "^1.5.0",
-    "file-loader": "^6.0.0",
+    "file-loader": "^6.1.0",
     "imports-loader": "^1.1.0",
-    "jest": "^26.2.2",
+    "jest": "^26.4.2",
     "jest-fetch-mock": "^3.0.3",
     "jest-mock-console": "^1.0.1",
     "jest-mock-process": "^1.4.0",
-    "lodash": "^4.17.19",
-    "mini-css-extract-plugin": "^0.9.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "postcss-loader": "^3.0.0",
+    "lodash": "^4.17.20",
+    "mini-css-extract-plugin": "^0.11.2",
+    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "postcss-loader": "^4.0.2",
     "rimraf": "^3.0.2",
-    "sass": "^1.26.10",
-    "sass-loader": "^9.0.3",
+    "sass": "^1.26.11",
+    "sass-loader": "^10.0.2",
     "style-loader": "^1.2.1",
-    "stylelint": "^13.6.1",
+    "stylelint": "^13.7.1",
     "stylelint-webpack-plugin": "^2.1.0",
-    "terser-webpack-plugin": "^4.0.0",
-    "ts-jest": "^26.1.4",
-    "webpack": "^4.44.1",
-    "webpack-bundle-analyzer": "^3.8.0",
+    "terser-webpack-plugin": "^4.2.2",
+    "ts-jest": "^26.4.0",
+    "webpack": "^4.44.2",
+    "webpack-bundle-analyzer": "^3.9.0",
     "webpack-config-utils": "^2.3.1",
     "webpack-dev-server": "^3.11.0",
     "webpack-format-messages": "^2.0.6",
-    "webpack-merge": "^5.1.1",
+    "webpack-merge": "^5.1.4",
     "xml2js": "^0.4.23",
-    "yargs": "^15.4.1"
+    "yargs": "^16.0.3"
   },
   "devDependencies": {
     "@chrisblossom/eslint-config": "^7.2.2",
-    "@types/yargs": "^15.0.5",
-    "@typescript-eslint/eslint-plugin": "^3.8.0",
-    "@typescript-eslint/parser": "^3.8.0",
+    "@types/yargs": "^15.0.6",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
     "cross-env": "^7.0.2",
-    "eslint": "^7.6.0",
-    "husky": "^4.2.5",
-    "typescript": "^3.9.7"
+    "eslint": "^7.9.0",
+    "husky": "^4.3.0",
+    "typescript": "^4.0.3"
   },
   "peerDependencies": {
     "eslint": "*",

src/bin/cli-service.ts

@@ -10,7 +10,7 @@ import yargs from 'yargs'
 
 import runtime from '../runtime'
 
-import {
+import type {
   ComposeConfiguration,
 } from '../types'
 

src/config.ts

@@ -8,7 +8,7 @@ import _set from 'lodash/set'
 import webpack from 'webpack'
 import { CustomizeRule } from 'webpack-merge/dist/types'
 
-import {
+import type {
   CommandLineFlags,
   Configuration,
   Environment,
@@ -21,7 +21,7 @@ import {
   ConfigurationType,
 } from './types/enums'
 
-import {
+import type {
   WebpackConfigurables,
 } from './types/webpack'
 

src/defaults.ts

@@ -1,4 +1,6 @@
-import { ProjectsConfiguration } from './types'
+import type {
+  ProjectsConfiguration,
+} from './types'
 
 export const defaultProjects: ProjectsConfiguration = {
   core: {

src/entry.ts

@@ -2,7 +2,9 @@ import { resolve } from 'path'
 import _get from 'lodash/get'
 import webpack from 'webpack'
 
-import { Project } from './types'
+import type {
+  Project,
+} from './types'
 
 import {
   environment,

src/features/bootstrap.ts

@@ -1,6 +1,6 @@
 import webpack from 'webpack'
 
-import {
+import type {
   DependenciesMap,
 } from '../types'
 

src/features/feature.ts

@@ -13,7 +13,7 @@ import {
   FeatureEnvironment,
 } from '../types/feature'
 
-import {
+import type {
   WebpackAliases,
 } from '../types/webpack'
 

src/features/process.ts

@@ -8,7 +8,7 @@ import {
 
 import { logger } from '@aem-design/compose-support'
 
-import {
+import type {
   Environment,
   FeatureList,
   RuntimeConfiguration,

src/features/typescript.ts

@@ -1,6 +1,6 @@
 import webpack from 'webpack'
 
-import {
+import type {
   DependenciesMap,
 } from '../types'
 

src/features/vue.ts

@@ -3,11 +3,11 @@ import webpack from 'webpack'
 
 import css from '../support/css'
 
-import {
+import type {
   DependenciesMap,
 } from '../types'
 
-import {
+import type {
   WebpackAliases,
 } from '../types/webpack'
 
@@ -19,7 +19,9 @@ import {
   resolveDependency,
 } from '../support/dependencies'
 
-import { DependencyType } from '../types/enums'
+import {
+  DependencyType,
+} from '../types/enums'
 
 import Feature from './feature'
 

src/hooks.ts

@@ -1,6 +1,9 @@
-import { Hook, HookType } from './types/enums'
-
 import {
+  Hook,
+  HookType,
+} from './types/enums'
+
+import type {
   Project,
   RuntimeEnvironment,
 } from './types'

src/plugins/defaults.ts

@@ -9,7 +9,7 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import StyleLintPlugin from 'stylelint-webpack-plugin'
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 
-import {
+import type {
   RuntimePaths,
 } from '../types'
 

src/runtime.ts

@@ -18,7 +18,7 @@ import TerserPlugin from 'terser-webpack-plugin'
 
 import { logger } from '@aem-design/compose-support'
 
-import {
+import type {
   AEMEnvironment,
   ComposeConfiguration,
   RuntimeConfiguration,
@@ -31,7 +31,7 @@ import {
   WebpackIgnoredProps
 } from './types/enums'
 
-import {
+import type {
   WebpackConfiguration,
   WebpackParserOptions,
 } from './types/webpack'

src/support/__mocks__/dependencies.ts

@@ -1,4 +1,6 @@
-import { DependenciesMap } from '../../types'
+import type {
+  DependenciesMap,
+} from '../../types'
 
 import {
   InstallStatus,

src/support/css.ts

@@ -1,7 +1,7 @@
 import sass from 'sass'
 import webpack from 'webpack'
 
-import {
+import type {
   CSSLoaderOptions,
   Environment,
   RuntimePaths,

src/support/dependencies.ts

@@ -6,7 +6,7 @@ import _flatten from 'lodash/flatten'
 
 import { logger } from '@aem-design/compose-support'
 
-import {
+import type {
   DependenciesMap,
 } from '../types'
 

src/support/helpers.ts

@@ -6,7 +6,7 @@ import xml2js from 'xml2js'
 
 import { getIfUtils, IfUtils, IfUtilsFn } from 'webpack-config-utils'
 
-import {
+import type {
   ComposeConfiguration,
   RuntimeEnvironment,
 } from '../types'
@@ -15,7 +15,7 @@ import {
   ConfigurationType,
 } from '../types/enums'
 
-import {
+import type {
   MavenConfig,
   SavedMavenConfig,
 } from '../types/maven'