piral-cli-webpack5 0.14.9-beta.3522 → 0.15.0-alpha.3540

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/extend-config.js +24 -12
  2. package/lib/webpack/common.js +38 -29
  3. package/lib/webpack/common.js.map +1 -1
  4. package/package.json +3 -3
  5. package/src/webpack/common.ts +38 -29
package/extend-config.js CHANGED
@@ -14,22 +14,34 @@ function changePlugin(config, classRef, cb) {
14
14
  .filter(Boolean);
15
15
  }
16
16
 
17
+ function matchesLoader(r, loaderPath, cb, otherwise) {
18
+ const uses = r.use || [];
19
+
20
+ if (uses.some((m) => m && (m === loaderPath || (typeof m === 'object' && m.loader === loaderPath)))) {
21
+ if (typeof cb === 'function') {
22
+ return cb(r);
23
+ } else {
24
+ return cb;
25
+ }
26
+ } else if (typeof otherwise === 'function') {
27
+ return otherwise();
28
+ }
29
+
30
+ return r;
31
+ }
32
+
17
33
  function changeRule(config, name, cb) {
18
34
  const loaderPath = require.resolve(name);
19
35
  config.module.rules = config.module.rules
20
- .map((rule) => {
21
- const uses = rule.use || [];
22
-
23
- if (uses.some((m) => m && (m === loaderPath || (typeof m === 'object' && m.loader === loaderPath)))) {
24
- if (typeof cb === 'function') {
25
- return cb(rule);
26
- } else {
27
- return cb;
36
+ .map((rule) =>
37
+ matchesLoader(rule, loaderPath, cb, () => {
38
+ if (rule.oneOf) {
39
+ rule.oneOf = rule.oneOf.map((r) => matchesLoader(r, loaderPath, cb)).filter(Boolean);
28
40
  }
29
- }
30
41
 
31
- return rule;
32
- })
42
+ return rule;
43
+ }),
44
+ )
33
45
  .filter(Boolean);
34
46
  }
35
47
 
@@ -126,7 +138,7 @@ module.exports = function (override) {
126
138
  }
127
139
 
128
140
  if ('rules' in override && Array.isArray(override.rules)) {
129
- config.module.rules.push(...override.rules);
141
+ config.module.rules.unshift(...override.rules);
130
142
  }
131
143
 
132
144
  if ('updatePlugins' in override && Array.isArray(override.updatePlugins)) {
package/lib/webpack/common.js CHANGED
@@ -64,35 +64,44 @@ function getRules(production) {
64
64
  };
65
65
  return [
66
66
  {
67
- test: /\.(png|jpe?g|gif|bmp|avi|mp4|mp3|svg|ogg|webp|woff2?|eot|ttf|wav)$/i,
68
- type: 'asset/resource',
69
- },
70
- {
71
- test: /\.s[ac]ss$/i,
72
- use: [...styleLoaders, require.resolve('css-loader'), require.resolve('sass-loader')],
73
- },
74
- {
75
- test: /\.css$/i,
76
- use: [...styleLoaders, require.resolve('css-loader')],
77
- },
78
- {
79
- test: /\.m?jsx?$/i,
80
- use: [babelLoader],
81
- exclude: nodeModules,
82
- },
83
- {
84
- test: /\.tsx?$/i,
85
- use: [babelLoader, tsLoader],
86
- },
87
- {
88
- test: /\.codegen$/i,
89
- use: [require.resolve('parcel-codegen-loader')],
90
- },
91
- {
92
- test: /\.js$/i,
93
- use: [require.resolve('source-map-loader')],
94
- exclude: nodeModules,
95
- enforce: 'pre',
67
+ oneOf: [
68
+ {
69
+ test: /\.s[ac]ss$/i,
70
+ use: [...styleLoaders, require.resolve('css-loader'), require.resolve('sass-loader')],
71
+ },
72
+ {
73
+ test: /\.css$/i,
74
+ use: [...styleLoaders, require.resolve('css-loader')],
75
+ },
76
+ {
77
+ test: /\.m?jsx?$/i,
78
+ use: [babelLoader],
79
+ exclude: nodeModules,
80
+ },
81
+ {
82
+ test: /\.tsx?$/i,
83
+ use: [babelLoader, tsLoader],
84
+ },
85
+ {
86
+ test: /\.codegen$/i,
87
+ use: [require.resolve('parcel-codegen-loader')],
88
+ },
89
+ {
90
+ test: /\.js$/i,
91
+ use: [require.resolve('source-map-loader')],
92
+ exclude: nodeModules,
93
+ enforce: 'pre',
94
+ },
95
+ {
96
+ // Exclude `js` files to keep "css" loader working as it injects
97
+ // its runtime that would otherwise be processed through "file" loader.
98
+ // Also exclude `html` and `json` extensions so they get processed
99
+ // by webpacks internal loaders.
100
+ exclude: [/^$/, /\.(js|mjs|jsx|ts|tsx)$/i, /\.html$/i, /\.json$/i],
101
+ type: 'asset/resource',
102
+ },
103
+ // Don't add new loaders here -> should be added before the last (catch-all) handler
104
+ ],
96
105
  },
97
106
  ];
98
107
  }
package/lib/webpack/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/webpack/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/webpack/common.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli-webpack5",
3
- "version": "0.14.9-beta.3522",
3
+ "version": "0.15.0-alpha.3540",
4
4
  "description": "Provides debug and build capabilities for pilets and Piral instances using Webpack v5.",
5
5
  "keywords": [
6
6
  "piral-cli",
@@ -48,7 +48,7 @@
48
48
  "@types/node": "^13.9.0",
49
49
  "@types/terser-webpack-plugin": "^5.0.0",
50
50
  "@types/yargs": "^15.0.4",
51
- "piral-cli": "0.14.9-beta.3522",
51
+ "piral-cli": "0.15.0-alpha.3540",
52
52
  "strip-ansi": "^3.0.0",
53
53
  "typescript": "^4.0.2"
54
54
  },
@@ -77,5 +77,5 @@
77
77
  "webpack": "^5.1.3",
78
78
  "webpack-inject-plugin": "^1.5.5"
79
79
  },
80
- "gitHead": "e7f2966e6648eb5cf517f295674785c3f90621cb"
80
+ "gitHead": "151470c2e2e9f8616949acde653617fc0f6d1f8c"
81
81
  }
package/src/webpack/common.ts CHANGED
@@ -75,35 +75,44 @@ export function getRules(production: boolean): Array<RuleSetRule> {
75
75
 
76
76
  return [
77
77
  {
78
- test: /\.(png|jpe?g|gif|bmp|avi|mp4|mp3|svg|ogg|webp|woff2?|eot|ttf|wav)$/i,
79
- type: 'asset/resource',
80
- },
81
- {
82
- test: /\.s[ac]ss$/i,
83
- use: [...styleLoaders, require.resolve('css-loader'), require.resolve('sass-loader')],
84
- },
85
- {
86
- test: /\.css$/i,
87
- use: [...styleLoaders, require.resolve('css-loader')],
88
- },
89
- {
90
- test: /\.m?jsx?$/i,
91
- use: [babelLoader],
92
- exclude: nodeModules,
93
- },
94
- {
95
- test: /\.tsx?$/i,
96
- use: [babelLoader, tsLoader],
97
- },
98
- {
99
- test: /\.codegen$/i,
100
- use: [require.resolve('parcel-codegen-loader')],
101
- },
102
- {
103
- test: /\.js$/i,
104
- use: [require.resolve('source-map-loader')],
105
- exclude: nodeModules,
106
- enforce: 'pre',
78
+ oneOf: [
79
+ {
80
+ test: /\.s[ac]ss$/i,
81
+ use: [...styleLoaders, require.resolve('css-loader'), require.resolve('sass-loader')],
82
+ },
83
+ {
84
+ test: /\.css$/i,
85
+ use: [...styleLoaders, require.resolve('css-loader')],
86
+ },
87
+ {
88
+ test: /\.m?jsx?$/i,
89
+ use: [babelLoader],
90
+ exclude: nodeModules,
91
+ },
92
+ {
93
+ test: /\.tsx?$/i,
94
+ use: [babelLoader, tsLoader],
95
+ },
96
+ {
97
+ test: /\.codegen$/i,
98
+ use: [require.resolve('parcel-codegen-loader')],
99
+ },
100
+ {
101
+ test: /\.js$/i,
102
+ use: [require.resolve('source-map-loader')],
103
+ exclude: nodeModules,
104
+ enforce: 'pre',
105
+ },
106
+ {
107
+ // Exclude `js` files to keep "css" loader working as it injects
108
+ // its runtime that would otherwise be processed through "file" loader.
109
+ // Also exclude `html` and `json` extensions so they get processed
110
+ // by webpacks internal loaders.
111
+ exclude: [/^$/, /\.(js|mjs|jsx|ts|tsx)$/i, /\.html$/i, /\.json$/i],
112
+ type: 'asset/resource',
113
+ },
114
+ // Don't add new loaders here -> should be added before the last (catch-all) handler
115
+ ],
107
116
  },
108
117
  ];
109
118
  }