@atomicsmash/compiler 2.0.0-beta.4 → 2.0.0-beta.6

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/dist/config.d.ts +25 -0
  2. package/dist/config.d.ts.map +1 -1
  3. package/dist/config.js +34 -3
  4. package/dist/getBlocksAssetsEntryPoints.js +1 -1
  5. package/package.json +2 -1
package/dist/config.d.ts CHANGED
@@ -69,8 +69,31 @@ export declare function config(options: {
69
69
  exclude: (file: string) => boolean;
70
70
  test: RegExp;
71
71
  resourceQuery: (value: string) => boolean;
72
+ oneOf?: undefined;
72
73
  type?: undefined;
73
74
  generator?: undefined;
75
+ } | {
76
+ test: RegExp;
77
+ oneOf: ({
78
+ issuer: ((issuer: string) => boolean)[];
79
+ use: (string | {
80
+ loader: string;
81
+ })[];
82
+ type?: undefined;
83
+ generator?: undefined;
84
+ } | {
85
+ type: string;
86
+ generator: {
87
+ filename: (pathData: PathData) => string;
88
+ };
89
+ use: {
90
+ loader: string;
91
+ };
92
+ issuer?: undefined;
93
+ })[];
94
+ type?: undefined;
95
+ generator?: undefined;
96
+ use?: undefined;
74
97
  } | {
75
98
  test: RegExp;
76
99
  type: string;
@@ -81,6 +104,7 @@ export declare function config(options: {
81
104
  use: {
82
105
  loader: string;
83
106
  };
107
+ oneOf?: undefined;
84
108
  } | {
85
109
  test: RegExp;
86
110
  type: string;
@@ -111,6 +135,7 @@ export declare function config(options: {
111
135
  postcssOptions?: undefined;
112
136
  };
113
137
  })[];
138
+ oneOf?: undefined;
114
139
  })[];
115
140
  };
116
141
  plugins: (BlocksPlugin | DependencyExtractionWebpackPlugin | CopyPlugin | SVGSpritemapPlugin | import("vue-loader").VueLoaderPlugin | WebpackAssetsManifest | BundleAnalyzerPlugin | webpack.DefinePlugin)[];
package/dist/config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,QAAQ,EAAe,MAAM,SAAS,CAAC;AAUpE,OAAO,iCAAiC,MAAM,iDAAiD,CAAC;AAEhG,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAsB,MAAM,CAAC,OAAO,EAAE;IACrC;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAyL0B,QAAQ;;;;;;;;;;;qCAaR,QAAQ;;;;;;;;;;sCAlPrB,CAAC;;;;;;;;;;;;;;;;;;;;;GA0ad"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,QAAQ,EAAe,MAAM,SAAS,CAAC;AAUpE,OAAO,iCAAiC,MAAM,iDAAiD,CAAC;AAEhG,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAE7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,wBAAsB,MAAM,CAAC,OAAO,EAAE;IACrC;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAyM4B,QAAQ;;;;;;;;;;;;;;qCAaV,QAAQ;;;;;;;;;;;;qCAaR,QAAQ;;;;;;;;;;sCA/QrB,CAAC;;;;;;;;;;;;;;;;;;;;;;GA0cd"}
package/dist/config.js CHANGED
@@ -173,6 +173,34 @@ export async function config(options) {
173
173
  resourceQuery: (value) => !value.includes("vue"),
174
174
  ...getEsBuildLoaderSetup("default"),
175
175
  },
176
+ {
177
+ test: /block\.json\.ts$/,
178
+ oneOf: [
179
+ {
180
+ issuer: [
181
+ (issuer) => {
182
+ // Return JSON for all imports in other files, but exclude entry points for which we emit json files.
183
+ return !!issuer;
184
+ },
185
+ ],
186
+ use: [
187
+ "json-loader",
188
+ {
189
+ loader: resolvePath(import.meta.dirname, "./BlocksLoader.js"),
190
+ },
191
+ ],
192
+ },
193
+ {
194
+ type: "asset/resource",
195
+ generator: {
196
+ filename: (pathData) => relative(srcFolder, pathData.filename ?? "").slice(0, -3),
197
+ },
198
+ use: {
199
+ loader: resolvePath(import.meta.dirname, "./BlocksLoader.js"),
200
+ },
201
+ },
202
+ ],
203
+ },
176
204
  {
177
205
  test: /block\.json\.ts$/,
178
206
  type: "asset/resource",
@@ -295,10 +323,13 @@ export async function config(options) {
295
323
  entry.key === "wordpress-assets-info.php" ||
296
324
  entry.key.endsWith(".map") ||
297
325
  entry.key.startsWith("fonts") ||
298
- entry.key.startsWith("images") ||
299
- entry.key === "spritemap.svg") {
326
+ entry.key.startsWith("images")) {
300
327
  return false;
301
328
  }
329
+ if (entry.key === "spritemap.svg") {
330
+ entry.key = "icons/sprite.svg";
331
+ return entry;
332
+ }
302
333
  if (entry.key.startsWith("/")) {
303
334
  entry.key = entry.key.slice(1);
304
335
  }
@@ -315,7 +346,7 @@ export async function config(options) {
315
346
  ...((await glob(`${srcFolder}/icons/*.svg`)).length
316
347
  ? [
317
348
  new SVGSpritemapPlugin(`${srcFolder}/icons/*.svg`, {
318
- output: { filename: "icons/sprite.svg" },
349
+ output: { filename: "icons/sprite.[contenthash].svg" },
319
350
  sprite: { prefix: "", generate: { title: false } },
320
351
  }),
321
352
  ]
package/dist/getBlocksAssetsEntryPoints.js CHANGED
@@ -4,8 +4,8 @@ import { getBlockJsonStyleFields, getBlockJsonScriptFields } from "./utils.js";
4
4
  export async function getBlocksAssetsEntryPoints(paths, entryPoints, srcFolder) {
5
5
  const restOfPaths = [];
6
6
  for (const path of paths) {
7
+ restOfPaths.push(path);
7
8
  if (!path.endsWith("block.json.ts")) {
8
- restOfPaths.push(path);
9
9
  continue;
10
10
  }
11
11
  const blockJson = await tsImport(path, import.meta.url).then((module) => module.blockJson);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@atomicsmash/compiler",
3
3
  "type": "module",
4
- "version": "2.0.0-beta.4",
4
+ "version": "2.0.0-beta.6",
5
5
  "description": "A universal compiler for all Atomic Smash projects.",
6
6
  "keywords": [
7
7
  "cli",
@@ -53,6 +53,7 @@
53
53
  "cssnano": "^7.1.0",
54
54
  "esbuild-loader": "^4.3.0",
55
55
  "fast-glob": "^3.3.3",
56
+ "json-loader": "^0.5.7",
56
57
  "json2php": "^0.0.12",
57
58
  "postcss": "^8.5.6",
58
59
  "postcss-loader": "^8.1.1",