fix: errors of less-loader, sass-loader

SSen · SSen · commit e33feb971517 · 2020-09-01T23:56:31.000+09:00
diff --git a/source/.packages.yaml b/source/.packages.yaml
@@ -3,6 +3,6 @@
   tag: latest
   module: commonjs
 '@rocket-scripts/*':
-  version: 1.0.4
+  version: 1.0.5
   tag: latest
   module: commonjs
diff --git a/source/@types/browserslist__node/index.d.ts b/source/@types/browserslist__node/index.d.ts
diff --git a/source/package.json b/source/package.json
@@ -152,7 +152,7 @@
     "rimraf": "^3.0.2",
     "rocket-punch": "^2.2.3",
     "rxjs": "^6.6.2",
-    "sass-loader": "^10.0.1",
+    "sass-loader": "^8.0.2",
     "semver": "^7.1.3",
     "source-map-support": "^0.5.16",
     "stream-buffers": "^3.0.2",
diff --git a/source/src/@rocket-scripts/react-preset/webpackLoaders/getWebpackStyleLoaders.ts b/source/src/@rocket-scripts/react-preset/webpackLoaders/getWebpackStyleLoaders.ts
@@ -73,9 +73,9 @@ export function getWebpackStyleLoaders({
       loader: preProcessor,
       options: {
         sourceMap: true,
-        ...(preProcessor.indexOf('less-loader') > -1
-          ? { javascriptEnabled: true }
-          : {}),
+        //...(preProcessor.indexOf('less-loader') > -1
+        //  ? { javascriptEnabled: true }
+        //  : {}),
       },
     };
 
diff --git a/source/src/@rocket-scripts/web/__run__/start.run.ts b/source/src/@rocket-scripts/web/__run__/start.run.ts
@@ -6,7 +6,7 @@ import puppeteer from 'puppeteer';
 
 (async () => {
   const cwd: string = await copyTmpDirectory(
-    path.join(process.cwd(), 'test/fixtures/web/start'),
+    path.join(process.cwd(), 'test/fixtures/web/css'),
   );
 
   await exec(`npm install`, { cwd });
diff --git a/source/src/@rocket-scripts/web/__tests__/build.test.ts b/source/src/@rocket-scripts/web/__tests__/build.test.ts
@@ -4,7 +4,7 @@ import { copyTmpDirectory, createTmpDirectory } from '@ssen/tmp-directory';
 import path from 'path';
 
 describe('web/build', () => {
-  test.each(['start', 'webpack-config'])(
+  test.each(['start', 'webpack-config', 'css'])(
     'should build the project "fixtures/web/%s"',
     async (dir: string) => {
       // Arrange : project directories
diff --git a/source/src/@rocket-scripts/web/__tests__/start.test.ts b/source/src/@rocket-scripts/web/__tests__/start.test.ts
@@ -32,7 +32,7 @@ describe('web/start', () => {
     }
   });
 
-  test.each(['start', 'webpack-config'])(
+  test.each(['start', 'webpack-config', 'css'])(
     'should read h1 text and the text should change with HMR (%s)',
     async (dir: string) => {
       // Arrange : project directories
diff --git a/source/test/fixtures/web/css/package.json b/source/test/fixtures/web/css/package.json
@@ -0,0 +1,20 @@
+{
+  "private": true,
+  "scripts": {
+    "app:build": "ts-node scripts/build.ts",
+    "app:start": "ts-node scripts/start.ts",
+    "build": "npm run app:build",
+    "start": "npm run app:start"
+  },
+  "dependencies": {
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1"
+  },
+  "devDependencies": {
+    "@types/react": "^16.9.34",
+    "@types/react-dom": "^16.9.6",
+    "@types/webpack-env": "^1.15.1",
+    "typescript": "^3.9.5",
+    "ts-node": "^8.10.2"
+  }
+}
diff --git a/source/test/fixtures/web/css/public/favicon.ico b/source/test/fixtures/web/css/public/favicon.ico
diff --git a/source/test/fixtures/web/css/public/manifest.json b/source/test/fixtures/web/css/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "App",
+  "name": "My App",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/source/test/fixtures/web/css/scripts/build.ts b/source/test/fixtures/web/css/scripts/build.ts
@@ -0,0 +1,7 @@
+import { build } from '@rocket-scripts/web';
+
+(async () => {
+  await build({
+    app: 'app',
+  });
+})();
diff --git a/source/test/fixtures/web/css/scripts/start.ts b/source/test/fixtures/web/css/scripts/start.ts
@@ -0,0 +1,9 @@
+import { start } from '@rocket-scripts/web';
+import { parseNumber } from '@rocket-scripts/utils';
+
+(async () => {
+  await start({
+    app: 'app',
+    port: parseNumber(process.env.PORT) ?? 'random',
+  });
+})();
diff --git a/source/test/fixtures/web/css/src/app/components/Title.tsx b/source/test/fixtures/web/css/src/app/components/Title.tsx
@@ -0,0 +1,5 @@
+import React from 'react';
+
+export function Title({ text }: { text: string }) {
+  return <h1>{text}</h1>;
+}
diff --git a/source/test/fixtures/web/css/src/app/index.html b/source/test/fixtures/web/css/src/app/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="theme-color" content="#000000"/>
+    <link rel="shortcut icon" href="favicon.ico"/>
+    <link rel="manifest" href="manifest.json"/>
+    <title>App</title>
+  </head>
+  
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/source/test/fixtures/web/css/src/app/index.tsx b/source/test/fixtures/web/css/src/app/index.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { render } from 'react-dom';
+import { Title } from './components/Title';
+import './test.less';
+import './test.scss';
+
+function App() {
+  return <Title text="Hello World!" />;
+}
+
+render(<App />, document.querySelector('#app'));
+
+// Hot Module Replacement
+if (module.hot) {
+  module.hot.accept();
+}
diff --git a/source/test/fixtures/web/css/src/app/test.less b/source/test/fixtures/web/css/src/app/test.less
@@ -0,0 +1,3 @@
+#app {
+  font-size: 2em;
+}
diff --git a/source/test/fixtures/web/css/src/app/test.scss b/source/test/fixtures/web/css/src/app/test.scss
@@ -0,0 +1,3 @@
+#app {
+  color: blue;
+}
diff --git a/source/test/fixtures/web/css/src/typings.d.ts b/source/test/fixtures/web/css/src/typings.d.ts
@@ -0,0 +1 @@
+/// <reference types="rocket-scripts/typings"/>
diff --git a/source/test/fixtures/web/css/tsconfig.json b/source/test/fixtures/web/css/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "downlevelIteration": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "alwaysStrict": true,
+    "jsx": "react",
+    "strictNullChecks": true,
+    "strictBindCallApply": true,
+    "strictFunctionTypes": true,
+    "strictPropertyInitialization": true,
+    "resolveJsonModule": true,
+    "module": "commonjs",
+    "target": "ES2018",
+    "moduleResolution": "node",
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "declaration": true,
+    "baseUrl": "src"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
@@ -8977,7 +8977,7 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
+neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -11547,16 +11547,16 @@ sass-graph@2.2.5:
     scss-tokenizer "^0.2.3"
     yargs "^13.3.2"
 
-sass-loader@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.1.tgz#10c0364d8034f22fee25ddcc9eded20f99bbe3b4"
-  integrity sha512-b2PSldKVTS3JcFPHSrEXh3BeAfR7XknGiGCAO5aHruR3Pf3kqLP3Gb2ypXLglRrAzgZkloNxLZ7GXEGDX0hBUQ==
+sass-loader@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
+  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
   dependencies:
-    klona "^2.0.3"
-    loader-utils "^2.0.0"
-    neo-async "^2.6.2"
-    schema-utils "^2.7.0"
-    semver "^7.3.2"
+    clone-deep "^4.0.1"
+    loader-utils "^1.2.3"
+    neo-async "^2.6.1"
+    schema-utils "^2.6.1"
+    semver "^6.3.0"
 
 sass@^1.26.10:
   version "1.26.10"
@@ -11611,7 +11611,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.7.1:
+schema-utils@^2.6.1, schema-utils@^2.7.1:
   version "2.7.1"
   resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ describe('web/start', () => {`
`32`	`32`	`}`
`33`	`33`	`});`
`34`	`34`
`35`		`- test.each(['start', 'webpack-config'])(`
	`35`	`+ test.each(['start', 'webpack-config', 'css'])(`
`36`	`36`	`'should read h1 text and the text should change with HMR (%s)',`
`37`	`37`	`async (dir: string) => {`
`38`	`38`	`// Arrange : project directories`