Skip to content
This repository was archived by the owner on Aug 7, 2024. It is now read-only.

fix: use walk from svete/compier to estree-walker #3

Merged
merged 1 commit into from
Aug 3, 2024
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"dependencies": {
"acorn": "^8.5.0",
"big.js": "^6.1.1",
"estree-walker": "^3.0.0",
"magic-string": "^0.25.7"
},
"devDependencies": {
Expand All @@ -68,7 +69,6 @@
"eslint-config-airbnb-base": "^14.2.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-import": "^2.22.1",
"estree-walker": "^3.0.0",
"husky": "^4.3.0",
"jest": "^26.0.1",
"lint-staged": "^10.5.1",
Expand Down
5 changes: 3 additions & 2 deletions src/parsers/importDeclaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
import path from 'path';
import fs, { constants } from 'fs';
import MagicString from 'magic-string';
import { parse, walk } from 'svelte/compiler';
import { parse } from 'svelte/compiler';
import { walk } from 'estree-walker';
import type { TemplateNode } from 'svelte/types/compiler/interfaces.d';
import type Processor from '../processors/processor';

/**
* Parse CssModules Imports
*/
export default (processor: Processor): void => {
const ast = (processor.ast as unknown) as TemplateNode;
const ast = processor.ast as unknown as TemplateNode;
const backup = {
ast: processor.ast,
magicContent: processor.magicContent,
Expand Down
2 changes: 1 addition & 1 deletion src/parsers/template.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { walk } from 'svelte/compiler';
import { walk } from 'estree-walker';
import type { Attribute, TemplateNode } from 'svelte/types/compiler/interfaces.d';
import type Processor from '../processors/processor';

Expand Down
4 changes: 2 additions & 2 deletions src/processors/mixed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { walk } from 'svelte/compiler';
import { walk } from 'estree-walker';
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
import type { PluginOptions } from '../types';
import Processor from './processor';
Expand Down Expand Up @@ -31,7 +31,7 @@ const updateSelectorBoundaries = (
* @param processor The CSS Module Processor
*/
const parser = (processor: Processor): void => {
const ast = (processor.ast as unknown) as TemplateNode;
const ast = processor.ast as unknown as TemplateNode;
walk(ast, {
enter(baseNode) {
const node = baseNode as TemplateNode;
Expand Down
4 changes: 2 additions & 2 deletions src/processors/native.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { walk } from 'svelte/compiler';
import { walk } from 'estree-walker';
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
import type { PluginOptions } from '../types';
import Processor from './processor';
Expand Down Expand Up @@ -32,7 +32,7 @@ const updateSelectorBoundaries = (
* @param processor The CSS Module Processor
*/
const parser = (processor: Processor): void => {
const ast = (processor.ast as unknown) as TemplateNode;
const ast = processor.ast as unknown as TemplateNode;
let selectorBoundaries: Boundaries[] = [];

walk(ast, {
Expand Down
4 changes: 2 additions & 2 deletions src/processors/scoped.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { walk } from 'svelte/compiler';
import { walk } from 'estree-walker';
import type { Ast, TemplateNode } from 'svelte/types/compiler/interfaces.d';
import type { PluginOptions } from '../types';
import Processor from './processor';
Expand All @@ -8,7 +8,7 @@ import Processor from './processor';
* @param processor The CSS Module Processor
*/
const parser = (processor: Processor): void => {
const ast = (processor.ast as unknown) as TemplateNode;
const ast = processor.ast as unknown as TemplateNode;
walk(ast, {
enter(baseNode) {
const node = baseNode as TemplateNode;
Expand Down
2 changes: 1 addition & 1 deletion tasks/parser.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { readdir, lstat, readFile, existsSync, writeFile } from 'fs';
import { resolve, dirname } from 'path';
import { Parser } from 'acorn';
import { walk } from 'svelte/compiler';
import { walk } from 'estree-walker';
import MagicString from 'magic-string';

const parseDir = (dir) => {
Expand Down
2 changes: 1 addition & 1 deletion test/compiler.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const svelte = require('svelte/compiler');
const svelte = require('estree-walker');
const cssModules = require('../');

module.exports = async ({ source }, options) => {
Expand Down